Reorganise folder structure to remove hidden files

After moving from GNU Stow, this is not necessary.  Non-hidden files
are much easier to work with.

4 files changed, 4 insertions, 8 deletions

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}'";