From ee84fa45a203936dadcdde4a915ee3767b8b84c3 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 8 Dec 2019 23:56:58 -0500
Subject: [PATCH] Revert "Don't use zsh/rc.d system"

This reverts commit a7834176eccca0e4afb6acc65c7966b7e2353e35.
---
 config/zsh/.zshenv        | 2 +-
 config/zsh/.zshrc         | 2 +-
 modules/editors/emacs.nix | 5 ++---
 modules/editors/vim.nix   | 2 +-
 modules/shell/git.nix     | 4 +++-
 modules/shell/ncmpcpp.nix | 5 ++++-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv
index 16852bbf..2c5acda7 100644
--- a/config/zsh/.zshenv
+++ b/config/zsh/.zshenv
@@ -2,7 +2,7 @@ for dir in $XDG_CONFIG_HOME/*/bin(N); do
   export PATH="$dir:$PATH"
 done
 
-for file in $XDG_CONFIG_HOME/*/env.zsh(N); do
+for file in $XDG_CONFIG_HOME/zsh/rc.d/env.*.zsh(N); do
   source $file
 done
 
diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index e0a61969..2d1f14a9 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -21,7 +21,7 @@ source $ZDOTDIR/config.zsh
 source $ZDOTDIR/keybinds.zsh
 source $ZDOTDIR/completion.zsh
 source $ZDOTDIR/aliases.zsh
-for file in $XDG_CONFIG_HOME/*/aliases.zsh(N); do
+for file in $XDG_CONFIG_HOME/zsh/rc.d/aliases.*.zsh(N); do
   source $file
 done
 
diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index 861f23ff..fb003cb5 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -20,8 +20,7 @@ in
   fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
 
   home-manager.users.hlissner.xdg.configFile = {
-    # Avoid "emacs" because Emacs HEAD respects XDG conventions and we're only
-    # using this directory to store extra zsh config for my nix dotfiles.
-    "emacscfg" = { source = <config/emacs>; recursive = true; };
+    "zsh/rc.d/aliases.emacs.zsh".source = <config/emacs/aliases.zsh>;
+    "zsh/rc.d/env.emacs.zsh".source = <config/emacs/env.zsh>;
   };
 }
diff --git a/modules/editors/vim.nix b/modules/editors/vim.nix
index ead2cae3..3b3f748b 100644
--- a/modules/editors/vim.nix
+++ b/modules/editors/vim.nix
@@ -14,6 +14,6 @@
   };
 
   home-manager.users.hlissner.xdg.configFile = {
-    "vim" = { source = <config/vim>; recursive = true; };
+    "zsh/rc.d/aliases.vim.zsh".source = <config/vim/aliases.zsh>;
   };
 }
diff --git a/modules/shell/git.nix b/modules/shell/git.nix
index 5f4b447a..f33d9e04 100644
--- a/modules/shell/git.nix
+++ b/modules/shell/git.nix
@@ -7,6 +7,8 @@
   ];
 
   home-manager.users.hlissner.xdg.configFile = {
-    "git" = { source = <config/git>; recursive = true; };
+    "git/config".source = <config/git/config>;
+    "git/ignore".source = <config/git/ignore>;
+    "zsh/rc.d/aliases.git.zsh".source = <config/git/aliases.zsh>;
   };
 }
diff --git a/modules/shell/ncmpcpp.nix b/modules/shell/ncmpcpp.nix
index 2c05d2ea..aaf392cd 100644
--- a/modules/shell/ncmpcpp.nix
+++ b/modules/shell/ncmpcpp.nix
@@ -6,6 +6,9 @@
   ];
 
   home-manager.users.hlissner.xdg.configFile = {
-    "ncmpcpp" = { source = <config/ncmpcpp>; recursive = true; };
+    "zsh/rc.d/aliases.ncmpcpp.zsh".source = <config/ncmpcpp/aliases.zsh>;
+    "zsh/rc.d/env.ncmpcpp.zsh".source = <config/ncmpcpp/env.zsh>;
+    "ncmpcpp/config".source = <config/ncmpcpp/config>;
+    "ncmpcpp/bindings".source = <config/ncmpcpp/bindings>;
   };
 }