Minor refactors & fixes

config/vim/aliases.zsh

@@ -1,4 +0,0 @@
-#!/usr/bin/env zsh
-
-alias vim=nvim
-alias v=nvim

config/zsh/.zshenv

@@ -1,9 +1,6 @@
-export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-export ZSH_CACHE="$XDG_CACHE_HOME/zsh"
 export ZGEN_DIR="$XDG_CACHE_HOME/zgen"
 export ZGEN_SOURCE="$ZGEN_DIR/zgen.zsh"
-
-if [[ ! -d "$ZGEN_SOURCE" ]]; then
+if [[ ! -d "$ZGEN_DIR" ]]; then
   git clone https://github.com/tarjoilija/zgen "$ZGEN_DIR"
 fi
 

config/zsh/aliases.zsh

@@ -48,6 +48,11 @@ alias ngc='nix-collect-garbage -d'
 alias nre='sudo nixos-rebuild'
 alias nup='sudo nix-channel --update && nre'
 
+if command -v nvim >/dev/null; then
+  alias vim=nvim
+  alias v=nvim
+fi
+
 autoload -U zmv
 
 take() {

modules/audio/spotify.nix

@@ -10,7 +10,7 @@ in
       #!${stdenv.shell}
       if ! pgrep -x spotifyd >/dev/null; then
         spotifyd --backend pulseaudio \
-                 --cache_path ~/.cache/spotifyd \
+                 --cache_path "$HOME/.cache/spotifyd" \
                  --username accounts@v0.io \
                  --password $(pass www/spotify.com)
       fi

modules/browser/firefox.nix

@@ -2,11 +2,6 @@
 
 {
   environment = {
-    sessionVariables = {
-      BROWSER = "firefox";
-      XDG_DESKTOP_DIR = "$HOME"; # prevent firefox creating ~/Desktop
-    };
-
     systemPackages = with pkgs; [
       firefox-bin
       (pkgs.writeScriptBin "firefox-private" ''
@@ -22,5 +17,9 @@
         categories = "Network";
       })
     ];
+    variables = {
+      BROWSER = "firefox";
+      XDG_DESKTOP_DIR = "$HOME"; # prevent firefox creating ~/Desktop
+    };
   };
 }

modules/editors/vim.nix

@@ -12,8 +12,4 @@
       neovim
     ];
   };
-
-  home-manager.users.hlissner.xdg.configFile = {
-    "zsh/rc.d/aliases.vim.zsh".source = <config/vim/aliases.zsh>;
-  };
 }

modules/shell/zsh.nix

@@ -14,6 +14,10 @@
       htop
       tree
     ];
+    variables = {
+      ZDOTDIR = "$XDG_CONFIG_HOME/zsh";
+      ZSH_CACHE = "$XDG_CACHE_HOME/zsh";
+    };
   };
 
   programs.zsh = {