16 files changed, 4 insertions, 8 deletions
diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/init.el
index f76a5017..f76a5017 100644
--- a/user/emacs/.emacs.d/init.el
+++ b/user/emacs/init.el
diff --git a/user/gnupg/.gnupg/dirmngr.conf b/user/gnupg/dirmngr.conf
index f69421d7..f69421d7 100644
--- a/user/gnupg/.gnupg/dirmngr.conf
+++ b/user/gnupg/dirmngr.conf
diff --git a/user/gnupg/.gnupg/gpa.conf b/user/gnupg/gpa.conf
index 2e33e80b..2e33e80b 100644
--- a/user/gnupg/.gnupg/gpa.conf
+++ b/user/gnupg/gpa.conf
diff --git a/user/gnupg/.gnupg/gpg-agent.conf b/user/gnupg/gpg-agent.conf
index 52eb1dca..52eb1dca 100644
--- a/user/gnupg/.gnupg/gpg-agent.conf
+++ b/user/gnupg/gpg-agent.conf
diff --git a/user/gnupg/.gnupg/gpg.conf b/user/gnupg/gpg.conf
index 61df93cf..61df93cf 100644
--- a/user/gnupg/.gnupg/gpg.conf
+++ b/user/gnupg/gpg.conf
diff --git a/user/gnupg/.gnupg/trezor/dirmngr.conf b/user/gnupg/trezor/dirmngr.conf
index 17612d46..17612d46 100644
--- a/user/gnupg/.gnupg/trezor/dirmngr.conf
+++ b/user/gnupg/trezor/dirmngr.conf
diff --git a/user/i3/.config/i3status/config b/user/i3/i3status/config
index f27c24a4..f27c24a4 100644
--- a/user/i3/.config/i3status/config
+++ b/user/i3/i3status/config
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 6ed20b39..d7c55962 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -187,7 +187,7 @@ in
     EDITOR = "${editorScript}/bin/edit";
   };
   home.file.".emacs.d/init.el" = {
-    source = ../emacs/.emacs.d/init.el;
+    source = ../emacs/init.el;
     onChange = ''
       ${config.programs.emacs.finalPackage}/bin/emacs -Q -batch -f batch-byte-compile .emacs.d/init.el
     '';
diff --git a/user/settings/gnupg.nix b/user/settings/gnupg.nix
index 6dcb31f2..86480aee 100644
--- a/user/settings/gnupg.nix
+++ b/user/settings/gnupg.nix
@@ -3,6 +3,6 @@
 {
   home.file.".gnupg" = {
     recursive = true;
-    source = ../gnupg/.gnupg;
+    source = ../gnupg;
   };
 }
diff --git a/user/settings/xresources.nix b/user/settings/xresources.nix
index 075eeb22..6d290349 100644
--- a/user/settings/xresources.nix
+++ b/user/settings/xresources.nix
@@ -3,7 +3,7 @@
 {
   home.file.".xresources" = {
     recursive = true;
-    source = ../xresources/.xresources;
+    source = ../xresources;
     onChange = ''
       ${pkgs.xorg.xrdb}/bin/xrdb -merge .xresources/main
     '';
diff --git a/user/settings/zsh.nix b/user/settings/zsh.nix
index b409e728..3fb6d57d 100644
--- a/user/settings/zsh.nix
+++ b/user/settings/zsh.nix
@@ -28,10 +28,6 @@ in
     git-lfs
     zsh-completions
   ];
-  xdg.configFile.zsh = {
-    recursive = true;
-    source = ../zsh/.config/zsh;
-  };
 
   programs.zsh = {
     enable = true;
@@ -253,7 +249,7 @@ in
 
       source ${pkgs.fzf}/share/fzf/key-bindings.zsh
 
-    '' + builtins.readFile ../zsh/.config/zsh/.zshrc;
+    '' + builtins.readFile ../zsh/zshrc;
   };
 
   home.file."${zshrc}".onChange = "${pkgs.zsh}/bin/zsh -i -c 'autoload -Uz compinit && compinit && zcompile ${zshrc}'";
diff --git a/user/xresources/.xresources/base16-mexico-light-256 b/user/xresources/base16-mexico-light-256
index 34194f8e..34194f8e 100644
--- a/user/xresources/.xresources/base16-mexico-light-256
+++ b/user/xresources/base16-mexico-light-256
diff --git a/user/xresources/.xresources/base16-tomorrow b/user/xresources/base16-tomorrow
index 46c18805..46c18805 100644
--- a/user/xresources/.xresources/base16-tomorrow
+++ b/user/xresources/base16-tomorrow
diff --git a/user/xresources/.xresources/main b/user/xresources/main
index fbe418bc..fbe418bc 100644
--- a/user/xresources/.xresources/main
+++ b/user/xresources/main
diff --git a/user/xresources/.xresources/solarized-light b/user/xresources/solarized-light
index 3906b7b0..3906b7b0 100644
--- a/user/xresources/.xresources/solarized-light
+++ b/user/xresources/solarized-light
diff --git a/user/zsh/.config/zsh/.zshrc b/user/zsh/zshrc
index 22e28528..22e28528 100644
--- a/user/zsh/.config/zsh/.zshrc
+++ b/user/zsh/zshrc