83 files changed, 30 insertions, 26 deletions

diff --git a/home-manager/alacritty/default.nix b/home-manager/config/alacritty/default.nix
index 2a18b0d9..2a18b0d9 100644
--- a/home-manager/alacritty/default.nix
+++ b/home-manager/config/alacritty/default.nix
diff --git a/home-manager/cups/default.nix b/home-manager/config/cups/default.nix
index 4fef0a9c..4fef0a9c 100644
--- a/home-manager/cups/default.nix
+++ b/home-manager/config/cups/default.nix
diff --git a/home-manager/config/default.nix b/home-manager/config/default.nix
new file mode 100644
index 00000000..d056d81e
--- /dev/null
+++ b/home-manager/config/default.nix
@@ -0,0 +1,28 @@
+# vim: ts=2
+{_}: {
+  imports = [
+    ./alacritty
+    ./cups
+    ./firefox
+    ./gammastep
+    ./git
+    ./grades
+    ./gtk
+    ./keepassxc
+    ./latexindent
+    ./less
+    ./lf
+    ./mako
+    ./mpd
+    ./neovim
+    ./npm
+    ./python
+    ./rclone
+    ./river
+    ./ssh
+    ./swayidle
+    ./swaylock
+    ./yambar
+    ./zsh
+  ];
+}
diff --git a/home-manager/firefox/chrome/userChrome.css b/home-manager/config/firefox/chrome/userChrome.css
index 0b3aff77..0b3aff77 100644
--- a/home-manager/firefox/chrome/userChrome.css
+++ b/home-manager/config/firefox/chrome/userChrome.css
diff --git a/home-manager/firefox/default.nix b/home-manager/config/firefox/default.nix
index 88fad227..88fad227 100644
--- a/home-manager/firefox/default.nix
+++ b/home-manager/config/firefox/default.nix
diff --git a/home-manager/firefox/scripts/unzip_mozlz4.py b/home-manager/config/firefox/scripts/unzip_mozlz4.py
index 311fd214..311fd214 100755
--- a/home-manager/firefox/scripts/unzip_mozlz4.py
+++ b/home-manager/config/firefox/scripts/unzip_mozlz4.py
diff --git a/home-manager/firefox/scripts/update_extensions b/home-manager/config/firefox/scripts/update_extensions
index 97f7c0ba..97f7c0ba 100755
--- a/home-manager/firefox/scripts/update_extensions
+++ b/home-manager/config/firefox/scripts/update_extensions
diff --git a/home-manager/firefox/settings.nix b/home-manager/config/firefox/settings.nix
index f38e23b3..f38e23b3 100644
--- a/home-manager/firefox/settings.nix
+++ b/home-manager/config/firefox/settings.nix
diff --git a/home-manager/firefox/settings/extensions.json b/home-manager/config/firefox/settings/extensions.json
index 057810bc..057810bc 100644
--- a/home-manager/firefox/settings/extensions.json
+++ b/home-manager/config/firefox/settings/extensions.json
diff --git a/home-manager/firefox/settings/override.js b/home-manager/config/firefox/settings/override.js
index ca03e8ed..ca03e8ed 100644
--- a/home-manager/firefox/settings/override.js
+++ b/home-manager/config/firefox/settings/override.js
diff --git a/home-manager/gammastep/default.nix b/home-manager/config/gammastep/default.nix
index 79b027cd..79b027cd 100644
--- a/home-manager/gammastep/default.nix
+++ b/home-manager/config/gammastep/default.nix
diff --git a/home-manager/git/default.nix b/home-manager/config/git/default.nix
index 667bb206..667bb206 100644
--- a/home-manager/git/default.nix
+++ b/home-manager/config/git/default.nix
diff --git a/home-manager/grades/config.yaml b/home-manager/config/grades/config.yaml
index ebbc61f8..ebbc61f8 100644
--- a/home-manager/grades/config.yaml
+++ b/home-manager/config/grades/config.yaml
diff --git a/home-manager/grades/default.nix b/home-manager/config/grades/default.nix
index 22c5a6d4..22c5a6d4 100644
--- a/home-manager/grades/default.nix
+++ b/home-manager/config/grades/default.nix
diff --git a/home-manager/gtk/default.nix b/home-manager/config/gtk/default.nix
index a3f197d2..a3f197d2 100644
--- a/home-manager/gtk/default.nix
+++ b/home-manager/config/gtk/default.nix
diff --git a/home-manager/keepassxc/default.nix b/home-manager/config/keepassxc/default.nix
index 152611c1..152611c1 100644
--- a/home-manager/keepassxc/default.nix
+++ b/home-manager/config/keepassxc/default.nix
diff --git a/home-manager/keepassxc/keepassxc.ini b/home-manager/config/keepassxc/keepassxc.ini
index ee10d691..ee10d691 100644
--- a/home-manager/keepassxc/keepassxc.ini
+++ b/home-manager/config/keepassxc/keepassxc.ini
diff --git a/home-manager/latexindent/default.nix b/home-manager/config/latexindent/default.nix
index 10bae481..10bae481 100644
--- a/home-manager/latexindent/default.nix
+++ b/home-manager/config/latexindent/default.nix
diff --git a/home-manager/latexindent/indentconfig.yaml b/home-manager/config/latexindent/indentconfig.yaml
index d67351f3..d67351f3 100644
--- a/home-manager/latexindent/indentconfig.yaml
+++ b/home-manager/config/latexindent/indentconfig.yaml
diff --git a/home-manager/latexindent/mysettings.yaml b/home-manager/config/latexindent/mysettings.yaml
index 9a0f8b2f..9a0f8b2f 100644
--- a/home-manager/latexindent/mysettings.yaml
+++ b/home-manager/config/latexindent/mysettings.yaml
diff --git a/home-manager/less/default.nix b/home-manager/config/less/default.nix
index c9e74ecc..c9e74ecc 100644
--- a/home-manager/less/default.nix
+++ b/home-manager/config/less/default.nix
diff --git a/home-manager/lf/cmds/archive.sh b/home-manager/config/lf/cmds/archive.sh
index 48544365..48544365 100644
--- a/home-manager/lf/cmds/archive.sh
+++ b/home-manager/config/lf/cmds/archive.sh
diff --git a/home-manager/lf/cmds/broot_jump.sh b/home-manager/config/lf/cmds/broot_jump.sh
index 188c9508..188c9508 100644
--- a/home-manager/lf/cmds/broot_jump.sh
+++ b/home-manager/config/lf/cmds/broot_jump.sh
diff --git a/home-manager/lf/cmds/chmod.sh b/home-manager/config/lf/cmds/chmod.sh
index f6a87336..f6a87336 100644
--- a/home-manager/lf/cmds/chmod.sh
+++ b/home-manager/config/lf/cmds/chmod.sh
diff --git a/home-manager/lf/cmds/clear_trash.sh b/home-manager/config/lf/cmds/clear_trash.sh
index c02321f2..c02321f2 100644
--- a/home-manager/lf/cmds/clear_trash.sh
+++ b/home-manager/config/lf/cmds/clear_trash.sh
diff --git a/home-manager/lf/cmds/dl_file.sh b/home-manager/config/lf/cmds/dl_file.sh
index 9cb9023c..9cb9023c 100644
--- a/home-manager/lf/cmds/dl_file.sh
+++ b/home-manager/config/lf/cmds/dl_file.sh
diff --git a/home-manager/lf/cmds/dragon.sh b/home-manager/config/lf/cmds/dragon.sh
index 36e94706..36e94706 100644
--- a/home-manager/lf/cmds/dragon.sh
+++ b/home-manager/config/lf/cmds/dragon.sh
diff --git a/home-manager/lf/cmds/dragon_individual.sh b/home-manager/config/lf/cmds/dragon_individual.sh
index abcadb13..abcadb13 100644
--- a/home-manager/lf/cmds/dragon_individual.sh
+++ b/home-manager/config/lf/cmds/dragon_individual.sh
diff --git a/home-manager/lf/cmds/dragon_stay.sh b/home-manager/config/lf/cmds/dragon_stay.sh
index 60195d09..60195d09 100644
--- a/home-manager/lf/cmds/dragon_stay.sh
+++ b/home-manager/config/lf/cmds/dragon_stay.sh
diff --git a/home-manager/lf/cmds/fzf_jump.sh b/home-manager/config/lf/cmds/fzf_jump.sh
index 688efdb9..688efdb9 100644
--- a/home-manager/lf/cmds/fzf_jump.sh
+++ b/home-manager/config/lf/cmds/fzf_jump.sh
diff --git a/home-manager/lf/cmds/help.sh b/home-manager/config/lf/cmds/help.sh
index 8fedd0ea..8fedd0ea 100644
--- a/home-manager/lf/cmds/help.sh
+++ b/home-manager/config/lf/cmds/help.sh
diff --git a/home-manager/lf/cmds/mk_dir.sh b/home-manager/config/lf/cmds/mk_dir.sh
index bfa0627d..bfa0627d 100644
--- a/home-manager/lf/cmds/mk_dir.sh
+++ b/home-manager/config/lf/cmds/mk_dir.sh
diff --git a/home-manager/lf/cmds/mk_file.sh b/home-manager/config/lf/cmds/mk_file.sh
index 044016a6..044016a6 100644
--- a/home-manager/lf/cmds/mk_file.sh
+++ b/home-manager/config/lf/cmds/mk_file.sh
diff --git a/home-manager/lf/cmds/mk_ln.sh b/home-manager/config/lf/cmds/mk_ln.sh
index 71a70a36..71a70a36 100644
--- a/home-manager/lf/cmds/mk_ln.sh
+++ b/home-manager/config/lf/cmds/mk_ln.sh
diff --git a/home-manager/lf/cmds/mk_scr.sh b/home-manager/config/lf/cmds/mk_scr.sh
index b6c17458..b6c17458 100644
--- a/home-manager/lf/cmds/mk_scr.sh
+++ b/home-manager/config/lf/cmds/mk_scr.sh
diff --git a/home-manager/lf/cmds/open.sh b/home-manager/config/lf/cmds/open.sh
index 8376be21..8376be21 100644
--- a/home-manager/lf/cmds/open.sh
+++ b/home-manager/config/lf/cmds/open.sh
diff --git a/home-manager/lf/cmds/open_config.sh b/home-manager/config/lf/cmds/open_config.sh
index 93c174d7..93c174d7 100644
--- a/home-manager/lf/cmds/open_config.sh
+++ b/home-manager/config/lf/cmds/open_config.sh
diff --git a/home-manager/lf/cmds/restore_trash.sh b/home-manager/config/lf/cmds/restore_trash.sh
index 432e9e9b..432e9e9b 100644
--- a/home-manager/lf/cmds/restore_trash.sh
+++ b/home-manager/config/lf/cmds/restore_trash.sh
diff --git a/home-manager/lf/cmds/set_wall_paper.sh b/home-manager/config/lf/cmds/set_wall_paper.sh
index 4599de2a..4599de2a 100644
--- a/home-manager/lf/cmds/set_wall_paper.sh
+++ b/home-manager/config/lf/cmds/set_wall_paper.sh
diff --git a/home-manager/lf/cmds/stripspace.sh b/home-manager/config/lf/cmds/stripspace.sh
index c7f68767..c7f68767 100644
--- a/home-manager/lf/cmds/stripspace.sh
+++ b/home-manager/config/lf/cmds/stripspace.sh
diff --git a/home-manager/lf/cmds/sudo_mk_file.sh b/home-manager/config/lf/cmds/sudo_mk_file.sh
index 1f06a92f..1f06a92f 100644
--- a/home-manager/lf/cmds/sudo_mk_file.sh
+++ b/home-manager/config/lf/cmds/sudo_mk_file.sh
diff --git a/home-manager/lf/cmds/trash.sh b/home-manager/config/lf/cmds/trash.sh
index 4598b4fd..4598b4fd 100644
--- a/home-manager/lf/cmds/trash.sh
+++ b/home-manager/config/lf/cmds/trash.sh
diff --git a/home-manager/lf/cmds/unarchive.sh b/home-manager/config/lf/cmds/unarchive.sh
index 47a713fa..47a713fa 100644
--- a/home-manager/lf/cmds/unarchive.sh
+++ b/home-manager/config/lf/cmds/unarchive.sh
diff --git a/home-manager/lf/colors b/home-manager/config/lf/colors
index c4b6417b..c4b6417b 100644
--- a/home-manager/lf/colors
+++ b/home-manager/config/lf/colors
diff --git a/home-manager/lf/default.nix b/home-manager/config/lf/default.nix
index e27b040c..e27b040c 100644
--- a/home-manager/lf/default.nix
+++ b/home-manager/config/lf/default.nix
diff --git a/home-manager/lf/icons b/home-manager/config/lf/icons
index 68d53e34..68d53e34 100644
--- a/home-manager/lf/icons
+++ b/home-manager/config/lf/icons
diff --git a/home-manager/mako/default.nix b/home-manager/config/mako/default.nix
index 9b9e01a0..9b9e01a0 100644
--- a/home-manager/mako/default.nix
+++ b/home-manager/config/mako/default.nix
diff --git a/home-manager/mpd/default.nix b/home-manager/config/mpd/default.nix
index ea535415..ea535415 100644
--- a/home-manager/mpd/default.nix
+++ b/home-manager/config/mpd/default.nix
diff --git a/home-manager/mpd/mpdconf.example b/home-manager/config/mpd/mpdconf.example
index eaa5e641..eaa5e641 100644
--- a/home-manager/mpd/mpdconf.example
+++ b/home-manager/config/mpd/mpdconf.example
diff --git a/home-manager/mpd/test.TODO b/home-manager/config/mpd/test.TODO
index 6225d8fd..6225d8fd 100644
--- a/home-manager/mpd/test.TODO
+++ b/home-manager/config/mpd/test.TODO
diff --git a/home-manager/neovim/default.nix b/home-manager/config/neovim/default.nix
index 8074f19d..8074f19d 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/config/neovim/default.nix
diff --git a/home-manager/npm/.npmrc b/home-manager/config/npm/.npmrc
index d0d846bd..d0d846bd 100644
--- a/home-manager/npm/.npmrc
+++ b/home-manager/config/npm/.npmrc
diff --git a/home-manager/npm/default.nix b/home-manager/config/npm/default.nix
index d12ce73b..d12ce73b 100644
--- a/home-manager/npm/default.nix
+++ b/home-manager/config/npm/default.nix
diff --git a/home-manager/python/default.nix b/home-manager/config/python/default.nix
index 4fd01a0a..4fd01a0a 100644
--- a/home-manager/python/default.nix
+++ b/home-manager/config/python/default.nix
diff --git a/home-manager/python/pythonrc b/home-manager/config/python/pythonrc
index 38c48e0f..38c48e0f 100644
--- a/home-manager/python/pythonrc
+++ b/home-manager/config/python/pythonrc
diff --git a/home-manager/rclone/default.nix b/home-manager/config/rclone/default.nix
index 1939a0b5..1939a0b5 100644
--- a/home-manager/rclone/default.nix
+++ b/home-manager/config/rclone/default.nix
diff --git a/home-manager/rclone/rclone.conf b/home-manager/config/rclone/rclone.conf
index 9e1c4f08..9e1c4f08 100644
--- a/home-manager/rclone/rclone.conf
+++ b/home-manager/config/rclone/rclone.conf
diff --git a/home-manager/river/default.nix b/home-manager/config/river/default.nix
index d0de7f13..d0de7f13 100644
--- a/home-manager/river/default.nix
+++ b/home-manager/config/river/default.nix
diff --git a/home-manager/river/init b/home-manager/config/river/init
index 4c49489a..4c49489a 100755
--- a/home-manager/river/init
+++ b/home-manager/config/river/init
diff --git a/home-manager/river/res/keys.ron b/home-manager/config/river/res/keys.ron
index a4ad6988..a4ad6988 100644
--- a/home-manager/river/res/keys.ron
+++ b/home-manager/config/river/res/keys.ron
diff --git a/home-manager/river/res/safe_init b/home-manager/config/river/res/safe_init
index 8e80026a..8e80026a 100755
--- a/home-manager/river/res/safe_init
+++ b/home-manager/config/river/res/safe_init
diff --git a/home-manager/ssh/default.nix b/home-manager/config/ssh/default.nix
index 506c36be..506c36be 100644
--- a/home-manager/ssh/default.nix
+++ b/home-manager/config/ssh/default.nix
diff --git a/home-manager/swayidle/config b/home-manager/config/swayidle/config
index d49aaa56..d49aaa56 100644
--- a/home-manager/swayidle/config
+++ b/home-manager/config/swayidle/config
diff --git a/home-manager/swayidle/default.nix b/home-manager/config/swayidle/default.nix
index d9f001d5..d9f001d5 100644
--- a/home-manager/swayidle/default.nix
+++ b/home-manager/config/swayidle/default.nix
diff --git a/home-manager/swaylock/default.nix b/home-manager/config/swaylock/default.nix
index dd614a61..dd614a61 100644
--- a/home-manager/swaylock/default.nix
+++ b/home-manager/config/swaylock/default.nix
diff --git a/home-manager/yambar/config/config.yml b/home-manager/config/yambar/config/config.yml
index 173e93a4..173e93a4 100644
--- a/home-manager/yambar/config/config.yml
+++ b/home-manager/config/yambar/config/config.yml
diff --git a/home-manager/yambar/config/config.yml.diffrent b/home-manager/config/yambar/config/config.yml.diffrent
index 462a329b..462a329b 100644
--- a/home-manager/yambar/config/config.yml.diffrent
+++ b/home-manager/config/yambar/config/config.yml.diffrent
diff --git a/home-manager/yambar/config/laptop.yml b/home-manager/config/yambar/config/laptop.yml
index c3bfe6ab..c3bfe6ab 100644
--- a/home-manager/yambar/config/laptop.yml
+++ b/home-manager/config/yambar/config/laptop.yml
diff --git a/home-manager/yambar/default.nix b/home-manager/config/yambar/default.nix
index 7a2e6fe9..7a2e6fe9 100644
--- a/home-manager/yambar/default.nix
+++ b/home-manager/config/yambar/default.nix
diff --git a/home-manager/yambar/scripts/amixer-monitor b/home-manager/config/yambar/scripts/amixer-monitor
index 9e75acfa..9e75acfa 100755
--- a/home-manager/yambar/scripts/amixer-monitor
+++ b/home-manager/config/yambar/scripts/amixer-monitor
diff --git a/home-manager/yambar/scripts/cpu b/home-manager/config/yambar/scripts/cpu
index bae820d0..bae820d0 100755
--- a/home-manager/yambar/scripts/cpu
+++ b/home-manager/config/yambar/scripts/cpu
diff --git a/home-manager/yambar/scripts/dfspace b/home-manager/config/yambar/scripts/dfspace
index 0b262481..0b262481 100755
--- a/home-manager/yambar/scripts/dfspace
+++ b/home-manager/config/yambar/scripts/dfspace
diff --git a/home-manager/yambar/scripts/grades-average b/home-manager/config/yambar/scripts/grades-average
index a04b958c..a04b958c 100755
--- a/home-manager/yambar/scripts/grades-average
+++ b/home-manager/config/yambar/scripts/grades-average
diff --git a/home-manager/yambar/scripts/meminfo b/home-manager/config/yambar/scripts/meminfo
index 0156e94c..0156e94c 100755
--- a/home-manager/yambar/scripts/meminfo
+++ b/home-manager/config/yambar/scripts/meminfo
diff --git a/home-manager/yambar/scripts/nmclitest b/home-manager/config/yambar/scripts/nmclitest
index 3e8bc73a..3e8bc73a 100755
--- a/home-manager/yambar/scripts/nmclitest
+++ b/home-manager/config/yambar/scripts/nmclitest
diff --git a/home-manager/yambar/scripts/pingtest b/home-manager/config/yambar/scripts/pingtest
index 2b5f9998..2b5f9998 100755
--- a/home-manager/yambar/scripts/pingtest
+++ b/home-manager/config/yambar/scripts/pingtest
diff --git a/home-manager/yambar/scripts/yambar-tray b/home-manager/config/yambar/scripts/yambar-tray
index 1704c6dd..1704c6dd 100755
--- a/home-manager/yambar/scripts/yambar-tray
+++ b/home-manager/config/yambar/scripts/yambar-tray
diff --git a/home-manager/yambar/scripts/yambar-tray-width b/home-manager/config/yambar/scripts/yambar-tray-width
index 00544e70..00544e70 100755
--- a/home-manager/yambar/scripts/yambar-tray-width
+++ b/home-manager/config/yambar/scripts/yambar-tray-width
diff --git a/home-manager/zsh/config/custom_cursor.sh b/home-manager/config/zsh/config/custom_cursor.sh
index 9a6da012..9a6da012 100644
--- a/home-manager/zsh/config/custom_cursor.sh
+++ b/home-manager/config/zsh/config/custom_cursor.sh
diff --git a/home-manager/zsh/config/zsh-init.sh b/home-manager/config/zsh/config/zsh-init.sh
index bc9af87a..bc9af87a 100644
--- a/home-manager/zsh/config/zsh-init.sh
+++ b/home-manager/config/zsh/config/zsh-init.sh
diff --git a/home-manager/zsh/config/zsh-prompt.sh b/home-manager/config/zsh/config/zsh-prompt.sh
index 1f0f164b..1f0f164b 100644
--- a/home-manager/zsh/config/zsh-prompt.sh
+++ b/home-manager/config/zsh/config/zsh-prompt.sh
diff --git a/home-manager/zsh/default.nix b/home-manager/config/zsh/default.nix
index f05de847..f05de847 100644
--- a/home-manager/zsh/default.nix
+++ b/home-manager/config/zsh/default.nix
diff --git a/home-manager/default.nix b/home-manager/default.nix
index c11b8d85..82e6927d 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -16,32 +16,8 @@
   dataHome = "${homeDirectory}/.local/share";
 in {
   imports = [
-# ./impermanence #  TODO doesn't work
-
-
-    ./alacritty
-    ./cups
-    ./firefox
-    ./gammastep
-    ./git
-    ./grades
-    ./gtk
-    ./keepassxc
-    ./latexindent
-    ./less
-    ./lf
-    ./mako
-    ./mpd
-    ./neovim
-    ./npm
-    ./python
-    ./rclone
-    ./river
-    ./ssh
-    ./swayidle
-    ./swaylock
-    ./yambar
-    ./zsh
+    ./impermanence
+    ./packages
   ];
   home = {
     inherit username homeDirectory;