summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2020-04-03 13:27:46 +0200
committerAlan Pearce2020-04-03 13:27:46 +0200
commit7f527bb245c0dad5f827a24fe135611650ab082c (patch)
tree73cee66f282fe5b7b324299636a87510e013a0e2
parent657f50fc07a9e65a33168cdf5451a6b05e48b651 (diff)
downloadnixfiles-7f527bb245c0dad5f827a24fe135611650ab082c.tar.lz
nixfiles-7f527bb245c0dad5f827a24fe135611650ab082c.tar.zst
nixfiles-7f527bb245c0dad5f827a24fe135611650ab082c.zip
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.
Diffstat
-rw-r--r--user/emacs/init.el (renamed from user/emacs/.emacs.d/init.el)0
-rw-r--r--user/gnupg/dirmngr.conf (renamed from user/gnupg/.gnupg/dirmngr.conf)0
-rw-r--r--user/gnupg/gpa.conf (renamed from user/gnupg/.gnupg/gpa.conf)0
-rw-r--r--user/gnupg/gpg-agent.conf (renamed from user/gnupg/.gnupg/gpg-agent.conf)0
-rw-r--r--user/gnupg/gpg.conf (renamed from user/gnupg/.gnupg/gpg.conf)0
-rw-r--r--user/gnupg/trezor/dirmngr.conf (renamed from user/gnupg/.gnupg/trezor/dirmngr.conf)0
-rw-r--r--user/i3/i3status/config (renamed from user/i3/.config/i3status/config)0
-rw-r--r--user/settings/emacs.nix2
-rw-r--r--user/settings/gnupg.nix2
-rw-r--r--user/settings/xresources.nix2
-rw-r--r--user/settings/zsh.nix6
-rw-r--r--user/xresources/base16-mexico-light-256 (renamed from user/xresources/.xresources/base16-mexico-light-256)0
-rw-r--r--user/xresources/base16-tomorrow (renamed from user/xresources/.xresources/base16-tomorrow)0
-rw-r--r--user/xresources/main (renamed from user/xresources/.xresources/main)0
-rw-r--r--user/xresources/solarized-light (renamed from user/xresources/.xresources/solarized-light)0
-rw-r--r--user/zsh/zshrc (renamed from user/zsh/.config/zsh/.zshrc)0
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
187 EDITOR = "${editorScript}/bin/edit"; 187 EDITOR = "${editorScript}/bin/edit";
188 }; 188 };
189 home.file.".emacs.d/init.el" = { 189 home.file.".emacs.d/init.el" = {
190 source = ../emacs/.emacs.d/init.el; 190 source = ../emacs/init.el;
191 onChange = '' 191 onChange = ''
192 ${config.programs.emacs.finalPackage}/bin/emacs -Q -batch -f batch-byte-compile .emacs.d/init.el 192 ${config.programs.emacs.finalPackage}/bin/emacs -Q -batch -f batch-byte-compile .emacs.d/init.el
193 ''; 193 '';
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 @@
3{ 3{
4 home.file.".gnupg" = { 4 home.file.".gnupg" = {
5 recursive = true; 5 recursive = true;
6 source = ../gnupg/.gnupg; 6 source = ../gnupg;
7 }; 7 };
8} 8}
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 @@
3{ 3{
4 home.file.".xresources" = { 4 home.file.".xresources" = {
5 recursive = true; 5 recursive = true;
6 source = ../xresources/.xresources; 6 source = ../xresources;
7 onChange = '' 7 onChange = ''
8 ${pkgs.xorg.xrdb}/bin/xrdb -merge .xresources/main 8 ${pkgs.xorg.xrdb}/bin/xrdb -merge .xresources/main
9 ''; 9 '';
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
28 git-lfs 28 git-lfs
29 zsh-completions 29 zsh-completions
30 ]; 30 ];
31 xdg.configFile.zsh = {
32 recursive = true;
33 source = ../zsh/.config/zsh;
34 };
35 31
36 programs.zsh = { 32 programs.zsh = {
37 enable = true; 33 enable = true;
@@ -253,7 +249,7 @@ in
253 249
254 source ${pkgs.fzf}/share/fzf/key-bindings.zsh 250 source ${pkgs.fzf}/share/fzf/key-bindings.zsh
255 251
256 '' + builtins.readFile ../zsh/.config/zsh/.zshrc; 252 '' + builtins.readFile ../zsh/zshrc;
257 }; 253 };
258 254
259 home.file."${zshrc}".onChange = "${pkgs.zsh}/bin/zsh -i -c 'autoload -Uz compinit && compinit && zcompile ${zshrc}'"; 255 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-04-19 21:52:29 +0000