255 files changed, 46 insertions, 47 deletions

diff --git a/.gitattributes b/.gitattributes
index 2b1e447f..fd6b66c6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
-home-manager/soispha/config/mail/non_public_accounts.nix filter=git-crypt diff=git-crypt
+hm/soispha/conf/mail/non_public_accounts.nix filter=git-crypt diff=git-crypt
 
 # gpg keys:
-home-manager/soispha/config/gpg/keys/key_1 filter=git-crypt diff=git-crypt
-home-manager/soispha/config/gpg/keys/key_2 filter=git-crypt diff=git-crypt
-home-manager/soispha/config/gpg/keys/key_3 filter=git-crypt diff=git-crypt
+hm/soispha/conf/gpg/keys/key_1 filter=git-crypt diff=git-crypt
+hm/soispha/conf/gpg/keys/key_2 filter=git-crypt diff=git-crypt
+hm/soispha/conf/gpg/keys/key_3 filter=git-crypt diff=git-crypt
diff --git a/flake.nix b/flake.nix
index 7a03be49..7bdcdd89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -314,7 +314,7 @@
   }: let
     sysLib = shell_library.lib.${system};
     system = "x86_64-linux";
-    pkgs = import nixpkgs (import ./system/nixpkgs {
+    pkgs = import nixpkgs (import ./sys/nixpkgs {
       inherit (nixpkgs) lib;
       inherit system;
       overlays = [nixNeovim.overlays.default];
diff --git a/flake/default.nix b/flake/default.nix
index 63dea536..b88370c0 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -33,7 +33,7 @@
   grades,
   flake_update,
 }: let
-  home_manager_config = import ../home-manager {
+  home_manager_config = import ../hm {
     inherit
       pkgs
       sysLib
diff --git a/flake/packages/default.nix b/flake/packages/default.nix
index 3f69bc89..d182b9b3 100644
--- a/flake/packages/default.nix
+++ b/flake/packages/default.nix
@@ -20,7 +20,7 @@
     builtins.mapAttrs (
       name: value: let
         nvim_config =
-          import ../../home-manager/soispha/config/neovim/nixvim/default.nix
+          import ../../hm/soispha/conf/nvim/default.nix
           args;
         build_args =
           args
diff --git a/home-manager/default.nix b/hm/default.nix
index 015cdeb2..015cdeb2 100644
--- a/home-manager/default.nix
+++ b/hm/default.nix
diff --git a/home-manager/soispha/config/alacritty/alacritty.yml b/hm/soispha/conf/alacritty/alacritty.yml
index fdccac3f..fdccac3f 100644
--- a/home-manager/soispha/config/alacritty/alacritty.yml
+++ b/hm/soispha/conf/alacritty/alacritty.yml
diff --git a/home-manager/soispha/config/alacritty/default.nix b/hm/soispha/conf/alacritty/default.nix
index 4e98f502..4e98f502 100644
--- a/home-manager/soispha/config/alacritty/default.nix
+++ b/hm/soispha/conf/alacritty/default.nix
diff --git a/home-manager/soispha/config/btop/default.nix b/hm/soispha/conf/btop/default.nix
index 06b56ea7..06b56ea7 100644
--- a/home-manager/soispha/config/btop/default.nix
+++ b/hm/soispha/conf/btop/default.nix
diff --git a/home-manager/soispha/config/dconf/default.nix b/hm/soispha/conf/dconf/default.nix
index dc439e1e..dc439e1e 100644
--- a/home-manager/soispha/config/dconf/default.nix
+++ b/hm/soispha/conf/dconf/default.nix
diff --git a/home-manager/soispha/config/default.nix b/hm/soispha/conf/default.nix
index c7db65f4..01d18d4a 100644
--- a/home-manager/soispha/config/default.nix
+++ b/hm/soispha/conf/default.nix
@@ -23,7 +23,7 @@
     ./mpv
     ./mumble
     ./neomutt
-    ./neovim
+    ./nvim
     ./nheko
     ./npm
     ./python
diff --git a/home-manager/soispha/config/direnv/default.nix b/hm/soispha/conf/direnv/default.nix
index 3a7b8add..3a7b8add 100644
--- a/home-manager/soispha/config/direnv/default.nix
+++ b/hm/soispha/conf/direnv/default.nix
diff --git a/home-manager/soispha/config/firefox/config/bookmarks/default.nix b/hm/soispha/conf/firefox/config/bookmarks/default.nix
index 4de83ac9..4de83ac9 100644
--- a/home-manager/soispha/config/firefox/config/bookmarks/default.nix
+++ b/hm/soispha/conf/firefox/config/bookmarks/default.nix
diff --git a/home-manager/soispha/config/firefox/config/chrome/userChrome.css b/hm/soispha/conf/firefox/config/chrome/userChrome.css
index 0b3aff77..0b3aff77 100644
--- a/home-manager/soispha/config/firefox/config/chrome/userChrome.css
+++ b/hm/soispha/conf/firefox/config/chrome/userChrome.css
diff --git a/home-manager/soispha/config/firefox/config/extensions/extensions.json b/hm/soispha/conf/firefox/config/extensions/extensions.json
index 7f32dfb1..7f32dfb1 100644
--- a/home-manager/soispha/config/firefox/config/extensions/extensions.json
+++ b/hm/soispha/conf/firefox/config/extensions/extensions.json
diff --git a/home-manager/soispha/config/firefox/config/prefs/default.nix b/hm/soispha/conf/firefox/config/prefs/default.nix
index 91bb65f0..91bb65f0 100644
--- a/home-manager/soispha/config/firefox/config/prefs/default.nix
+++ b/hm/soispha/conf/firefox/config/prefs/default.nix
diff --git a/home-manager/soispha/config/firefox/config/prefs/override.js b/hm/soispha/conf/firefox/config/prefs/override.js
index 9c9b70e5..9c9b70e5 100644
--- a/home-manager/soispha/config/firefox/config/prefs/override.js
+++ b/hm/soispha/conf/firefox/config/prefs/override.js
diff --git a/home-manager/soispha/config/firefox/config/search/engines/default.nix b/hm/soispha/conf/firefox/config/search/engines/default.nix
index 286d7247..286d7247 100644
--- a/home-manager/soispha/config/firefox/config/search/engines/default.nix
+++ b/hm/soispha/conf/firefox/config/search/engines/default.nix
diff --git a/home-manager/soispha/config/firefox/default.nix b/hm/soispha/conf/firefox/default.nix
index 1040ed0b..1040ed0b 100644
--- a/home-manager/soispha/config/firefox/default.nix
+++ b/hm/soispha/conf/firefox/default.nix
diff --git a/home-manager/soispha/config/firefox/functions/bookmarks/default.nix b/hm/soispha/conf/firefox/functions/bookmarks/default.nix
index d1d89dd2..d1d89dd2 100644
--- a/home-manager/soispha/config/firefox/functions/bookmarks/default.nix
+++ b/hm/soispha/conf/firefox/functions/bookmarks/default.nix
diff --git a/home-manager/soispha/config/firefox/functions/extensions/default.nix b/hm/soispha/conf/firefox/functions/extensions/default.nix
index b84461c7..b84461c7 100644
--- a/home-manager/soispha/config/firefox/functions/extensions/default.nix
+++ b/hm/soispha/conf/firefox/functions/extensions/default.nix
diff --git a/home-manager/soispha/config/firefox/functions/extensions/video-pauser.nix b/hm/soispha/conf/firefox/functions/extensions/video-pauser.nix
index c4c5238f..c4c5238f 100644
--- a/home-manager/soispha/config/firefox/functions/extensions/video-pauser.nix
+++ b/hm/soispha/conf/firefox/functions/extensions/video-pauser.nix
diff --git a/home-manager/soispha/config/firefox/scripts/unzip_mozlz4.py b/hm/soispha/conf/firefox/scripts/unzip_mozlz4.py
index 311fd214..311fd214 100755
--- a/home-manager/soispha/config/firefox/scripts/unzip_mozlz4.py
+++ b/hm/soispha/conf/firefox/scripts/unzip_mozlz4.py
diff --git a/home-manager/soispha/config/firefox/scripts/update_extensions b/hm/soispha/conf/firefox/scripts/update_extensions
index 05f47aad..05f47aad 100755
--- a/home-manager/soispha/config/firefox/scripts/update_extensions
+++ b/hm/soispha/conf/firefox/scripts/update_extensions
diff --git a/home-manager/soispha/config/gammastep/default.nix b/hm/soispha/conf/gammastep/default.nix
index 1ae0550b..1ae0550b 100644
--- a/home-manager/soispha/config/gammastep/default.nix
+++ b/hm/soispha/conf/gammastep/default.nix
diff --git a/home-manager/soispha/config/git/default.nix b/hm/soispha/conf/git/default.nix
index f99f705c..f99f705c 100644
--- a/home-manager/soispha/config/git/default.nix
+++ b/hm/soispha/conf/git/default.nix
diff --git a/home-manager/soispha/config/git/git_ignore.git b/hm/soispha/conf/git/git_ignore.git
index 8f29815e..8f29815e 100644
--- a/home-manager/soispha/config/git/git_ignore.git
+++ b/hm/soispha/conf/git/git_ignore.git
diff --git a/home-manager/soispha/config/git/git_template.git b/hm/soispha/conf/git/git_template.git
index 9621698d..9621698d 100644
--- a/home-manager/soispha/config/git/git_template.git
+++ b/hm/soispha/conf/git/git_template.git
diff --git a/home-manager/soispha/config/gpg/agent-program b/hm/soispha/conf/gpg/agent-program
index e6917db0..e6917db0 100755
--- a/home-manager/soispha/config/gpg/agent-program
+++ b/hm/soispha/conf/gpg/agent-program
diff --git a/home-manager/soispha/config/gpg/default.nix b/hm/soispha/conf/gpg/default.nix
index 97334c8f..97334c8f 100644
--- a/home-manager/soispha/config/gpg/default.nix
+++ b/hm/soispha/conf/gpg/default.nix
diff --git a/home-manager/soispha/config/gpg/keys/key_1 b/hm/soispha/conf/gpg/keys/key_1
index b10b8b6c..b10b8b6c 100644
--- a/home-manager/soispha/config/gpg/keys/key_1
+++ b/hm/soispha/conf/gpg/keys/key_1
Binary files differdiff --git a/home-manager/soispha/config/gpg/keys/key_2 b/hm/soispha/conf/gpg/keys/key_2
index 0b06cf3b..0b06cf3b 100644
--- a/home-manager/soispha/config/gpg/keys/key_2
+++ b/hm/soispha/conf/gpg/keys/key_2
Binary files differdiff --git a/home-manager/soispha/config/gpg/keys/key_3 b/hm/soispha/conf/gpg/keys/key_3
index 22ffb931..22ffb931 100644
--- a/home-manager/soispha/config/gpg/keys/key_3
+++ b/hm/soispha/conf/gpg/keys/key_3
Binary files differdiff --git a/home-manager/soispha/config/grades/config.yaml b/hm/soispha/conf/grades/config.yaml
index 36712971..36712971 100644
--- a/home-manager/soispha/config/grades/config.yaml
+++ b/hm/soispha/conf/grades/config.yaml
diff --git a/home-manager/soispha/config/grades/default.nix b/hm/soispha/conf/grades/default.nix
index d2678174..d2678174 100644
--- a/home-manager/soispha/config/grades/default.nix
+++ b/hm/soispha/conf/grades/default.nix
diff --git a/home-manager/soispha/config/gtk/default.nix b/hm/soispha/conf/gtk/default.nix
index f5411369..f5411369 100644
--- a/home-manager/soispha/config/gtk/default.nix
+++ b/hm/soispha/conf/gtk/default.nix
diff --git a/home-manager/soispha/config/himalaya/default.nix b/hm/soispha/conf/himalaya/default.nix
index c072693e..c072693e 100644
--- a/home-manager/soispha/config/himalaya/default.nix
+++ b/hm/soispha/conf/himalaya/default.nix
diff --git a/home-manager/soispha/config/iamb/config.json b/hm/soispha/conf/iamb/config.json
index ca06d543..ca06d543 100644
--- a/home-manager/soispha/config/iamb/config.json
+++ b/hm/soispha/conf/iamb/config.json
diff --git a/home-manager/soispha/config/iamb/default.nix b/hm/soispha/conf/iamb/default.nix
index 2a93472c..2a93472c 100644
--- a/home-manager/soispha/config/iamb/default.nix
+++ b/hm/soispha/conf/iamb/default.nix
diff --git a/home-manager/soispha/config/keepassxc/default.nix b/hm/soispha/conf/keepassxc/default.nix
index 3ac82812..3ac82812 100644
--- a/home-manager/soispha/config/keepassxc/default.nix
+++ b/hm/soispha/conf/keepassxc/default.nix
diff --git a/home-manager/soispha/config/keepassxc/keepassxc.ini b/hm/soispha/conf/keepassxc/keepassxc.ini
index 288a194b..288a194b 100644
--- a/home-manager/soispha/config/keepassxc/keepassxc.ini
+++ b/hm/soispha/conf/keepassxc/keepassxc.ini
diff --git a/home-manager/soispha/config/latexindent/default.nix b/hm/soispha/conf/latexindent/default.nix
index 0d776e14..0d776e14 100644
--- a/home-manager/soispha/config/latexindent/default.nix
+++ b/hm/soispha/conf/latexindent/default.nix
diff --git a/home-manager/soispha/config/latexindent/indentconfig.yaml b/hm/soispha/conf/latexindent/indentconfig.yaml
index d67351f3..d67351f3 100644
--- a/home-manager/soispha/config/latexindent/indentconfig.yaml
+++ b/hm/soispha/conf/latexindent/indentconfig.yaml
diff --git a/home-manager/soispha/config/latexindent/mysettings.yaml b/hm/soispha/conf/latexindent/mysettings.yaml
index 9a0f8b2f..9a0f8b2f 100644
--- a/home-manager/soispha/config/latexindent/mysettings.yaml
+++ b/hm/soispha/conf/latexindent/mysettings.yaml
diff --git a/home-manager/soispha/config/less/default.nix b/hm/soispha/conf/less/default.nix
index fe7142f1..fe7142f1 100644
--- a/home-manager/soispha/config/less/default.nix
+++ b/hm/soispha/conf/less/default.nix
diff --git a/home-manager/soispha/config/lf/colors b/hm/soispha/conf/lf/colors
index b2289b4e..b2289b4e 100644
--- a/home-manager/soispha/config/lf/colors
+++ b/hm/soispha/conf/lf/colors
diff --git a/home-manager/soispha/config/lf/commands/default.nix b/hm/soispha/conf/lf/commands/default.nix
index a52cb2f0..a52cb2f0 100644
--- a/home-manager/soispha/config/lf/commands/default.nix
+++ b/hm/soispha/conf/lf/commands/default.nix
diff --git a/home-manager/soispha/config/lf/commands/scripts/archive b/hm/soispha/conf/lf/commands/scripts/archive
index 48fe25fc..48fe25fc 100755
--- a/home-manager/soispha/config/lf/commands/scripts/archive
+++ b/hm/soispha/conf/lf/commands/scripts/archive
diff --git a/home-manager/soispha/config/lf/commands/scripts/broot_jump b/hm/soispha/conf/lf/commands/scripts/broot_jump
index abefc616..abefc616 100755
--- a/home-manager/soispha/config/lf/commands/scripts/broot_jump
+++ b/hm/soispha/conf/lf/commands/scripts/broot_jump
diff --git a/home-manager/soispha/config/lf/commands/scripts/chmod b/hm/soispha/conf/lf/commands/scripts/chmod
index 07bc37cc..07bc37cc 100755
--- a/home-manager/soispha/config/lf/commands/scripts/chmod
+++ b/hm/soispha/conf/lf/commands/scripts/chmod
diff --git a/home-manager/soispha/config/lf/commands/scripts/clear_trash b/hm/soispha/conf/lf/commands/scripts/clear_trash
index f2571fcc..f2571fcc 100755
--- a/home-manager/soispha/config/lf/commands/scripts/clear_trash
+++ b/hm/soispha/conf/lf/commands/scripts/clear_trash
diff --git a/home-manager/soispha/config/lf/commands/scripts/dl_file b/hm/soispha/conf/lf/commands/scripts/dl_file
index 54518049..54518049 100755
--- a/home-manager/soispha/config/lf/commands/scripts/dl_file
+++ b/hm/soispha/conf/lf/commands/scripts/dl_file
diff --git a/home-manager/soispha/config/lf/commands/scripts/dragon b/hm/soispha/conf/lf/commands/scripts/dragon
index 7e2d9ba6..7e2d9ba6 100755
--- a/home-manager/soispha/config/lf/commands/scripts/dragon
+++ b/hm/soispha/conf/lf/commands/scripts/dragon
diff --git a/home-manager/soispha/config/lf/commands/scripts/dragon_individual b/hm/soispha/conf/lf/commands/scripts/dragon_individual
index 5d55aaa8..5d55aaa8 100755
--- a/home-manager/soispha/config/lf/commands/scripts/dragon_individual
+++ b/hm/soispha/conf/lf/commands/scripts/dragon_individual
diff --git a/home-manager/soispha/config/lf/commands/scripts/dragon_stay b/hm/soispha/conf/lf/commands/scripts/dragon_stay
index f3483483..f3483483 100755
--- a/home-manager/soispha/config/lf/commands/scripts/dragon_stay
+++ b/hm/soispha/conf/lf/commands/scripts/dragon_stay
diff --git a/home-manager/soispha/config/lf/commands/scripts/fzf_jump b/hm/soispha/conf/lf/commands/scripts/fzf_jump
index 0e53d7ca..0e53d7ca 100755
--- a/home-manager/soispha/config/lf/commands/scripts/fzf_jump
+++ b/hm/soispha/conf/lf/commands/scripts/fzf_jump
diff --git a/home-manager/soispha/config/lf/commands/scripts/go_project_root b/hm/soispha/conf/lf/commands/scripts/go_project_root
index 555caaf9..555caaf9 100755
--- a/home-manager/soispha/config/lf/commands/scripts/go_project_root
+++ b/hm/soispha/conf/lf/commands/scripts/go_project_root
diff --git a/home-manager/soispha/config/lf/commands/scripts/mk_dir b/hm/soispha/conf/lf/commands/scripts/mk_dir
index 4dca06dc..4dca06dc 100755
--- a/home-manager/soispha/config/lf/commands/scripts/mk_dir
+++ b/hm/soispha/conf/lf/commands/scripts/mk_dir
diff --git a/home-manager/soispha/config/lf/commands/scripts/mk_file b/hm/soispha/conf/lf/commands/scripts/mk_file
index 5f245396..5f245396 100755
--- a/home-manager/soispha/config/lf/commands/scripts/mk_file
+++ b/hm/soispha/conf/lf/commands/scripts/mk_file
diff --git a/home-manager/soispha/config/lf/commands/scripts/mk_file_and_edit b/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit
index 2e5a2deb..2e5a2deb 100755
--- a/home-manager/soispha/config/lf/commands/scripts/mk_file_and_edit
+++ b/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit
diff --git a/home-manager/soispha/config/lf/commands/scripts/mk_ln b/hm/soispha/conf/lf/commands/scripts/mk_ln
index 1e97517f..1e97517f 100755
--- a/home-manager/soispha/config/lf/commands/scripts/mk_ln
+++ b/hm/soispha/conf/lf/commands/scripts/mk_ln
diff --git a/home-manager/soispha/config/lf/commands/scripts/mk_scr_default b/hm/soispha/conf/lf/commands/scripts/mk_scr_default
index b13ca9f5..b13ca9f5 100755
--- a/home-manager/soispha/config/lf/commands/scripts/mk_scr_default
+++ b/hm/soispha/conf/lf/commands/scripts/mk_scr_default
diff --git a/home-manager/soispha/config/lf/commands/scripts/mk_scr_temp b/hm/soispha/conf/lf/commands/scripts/mk_scr_temp
index a520469c..a520469c 100755
--- a/home-manager/soispha/config/lf/commands/scripts/mk_scr_temp
+++ b/hm/soispha/conf/lf/commands/scripts/mk_scr_temp
diff --git a/home-manager/soispha/config/lf/commands/scripts/open b/hm/soispha/conf/lf/commands/scripts/open
index c507482b..c507482b 100755
--- a/home-manager/soispha/config/lf/commands/scripts/open
+++ b/hm/soispha/conf/lf/commands/scripts/open
diff --git a/home-manager/soispha/config/lf/commands/scripts/open_config b/hm/soispha/conf/lf/commands/scripts/open_config
index 35e5165d..35e5165d 100755
--- a/home-manager/soispha/config/lf/commands/scripts/open_config
+++ b/hm/soispha/conf/lf/commands/scripts/open_config
diff --git a/home-manager/soispha/config/lf/commands/scripts/restore_trash b/hm/soispha/conf/lf/commands/scripts/restore_trash
index a7bf0094..a7bf0094 100755
--- a/home-manager/soispha/config/lf/commands/scripts/restore_trash
+++ b/hm/soispha/conf/lf/commands/scripts/restore_trash
diff --git a/home-manager/soispha/config/lf/commands/scripts/set_wall_paper b/hm/soispha/conf/lf/commands/scripts/set_wall_paper
index c493e773..c493e773 100755
--- a/home-manager/soispha/config/lf/commands/scripts/set_wall_paper
+++ b/hm/soispha/conf/lf/commands/scripts/set_wall_paper
diff --git a/home-manager/soispha/config/lf/commands/scripts/stripspace b/hm/soispha/conf/lf/commands/scripts/stripspace
index 91714712..91714712 100755
--- a/home-manager/soispha/config/lf/commands/scripts/stripspace
+++ b/hm/soispha/conf/lf/commands/scripts/stripspace
diff --git a/home-manager/soispha/config/lf/commands/scripts/trash b/hm/soispha/conf/lf/commands/scripts/trash
index 8dd6033d..8dd6033d 100755
--- a/home-manager/soispha/config/lf/commands/scripts/trash
+++ b/hm/soispha/conf/lf/commands/scripts/trash
diff --git a/home-manager/soispha/config/lf/commands/scripts/unarchive b/hm/soispha/conf/lf/commands/scripts/unarchive
index ee97f3b1..ee97f3b1 100755
--- a/home-manager/soispha/config/lf/commands/scripts/unarchive
+++ b/hm/soispha/conf/lf/commands/scripts/unarchive
diff --git a/home-manager/soispha/config/lf/default.nix b/hm/soispha/conf/lf/default.nix
index ed037b05..ed037b05 100644
--- a/home-manager/soispha/config/lf/default.nix
+++ b/hm/soispha/conf/lf/default.nix
diff --git a/home-manager/soispha/config/lf/icons b/hm/soispha/conf/lf/icons
index 7ef62a0b..7ef62a0b 100644
--- a/home-manager/soispha/config/lf/icons
+++ b/hm/soispha/conf/lf/icons
diff --git a/home-manager/soispha/config/lf/keybindings/default.nix b/hm/soispha/conf/lf/keybindings/default.nix
index ab34d7d4..ab34d7d4 100644
--- a/home-manager/soispha/config/lf/keybindings/default.nix
+++ b/hm/soispha/conf/lf/keybindings/default.nix
diff --git a/home-manager/soispha/config/mail/default.nix b/hm/soispha/conf/mail/default.nix
index 475bcacf..475bcacf 100644
--- a/home-manager/soispha/config/mail/default.nix
+++ b/hm/soispha/conf/mail/default.nix
diff --git a/home-manager/soispha/config/mail/non_public_accounts.nix b/hm/soispha/conf/mail/non_public_accounts.nix
index 0076aebd..0076aebd 100644
--- a/home-manager/soispha/config/mail/non_public_accounts.nix
+++ b/hm/soispha/conf/mail/non_public_accounts.nix
Binary files differdiff --git a/home-manager/soispha/config/mako/default.nix b/hm/soispha/conf/mako/default.nix
index 711457f2..711457f2 100644
--- a/home-manager/soispha/config/mako/default.nix
+++ b/hm/soispha/conf/mako/default.nix
diff --git a/home-manager/soispha/config/mbsync/default.nix b/hm/soispha/conf/mbsync/default.nix
index ac9808c9..ac9808c9 100644
--- a/home-manager/soispha/config/mbsync/default.nix
+++ b/hm/soispha/conf/mbsync/default.nix
diff --git a/home-manager/soispha/config/mpd/default.nix b/hm/soispha/conf/mpd/default.nix
index bbd345a7..bbd345a7 100644
--- a/home-manager/soispha/config/mpd/default.nix
+++ b/hm/soispha/conf/mpd/default.nix
diff --git a/home-manager/soispha/config/mpd/mpdconf.example b/hm/soispha/conf/mpd/mpdconf.example
index eaa5e641..eaa5e641 100644
--- a/home-manager/soispha/config/mpd/mpdconf.example
+++ b/hm/soispha/conf/mpd/mpdconf.example
diff --git a/home-manager/soispha/config/mpv/default.nix b/hm/soispha/conf/mpv/default.nix
index 1e10f2ef..1e10f2ef 100644
--- a/home-manager/soispha/config/mpv/default.nix
+++ b/hm/soispha/conf/mpv/default.nix
diff --git a/home-manager/soispha/config/mumble/Mumble.conf b/hm/soispha/conf/mumble/Mumble.conf
index 2d895f41..2d895f41 100644
--- a/home-manager/soispha/config/mumble/Mumble.conf
+++ b/hm/soispha/conf/mumble/Mumble.conf
diff --git a/home-manager/soispha/config/mumble/default.nix b/hm/soispha/conf/mumble/default.nix
index 6fa524dc..6fa524dc 100644
--- a/home-manager/soispha/config/mumble/default.nix
+++ b/hm/soispha/conf/mumble/default.nix
diff --git a/home-manager/soispha/config/neomutt/default.nix b/hm/soispha/conf/neomutt/default.nix
index e4fbcb39..e4fbcb39 100644
--- a/home-manager/soispha/config/neomutt/default.nix
+++ b/hm/soispha/conf/neomutt/default.nix
diff --git a/home-manager/soispha/config/nheko/default.nix b/hm/soispha/conf/nheko/default.nix
index fd147c0b..fd147c0b 100644
--- a/home-manager/soispha/config/nheko/default.nix
+++ b/hm/soispha/conf/nheko/default.nix
diff --git a/home-manager/soispha/config/npm/.npmrc b/hm/soispha/conf/npm/.npmrc
index d0d846bd..d0d846bd 100644
--- a/home-manager/soispha/config/npm/.npmrc
+++ b/hm/soispha/conf/npm/.npmrc
diff --git a/home-manager/soispha/config/npm/default.nix b/hm/soispha/conf/npm/default.nix
index 7b4bb6a1..7b4bb6a1 100644
--- a/home-manager/soispha/config/npm/default.nix
+++ b/hm/soispha/conf/npm/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/autocmds/default.nix b/hm/soispha/conf/nvim/autocmds/default.nix
index cb0311fb..cb0311fb 100644
--- a/home-manager/soispha/config/neovim/nixvim/autocmds/default.nix
+++ b/hm/soispha/conf/nvim/autocmds/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/clipboard/default.nix b/hm/soispha/conf/nvim/clipboard/default.nix
index 0a686190..0a686190 100644
--- a/home-manager/soispha/config/neovim/nixvim/clipboard/default.nix
+++ b/hm/soispha/conf/nvim/clipboard/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/default.nix b/hm/soispha/conf/nvim/default.nix
index 61467618..61467618 100644
--- a/home-manager/soispha/config/neovim/nixvim/default.nix
+++ b/hm/soispha/conf/nvim/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/files/default.nix b/hm/soispha/conf/nvim/files/default.nix
index 5045eb9f..5045eb9f 100644
--- a/home-manager/soispha/config/neovim/nixvim/files/default.nix
+++ b/hm/soispha/conf/nvim/files/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/files/ftplugin/tex.lua b/hm/soispha/conf/nvim/files/ftplugin/tex.lua
index 8f39d7bb..8f39d7bb 100644
--- a/home-manager/soispha/config/neovim/nixvim/files/ftplugin/tex.lua
+++ b/hm/soispha/conf/nvim/files/ftplugin/tex.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/mappings/default.nix b/hm/soispha/conf/nvim/mappings/default.nix
index 1d00b0a4..1d00b0a4 100644
--- a/home-manager/soispha/config/neovim/nixvim/mappings/default.nix
+++ b/hm/soispha/conf/nvim/mappings/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/options/default.nix b/hm/soispha/conf/nvim/options/default.nix
index 879a5cd1..879a5cd1 100644
--- a/home-manager/soispha/config/neovim/nixvim/options/default.nix
+++ b/hm/soispha/conf/nvim/options/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/default.nix b/hm/soispha/conf/nvim/plugins/colorscheme/default.nix
index 21069752..21069752 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/default.nix
+++ b/hm/soispha/conf/nvim/plugins/colorscheme/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/lua/mk_todos_readable.lua b/hm/soispha/conf/nvim/plugins/colorscheme/lua/mk_todos_readable.lua
index 0145ec19..0145ec19 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/lua/mk_todos_readable.lua
+++ b/hm/soispha/conf/nvim/plugins/colorscheme/lua/mk_todos_readable.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/lua/nightfox.lua b/hm/soispha/conf/nvim/plugins/colorscheme/lua/nightfox.lua
index 025eb133..025eb133 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/lua/nightfox.lua
+++ b/hm/soispha/conf/nvim/plugins/colorscheme/lua/nightfox.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/default.nix b/hm/soispha/conf/nvim/plugins/default.nix
index 796ae3f2..796ae3f2 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/default.nix
+++ b/hm/soispha/conf/nvim/plugins/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/femaco/default.nix b/hm/soispha/conf/nvim/plugins/femaco/default.nix
index 6d7ec16a..6d7ec16a 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/femaco/default.nix
+++ b/hm/soispha/conf/nvim/plugins/femaco/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/femaco/lua/femaco.lua b/hm/soispha/conf/nvim/plugins/femaco/lua/femaco.lua
index 12171793..12171793 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/femaco/lua/femaco.lua
+++ b/hm/soispha/conf/nvim/plugins/femaco/lua/femaco.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/goto-preview/default.nix b/hm/soispha/conf/nvim/plugins/goto-preview/default.nix
index 740bb04c..740bb04c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/goto-preview/default.nix
+++ b/hm/soispha/conf/nvim/plugins/goto-preview/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/goto-preview/lua/goto-preview.lua b/hm/soispha/conf/nvim/plugins/goto-preview/lua/goto-preview.lua
index cde50d3e..cde50d3e 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/goto-preview/lua/goto-preview.lua
+++ b/hm/soispha/conf/nvim/plugins/goto-preview/lua/goto-preview.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/harpoon/default.nix b/hm/soispha/conf/nvim/plugins/harpoon/default.nix
index ecd1d6cb..ecd1d6cb 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/harpoon/default.nix
+++ b/hm/soispha/conf/nvim/plugins/harpoon/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/leap/default.nix b/hm/soispha/conf/nvim/plugins/leap/default.nix
index bffdf33c..bffdf33c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/leap/default.nix
+++ b/hm/soispha/conf/nvim/plugins/leap/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/default.nix b/hm/soispha/conf/nvim/plugins/lf-nvim/default.nix
index c562f400..c562f400 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lf-nvim/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/lua/lf-nvim.lua b/hm/soispha/conf/nvim/plugins/lf-nvim/lua/lf-nvim.lua
index 8a0cf817..8a0cf817 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/lua/lf-nvim.lua
+++ b/hm/soispha/conf/nvim/plugins/lf-nvim/lua/lf-nvim.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp-progress-nvim/default.nix b/hm/soispha/conf/nvim/plugins/lsp-progress-nvim/default.nix
index 6602ceb6..6602ceb6 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp-progress-nvim/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp-progress-nvim/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp-progress-nvim/lua/lsp-progress-nvim.lua b/hm/soispha/conf/nvim/plugins/lsp-progress-nvim/lua/lsp-progress-nvim.lua
index 4273085c..4273085c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp-progress-nvim/lua/lsp-progress-nvim.lua
+++ b/hm/soispha/conf/nvim/plugins/lsp-progress-nvim/lua/lsp-progress-nvim.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/default.nix b/hm/soispha/conf/nvim/plugins/lsp/default.nix
index b7c1e174..b7c1e174 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/keymaps/default.nix b/hm/soispha/conf/nvim/plugins/lsp/keymaps/default.nix
index 4017521d..4017521d 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/keymaps/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/keymaps/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/default.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/default.nix
index 8ffac2e1..8ffac2e1 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/bashls.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/bashls.nix
index 0577a335..0577a335 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/bashls.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/bashls.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/ccls.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/ccls.nix
index 0698bcce..0698bcce 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/ccls.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/ccls.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/ltex.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/ltex.nix
index 0d039f82..0d039f82 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/ltex.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/ltex.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/lua-ls.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/lua-ls.nix
index 5a44b500..5a44b500 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/lua-ls.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/lua-ls.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/nil_ls.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/nil_ls.nix
index f0cccbdc..f0cccbdc 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/nil_ls.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/nil_ls.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/rust-analyzer.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/rust-analyzer.nix
index 943a8c80..943a8c80 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/rust-analyzer.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/rust-analyzer.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/texlab.nix b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/texlab.nix
index 59af8d39..59af8d39 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lsp/servers/servers/texlab.nix
+++ b/hm/soispha/conf/nvim/plugins/lsp/servers/servers/texlab.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lspkind/default.nix b/hm/soispha/conf/nvim/plugins/lspkind/default.nix
index ed7d411b..ed7d411b 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lspkind/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lspkind/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lualine/default.nix b/hm/soispha/conf/nvim/plugins/lualine/default.nix
index de48efea..0b789558 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lualine/default.nix
+++ b/hm/soispha/conf/nvim/plugins/lualine/default.nix
@@ -19,31 +19,35 @@
       '';
     };
     get_mixed_indent = {
-      __raw = ''
-        function()
-            local space_pat = [[\v^ +]]
-            local tab_pat = [[\v^\t+]]
-            local space_indent = vim.fn.search(space_pat, 'nwc')
-            local tab_indent = vim.fn.search(tab_pat, 'nwc')
-            local mixed = (space_indent > 0 and tab_indent > 0)
-            local mixed_same_line
-            if not mixed then
-                mixed_same_line = vim.fn.search([[\v^(\t+ | +\t)]], 'nwc')
-                mixed = mixed_same_line > 0
-            end
-            if not mixed then return "" end
-            if mixed_same_line ~= nil and mixed_same_line > 0 then
-                return 'MI:' .. mixed_same_line
-            end
-            local space_indent_cnt = vim.fn.searchcount({ pattern = space_pat, max_count = 1e3 }).total
-            local tab_indent_cnt = vim.fn.searchcount({ pattern = tab_pat, max_count = 1e3 }).total
-            if space_indent_cnt > tab_indent_cnt then
-                return 'MI:' .. tab_indent
-            else
-                return 'MI:' .. space_indent
-            end
-        end
-      '';
+      __raw =
+        /*
+        lua
+        */
+        ''
+          function()
+              local space_pat = [[\v^ +]]
+              local tab_pat = [[\v^\t+]]
+              local space_indent = vim.fn.search(space_pat, 'nwc')
+              local tab_indent = vim.fn.search(tab_pat, 'nwc')
+              local mixed = (space_indent > 0 and tab_indent > 0)
+              local mixed_same_line
+              if not mixed then
+                  mixed_same_line = vim.fn.search([[\v^(\t+ | +\t)]], 'nwc')
+                  mixed = mixed_same_line > 0
+              end
+              if not mixed then return "" end
+              if mixed_same_line ~= nil and mixed_same_line > 0 then
+                  return 'MI:' .. mixed_same_line
+              end
+              local space_indent_cnt = vim.fn.searchcount({ pattern = space_pat, max_count = 1e3 }).total
+              local tab_indent_cnt = vim.fn.searchcount({ pattern = tab_pat, max_count = 1e3 }).total
+              if space_indent_cnt > tab_indent_cnt then
+                  return 'MI:' .. tab_indent
+              else
+                  return 'MI:' .. space_indent
+              end
+          end
+        '';
     };
   in {
     enable = true;
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/default.nix b/hm/soispha/conf/nvim/plugins/luasnip/default.nix
index 50a0b94c..50a0b94c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/default.nix
+++ b/hm/soispha/conf/nvim/plugins/luasnip/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/luasnip.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/luasnip.lua
index 0a603692..0a603692 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/luasnip.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/luasnip.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/all.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/all.lua
index 5ce91a87..5ce91a87 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/all.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/all.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/html/html.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/html/html.lua
index c467dd68..c467dd68 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/html/html.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/html/html.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/tex/delimiter.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/tex/delimiter.lua
index e50898fc..e50898fc 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/tex/delimiter.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/tex/delimiter.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/tex/greek.lua b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/tex/greek.lua
index 19989093..19989093 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/luasnip/lua/snippets/tex/greek.lua
+++ b/hm/soispha/conf/nvim/plugins/luasnip/lua/snippets/tex/greek.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-cmp/default.nix b/hm/soispha/conf/nvim/plugins/nvim-cmp/default.nix
index 2fd35272..2fd35272 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-cmp/default.nix
+++ b/hm/soispha/conf/nvim/plugins/nvim-cmp/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/default.nix b/hm/soispha/conf/nvim/plugins/nvim-lint/default.nix
index c583ebf6..c583ebf6 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/default.nix
+++ b/hm/soispha/conf/nvim/plugins/nvim-lint/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/lua/nvim-lint.lua b/hm/soispha/conf/nvim/plugins/nvim-lint/lua/nvim-lint.lua
index 582da638..582da638 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/lua/nvim-lint.lua
+++ b/hm/soispha/conf/nvim/plugins/nvim-lint/lua/nvim-lint.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/raw_plugins/default.nix b/hm/soispha/conf/nvim/plugins/raw_plugins/default.nix
index 941cb7cb..941cb7cb 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/raw_plugins/default.nix
+++ b/hm/soispha/conf/nvim/plugins/raw_plugins/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/default.nix b/hm/soispha/conf/nvim/plugins/telescope/default.nix
index b5054ed0..b5054ed0 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/defaults/default.nix b/hm/soispha/conf/nvim/plugins/telescope/defaults/default.nix
index 1d88aad8..1d88aad8 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/defaults/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/defaults/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/bibtex/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/bibtex/default.nix
index 12c9736c..12c9736c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/bibtex/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/bibtex/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/default.nix
index 0b1e033a..0b1e033a 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/frecency/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/frecency/default.nix
index 4a4c22be..4a4c22be 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/frecency/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/frecency/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/fzy-native/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/fzy-native/default.nix
index ce0bdccc..ce0bdccc 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/fzy-native/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/fzy-native/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/rooter/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/rooter/default.nix
index 779448cc..779448cc 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/rooter/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/rooter/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/rooter/lua/rooter.lua b/hm/soispha/conf/nvim/plugins/telescope/extensions/rooter/lua/rooter.lua
index eaf68ecf..eaf68ecf 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/rooter/lua/rooter.lua
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/rooter/lua/rooter.lua
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/symbols/default.nix b/hm/soispha/conf/nvim/plugins/telescope/extensions/symbols/default.nix
index 1a679776..1a679776 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/extensions/symbols/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/extensions/symbols/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/keymaps/default.nix b/hm/soispha/conf/nvim/plugins/telescope/keymaps/default.nix
index f0745f73..f0745f73 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/telescope/keymaps/default.nix
+++ b/hm/soispha/conf/nvim/plugins/telescope/keymaps/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/todo-comments/default.nix b/hm/soispha/conf/nvim/plugins/todo-comments/default.nix
index f4d2b1c9..9ed6cc87 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/todo-comments/default.nix
+++ b/hm/soispha/conf/nvim/plugins/todo-comments/default.nix
@@ -8,7 +8,7 @@
     highlight = {
       keyword = "wide_fg";
     };
-    keywordds = {
+    keywords = {
       /*
       # Defaults:
       FIX = {
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/treesitter/default.nix b/hm/soispha/conf/nvim/plugins/treesitter/default.nix
index 9d30d6b9..9d30d6b9 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/treesitter/default.nix
+++ b/hm/soispha/conf/nvim/plugins/treesitter/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/vim-tex/default.nix b/hm/soispha/conf/nvim/plugins/vim-tex/default.nix
index 9b5cea5e..9b5cea5e 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/vim-tex/default.nix
+++ b/hm/soispha/conf/nvim/plugins/vim-tex/default.nix
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/which-key/default.nix b/hm/soispha/conf/nvim/plugins/which-key/default.nix
index be63f7ac..be63f7ac 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/which-key/default.nix
+++ b/hm/soispha/conf/nvim/plugins/which-key/default.nix
diff --git a/home-manager/soispha/config/python/default.nix b/hm/soispha/conf/python/default.nix
index eeaccdcf..eeaccdcf 100644
--- a/home-manager/soispha/config/python/default.nix
+++ b/hm/soispha/conf/python/default.nix
diff --git a/home-manager/soispha/config/python/pythonrc b/hm/soispha/conf/python/pythonrc
index 38c48e0f..38c48e0f 100644
--- a/home-manager/soispha/config/python/pythonrc
+++ b/hm/soispha/conf/python/pythonrc
diff --git a/home-manager/soispha/config/rclone/default.nix b/hm/soispha/conf/rclone/default.nix
index bd0c1ac2..bd0c1ac2 100644
--- a/home-manager/soispha/config/rclone/default.nix
+++ b/hm/soispha/conf/rclone/default.nix
diff --git a/home-manager/soispha/config/rclone/rclone.conf b/hm/soispha/conf/rclone/rclone.conf
index 9e1c4f08..9e1c4f08 100644
--- a/home-manager/soispha/config/rclone/rclone.conf
+++ b/hm/soispha/conf/rclone/rclone.conf
diff --git a/home-manager/soispha/config/ssh/default.nix b/hm/soispha/conf/ssh/default.nix
index 1359e4ab..1359e4ab 100644
--- a/home-manager/soispha/config/ssh/default.nix
+++ b/hm/soispha/conf/ssh/default.nix
diff --git a/home-manager/soispha/config/swayidle/config b/hm/soispha/conf/swayidle/config
index 8ba07850..8ba07850 100644
--- a/home-manager/soispha/config/swayidle/config
+++ b/hm/soispha/conf/swayidle/config
diff --git a/home-manager/soispha/config/swayidle/default.nix b/hm/soispha/conf/swayidle/default.nix
index 6b8a7d80..6b8a7d80 100644
--- a/home-manager/soispha/config/swayidle/default.nix
+++ b/hm/soispha/conf/swayidle/default.nix
diff --git a/home-manager/soispha/config/swaylock/commands.jpg b/hm/soispha/conf/swaylock/commands.jpg
index 54016503..54016503 100644
--- a/home-manager/soispha/config/swaylock/commands.jpg
+++ b/hm/soispha/conf/swaylock/commands.jpg
Binary files differdiff --git a/home-manager/soispha/config/swaylock/default.nix b/hm/soispha/conf/swaylock/default.nix
index 7c3762cc..7c3762cc 100644
--- a/home-manager/soispha/config/swaylock/default.nix
+++ b/hm/soispha/conf/swaylock/default.nix
diff --git a/home-manager/soispha/config/swaylock/gnu.png b/hm/soispha/conf/swaylock/gnu.png
index d07dee3e..d07dee3e 100644
--- a/home-manager/soispha/config/swaylock/gnu.png
+++ b/hm/soispha/conf/swaylock/gnu.png
Binary files differdiff --git a/home-manager/soispha/config/tridactyl/config.vim b/hm/soispha/conf/tridactyl/config.vim
index 84e290cb..84e290cb 100644
--- a/home-manager/soispha/config/tridactyl/config.vim
+++ b/hm/soispha/conf/tridactyl/config.vim
diff --git a/home-manager/soispha/config/tridactyl/default.nix b/hm/soispha/conf/tridactyl/default.nix
index 23307cfe..23307cfe 100644
--- a/home-manager/soispha/config/tridactyl/default.nix
+++ b/hm/soispha/conf/tridactyl/default.nix
diff --git a/home-manager/soispha/config/yambar/config/config.yml b/hm/soispha/conf/yambar/config/config.yml
index bb742fd3..bb742fd3 100644
--- a/home-manager/soispha/config/yambar/config/config.yml
+++ b/hm/soispha/conf/yambar/config/config.yml
diff --git a/home-manager/soispha/config/yambar/config/laptop.yml b/hm/soispha/conf/yambar/config/laptop.yml
index 805ffe5b..805ffe5b 100644
--- a/home-manager/soispha/config/yambar/config/laptop.yml
+++ b/hm/soispha/conf/yambar/config/laptop.yml
diff --git a/home-manager/soispha/config/yambar/default.nix b/hm/soispha/conf/yambar/default.nix
index 0bcf8419..0bcf8419 100644
--- a/home-manager/soispha/config/yambar/default.nix
+++ b/hm/soispha/conf/yambar/default.nix
diff --git a/home-manager/soispha/config/yambar/scripts/disk b/hm/soispha/conf/yambar/scripts/disk
index 83b23ad9..83b23ad9 100755
--- a/home-manager/soispha/config/yambar/scripts/disk
+++ b/hm/soispha/conf/yambar/scripts/disk
diff --git a/home-manager/soispha/config/yambar/scripts/grades-average b/hm/soispha/conf/yambar/scripts/grades-average
index 20de5684..20de5684 100755
--- a/home-manager/soispha/config/yambar/scripts/grades-average
+++ b/hm/soispha/conf/yambar/scripts/grades-average
diff --git a/home-manager/soispha/config/yambar/scripts/network b/hm/soispha/conf/yambar/scripts/network
index 8e02d6dc..8e02d6dc 100755
--- a/home-manager/soispha/config/yambar/scripts/network
+++ b/hm/soispha/conf/yambar/scripts/network
diff --git a/home-manager/soispha/config/yambar/scripts/old/amixer-monitor b/hm/soispha/conf/yambar/scripts/old/amixer-monitor
index 9e75acfa..9e75acfa 100755
--- a/home-manager/soispha/config/yambar/scripts/old/amixer-monitor
+++ b/hm/soispha/conf/yambar/scripts/old/amixer-monitor
diff --git a/home-manager/soispha/config/yambar/scripts/old/cpu b/hm/soispha/conf/yambar/scripts/old/cpu
index bae820d0..bae820d0 100755
--- a/home-manager/soispha/config/yambar/scripts/old/cpu
+++ b/hm/soispha/conf/yambar/scripts/old/cpu
diff --git a/home-manager/soispha/config/yambar/scripts/old/dfspace b/hm/soispha/conf/yambar/scripts/old/dfspace
index 0b262481..0b262481 100755
--- a/home-manager/soispha/config/yambar/scripts/old/dfspace
+++ b/hm/soispha/conf/yambar/scripts/old/dfspace
diff --git a/home-manager/soispha/config/yambar/scripts/old/grades-average b/hm/soispha/conf/yambar/scripts/old/grades-average
index a04b958c..a04b958c 100755
--- a/home-manager/soispha/config/yambar/scripts/old/grades-average
+++ b/hm/soispha/conf/yambar/scripts/old/grades-average
diff --git a/home-manager/soispha/config/yambar/scripts/old/meminfo b/hm/soispha/conf/yambar/scripts/old/meminfo
index 0156e94c..0156e94c 100755
--- a/home-manager/soispha/config/yambar/scripts/old/meminfo
+++ b/hm/soispha/conf/yambar/scripts/old/meminfo
diff --git a/home-manager/soispha/config/yambar/scripts/old/nmclitest b/hm/soispha/conf/yambar/scripts/old/nmclitest
index 3e8bc73a..3e8bc73a 100755
--- a/home-manager/soispha/config/yambar/scripts/old/nmclitest
+++ b/hm/soispha/conf/yambar/scripts/old/nmclitest
diff --git a/home-manager/soispha/config/yambar/scripts/old/pingtest b/hm/soispha/conf/yambar/scripts/old/pingtest
index 2b5f9998..2b5f9998 100755
--- a/home-manager/soispha/config/yambar/scripts/old/pingtest
+++ b/hm/soispha/conf/yambar/scripts/old/pingtest
diff --git a/home-manager/soispha/config/yambar/scripts/old/yambar-tray b/hm/soispha/conf/yambar/scripts/old/yambar-tray
index 1704c6dd..1704c6dd 100755
--- a/home-manager/soispha/config/yambar/scripts/old/yambar-tray
+++ b/hm/soispha/conf/yambar/scripts/old/yambar-tray
diff --git a/home-manager/soispha/config/yambar/scripts/old/yambar-tray-width b/hm/soispha/conf/yambar/scripts/old/yambar-tray-width
index 00544e70..00544e70 100755
--- a/home-manager/soispha/config/yambar/scripts/old/yambar-tray-width
+++ b/hm/soispha/conf/yambar/scripts/old/yambar-tray-width
diff --git a/home-manager/soispha/config/yambar/scripts/sound-volume b/hm/soispha/conf/yambar/scripts/sound-volume
index 8494cbd5..8494cbd5 100755
--- a/home-manager/soispha/config/yambar/scripts/sound-volume
+++ b/hm/soispha/conf/yambar/scripts/sound-volume
diff --git a/home-manager/soispha/config/zsh/config/custom_cursor.sh b/hm/soispha/conf/zsh/config/custom_cursor.sh
index 9a6da012..9a6da012 100644
--- a/home-manager/soispha/config/zsh/config/custom_cursor.sh
+++ b/hm/soispha/conf/zsh/config/custom_cursor.sh
diff --git a/home-manager/soispha/config/zsh/config/zsh-init.sh b/hm/soispha/conf/zsh/config/zsh-init.sh
index 4d54d058..4d54d058 100644
--- a/home-manager/soispha/config/zsh/config/zsh-init.sh
+++ b/hm/soispha/conf/zsh/config/zsh-init.sh
diff --git a/home-manager/soispha/config/zsh/config/zsh-prompt.sh b/hm/soispha/conf/zsh/config/zsh-prompt.sh
index 26d478ef..26d478ef 100644
--- a/home-manager/soispha/config/zsh/config/zsh-prompt.sh
+++ b/hm/soispha/conf/zsh/config/zsh-prompt.sh
diff --git a/home-manager/soispha/config/zsh/default.nix b/hm/soispha/conf/zsh/default.nix
index 11011977..11011977 100644
--- a/home-manager/soispha/config/zsh/default.nix
+++ b/hm/soispha/conf/zsh/default.nix
diff --git a/home-manager/soispha/default.nix b/hm/soispha/default.nix
index 59fd7138..b6a00038 100644
--- a/home-manager/soispha/default.nix
+++ b/hm/soispha/default.nix
@@ -17,10 +17,10 @@
   # TODO: add XDG_RUNTIME_DIR
 in {
   imports = [
-    ./config
+    ./conf
     ./files
     ./impermanence
-    ./packages
+    ./pkgs
     ./wms
 
     impermanence.nixosModules.home-manager.impermanence
diff --git a/home-manager/soispha/files/default.nix b/hm/soispha/files/default.nix
index 4e16077c..4e16077c 100644
--- a/home-manager/soispha/files/default.nix
+++ b/hm/soispha/files/default.nix
diff --git a/home-manager/soispha/files/wallpaper/abstract-nord.png b/hm/soispha/files/wallpaper/abstract-nord.png
index 5ef498bf..5ef498bf 100644
--- a/home-manager/soispha/files/wallpaper/abstract-nord.png
+++ b/hm/soispha/files/wallpaper/abstract-nord.png
Binary files differdiff --git a/home-manager/soispha/files/wallpaper/default.nix b/hm/soispha/files/wallpaper/default.nix
index 2c9b3368..2c9b3368 100644
--- a/home-manager/soispha/files/wallpaper/default.nix
+++ b/hm/soispha/files/wallpaper/default.nix
diff --git a/home-manager/soispha/impermanence/default.nix b/hm/soispha/impermanence/default.nix
index d0cd1ff1..d0cd1ff1 100644
--- a/home-manager/soispha/impermanence/default.nix
+++ b/hm/soispha/impermanence/default.nix
diff --git a/home-manager/soispha/packages/default.nix b/hm/soispha/pkgs/default.nix
index c8135d21..c8135d21 100644
--- a/home-manager/soispha/packages/default.nix
+++ b/hm/soispha/pkgs/default.nix
diff --git a/home-manager/soispha/packages/scripts.nix b/hm/soispha/pkgs/scripts.nix
index 544975c5..544975c5 100644
--- a/home-manager/soispha/packages/scripts.nix
+++ b/hm/soispha/pkgs/scripts.nix
diff --git a/home-manager/soispha/packages/scripts/apps/aumo b/hm/soispha/pkgs/scripts/apps/aumo
index e49ac82d..e49ac82d 100755
--- a/home-manager/soispha/packages/scripts/apps/aumo
+++ b/hm/soispha/pkgs/scripts/apps/aumo
diff --git a/home-manager/soispha/packages/scripts/apps/con2pdf b/hm/soispha/pkgs/scripts/apps/con2pdf
index 9cadc376..9cadc376 100755
--- a/home-manager/soispha/packages/scripts/apps/con2pdf
+++ b/hm/soispha/pkgs/scripts/apps/con2pdf
diff --git a/home-manager/soispha/packages/scripts/small_functions/dldragon b/hm/soispha/pkgs/scripts/small_functions/dldragon
index ea75c362..ea75c362 100755
--- a/home-manager/soispha/packages/scripts/small_functions/dldragon
+++ b/hm/soispha/pkgs/scripts/small_functions/dldragon
diff --git a/home-manager/soispha/packages/scripts/small_functions/gtk-themes b/hm/soispha/pkgs/scripts/small_functions/gtk-themes
index 457bc35a..457bc35a 100755
--- a/home-manager/soispha/packages/scripts/small_functions/gtk-themes
+++ b/hm/soispha/pkgs/scripts/small_functions/gtk-themes
diff --git a/home-manager/soispha/packages/scripts/small_functions/mocs b/hm/soispha/pkgs/scripts/small_functions/mocs
index e14a84c8..e14a84c8 100755
--- a/home-manager/soispha/packages/scripts/small_functions/mocs
+++ b/hm/soispha/pkgs/scripts/small_functions/mocs
diff --git a/home-manager/soispha/packages/scripts/small_functions/screen_shot b/hm/soispha/pkgs/scripts/small_functions/screen_shot
index 73eb2ee4..73eb2ee4 100755
--- a/home-manager/soispha/packages/scripts/small_functions/screen_shot
+++ b/hm/soispha/pkgs/scripts/small_functions/screen_shot
diff --git a/home-manager/soispha/packages/scripts/small_functions/update-sys b/hm/soispha/pkgs/scripts/small_functions/update-sys
index 355682d1..355682d1 100755
--- a/home-manager/soispha/packages/scripts/small_functions/update-sys
+++ b/hm/soispha/pkgs/scripts/small_functions/update-sys
diff --git a/home-manager/soispha/packages/scripts/wrappers/backsnap b/hm/soispha/pkgs/scripts/wrappers/backsnap
index cd08045d..cd08045d 100755
--- a/home-manager/soispha/packages/scripts/wrappers/backsnap
+++ b/hm/soispha/pkgs/scripts/wrappers/backsnap
diff --git a/home-manager/soispha/packages/scripts/wrappers/ll b/hm/soispha/pkgs/scripts/wrappers/ll
index cb1fc0ea..cb1fc0ea 100755
--- a/home-manager/soispha/packages/scripts/wrappers/ll
+++ b/hm/soispha/pkgs/scripts/wrappers/ll
diff --git a/home-manager/soispha/packages/scripts/wrappers/llp b/hm/soispha/pkgs/scripts/wrappers/llp
index 2a21450c..2a21450c 100755
--- a/home-manager/soispha/packages/scripts/wrappers/llp
+++ b/hm/soispha/pkgs/scripts/wrappers/llp
diff --git a/home-manager/soispha/packages/scripts/wrappers/spodi b/hm/soispha/pkgs/scripts/wrappers/spodi
index 4ff53bff..4ff53bff 100755
--- a/home-manager/soispha/packages/scripts/wrappers/spodi
+++ b/hm/soispha/pkgs/scripts/wrappers/spodi
diff --git a/home-manager/soispha/packages/scripts/wrappers/virsh-del b/hm/soispha/pkgs/scripts/wrappers/virsh-del
index afcd87c1..afcd87c1 100755
--- a/home-manager/soispha/packages/scripts/wrappers/virsh-del
+++ b/hm/soispha/pkgs/scripts/wrappers/virsh-del
diff --git a/home-manager/soispha/packages/scripts/wrappers/yti b/hm/soispha/pkgs/scripts/wrappers/yti
index 0b737b30..0b737b30 100755
--- a/home-manager/soispha/packages/scripts/wrappers/yti
+++ b/hm/soispha/pkgs/scripts/wrappers/yti
diff --git a/home-manager/soispha/wms/default.nix b/hm/soispha/wms/default.nix
index 610ea2f4..610ea2f4 100644
--- a/home-manager/soispha/wms/default.nix
+++ b/hm/soispha/wms/default.nix
diff --git a/home-manager/soispha/wms/plasma/default.nix b/hm/soispha/wms/plasma/default.nix
index f68ee272..f68ee272 100644
--- a/home-manager/soispha/wms/plasma/default.nix
+++ b/hm/soispha/wms/plasma/default.nix
diff --git a/home-manager/soispha/wms/river/default.nix b/hm/soispha/wms/river/default.nix
index d8bc4009..d8bc4009 100644
--- a/home-manager/soispha/wms/river/default.nix
+++ b/hm/soispha/wms/river/default.nix
diff --git a/home-manager/soispha/wms/river/init b/hm/soispha/wms/river/init
index 599992e6..599992e6 100755
--- a/home-manager/soispha/wms/river/init
+++ b/hm/soispha/wms/river/init
diff --git a/home-manager/soispha/wms/river/res/keys.ron b/hm/soispha/wms/river/res/keys.ron
index a4ad6988..a4ad6988 100644
--- a/home-manager/soispha/wms/river/res/keys.ron
+++ b/hm/soispha/wms/river/res/keys.ron
diff --git a/home-manager/soispha/wms/river/res/moonlander.ron b/hm/soispha/wms/river/res/moonlander.ron
index 7a0c7298..7a0c7298 100644
--- a/home-manager/soispha/wms/river/res/moonlander.ron
+++ b/hm/soispha/wms/river/res/moonlander.ron
diff --git a/home-manager/soispha/wms/river/res/safe_init b/hm/soispha/wms/river/res/safe_init
index 8e80026a..8e80026a 100755
--- a/home-manager/soispha/wms/river/res/safe_init
+++ b/hm/soispha/wms/river/res/safe_init
diff --git a/home-manager/soispha/wms/sway/default.nix b/hm/soispha/wms/sway/default.nix
index bb3ddb49..bb3ddb49 100644
--- a/home-manager/soispha/wms/sway/default.nix
+++ b/hm/soispha/wms/sway/default.nix
diff --git a/home-manager/soispha/config/neovim/default.nix b/home-manager/soispha/config/neovim/default.nix
deleted file mode 100644
index 308826f0..00000000
--- a/home-manager/soispha/config/neovim/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./nixvim
-  ];
-}
diff --git a/hosts/apzu/default.nix b/hosts/apzu/default.nix
index 293b09a2..8c580214 100644
--- a/hosts/apzu/default.nix
+++ b/hosts/apzu/default.nix
@@ -3,7 +3,7 @@
     ./hardware
     ./networking.nix
 
-    ../../system
+    ../../sys
   ];
 
   soispha = {
diff --git a/hosts/isimud/default.nix b/hosts/isimud/default.nix
index 5f8fc987..5aa6ad3c 100644
--- a/hosts/isimud/default.nix
+++ b/hosts/isimud/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ./hardware
     ./networking.nix
-    ../../system
+    ../../sys
   ];
 
   isoImage = {
diff --git a/hosts/lahmu/default.nix b/hosts/lahmu/default.nix
index 85ff9a0e..94d8b054 100644
--- a/hosts/lahmu/default.nix
+++ b/hosts/lahmu/default.nix
@@ -9,7 +9,7 @@
     ./hardware
     ./networking.nix
 
-    ../../system
+    ../../sys
   ];
 
   soispha = {
diff --git a/hosts/mammun/default.nix b/hosts/mammun/default.nix
index cb7d259f..5c66d9fa 100644
--- a/hosts/mammun/default.nix
+++ b/hosts/mammun/default.nix
@@ -10,7 +10,7 @@
     ./hardware
     ./networking.nix
 
-    ../../system
+    ../../sys
   ];
   soispha = {
     locale.enable = true;
diff --git a/hosts/tiamat/default.nix b/hosts/tiamat/default.nix
index 3aa291c2..7f2080e3 100644
--- a/hosts/tiamat/default.nix
+++ b/hosts/tiamat/default.nix
@@ -3,7 +3,7 @@
     ./hardware
     ./networking.nix
 
-    ../../system
+    ../../sys
   ];
 
   soispha = {
diff --git a/system/boot/boot_pictures/gnu.png b/sys/boot/boot_pictures/gnu.png
index d07dee3e..d07dee3e 100755
--- a/system/boot/boot_pictures/gnu.png
+++ b/sys/boot/boot_pictures/gnu.png
Binary files differdiff --git a/system/boot/boot_pictures/gnulin_emb_1.png b/sys/boot/boot_pictures/gnulin_emb_1.png
index 483f2681..483f2681 100755
--- a/system/boot/boot_pictures/gnulin_emb_1.png
+++ b/sys/boot/boot_pictures/gnulin_emb_1.png
Binary files differdiff --git a/system/boot/boot_pictures/gnulin_emb_2.png b/sys/boot/boot_pictures/gnulin_emb_2.png
index 48cd6ad7..48cd6ad7 100755
--- a/system/boot/boot_pictures/gnulin_emb_2.png
+++ b/sys/boot/boot_pictures/gnulin_emb_2.png
Binary files differdiff --git a/system/boot/default.nix b/sys/boot/default.nix
index 9606c7b3..9606c7b3 100644
--- a/system/boot/default.nix
+++ b/sys/boot/default.nix
diff --git a/system/default.nix b/sys/default.nix
index 5faa402d..e263988f 100644
--- a/system/default.nix
+++ b/sys/default.nix
@@ -12,7 +12,7 @@
     ./options
     ./polkit
     ./power
-    ./services
+    ./svcs
     ./secrets
     ./sound
     ./tempfiles
diff --git a/system/disks/default.nix b/sys/disks/default.nix
index d238d89a..d238d89a 100644
--- a/system/disks/default.nix
+++ b/sys/disks/default.nix
diff --git a/system/disks/fstrim.nix b/sys/disks/fstrim.nix
index 6daeb65e..6daeb65e 100644
--- a/system/disks/fstrim.nix
+++ b/sys/disks/fstrim.nix
diff --git a/system/disks/hibernate.nix b/sys/disks/hibernate.nix
index b0aed423..b0aed423 100644
--- a/system/disks/hibernate.nix
+++ b/sys/disks/hibernate.nix
diff --git a/system/font/default.nix b/sys/font/default.nix
index 303efcf7..303efcf7 100644
--- a/system/font/default.nix
+++ b/sys/font/default.nix
diff --git a/system/hardware/default.nix b/sys/hardware/default.nix
index 77d3d3f0..77d3d3f0 100644
--- a/system/hardware/default.nix
+++ b/sys/hardware/default.nix
diff --git a/system/impermanence/default.nix b/sys/impermanence/default.nix
index a9be951a..a9be951a 100644
--- a/system/impermanence/default.nix
+++ b/sys/impermanence/default.nix
diff --git a/system/libvirtd/default.nix b/sys/libvirtd/default.nix
index 3b9c7d85..3b9c7d85 100644
--- a/system/libvirtd/default.nix
+++ b/sys/libvirtd/default.nix
diff --git a/system/locale/default.nix b/sys/locale/default.nix
index 1e7786cc..1e7786cc 100644
--- a/system/locale/default.nix
+++ b/sys/locale/default.nix
diff --git a/system/network/default.nix b/sys/network/default.nix
index 9c570f3b..9c570f3b 100644
--- a/system/network/default.nix
+++ b/sys/network/default.nix
diff --git a/system/nixpkgs/default.nix b/sys/nixpkgs/default.nix
index c37d5582..c37d5582 100644
--- a/system/nixpkgs/default.nix
+++ b/sys/nixpkgs/default.nix
diff --git a/system/options/default.nix b/sys/options/default.nix
index 72ebc4fb..72ebc4fb 100644
--- a/system/options/default.nix
+++ b/sys/options/default.nix
diff --git a/system/polkit/default.nix b/sys/polkit/default.nix
index 9de68f35..9de68f35 100644
--- a/system/polkit/default.nix
+++ b/sys/polkit/default.nix
diff --git a/system/power/default.nix b/sys/power/default.nix
index d20a97f2..d20a97f2 100644
--- a/system/power/default.nix
+++ b/sys/power/default.nix
diff --git a/system/secrets/default.nix b/sys/secrets/default.nix
index d1fc1714..d1fc1714 100644
--- a/system/secrets/default.nix
+++ b/sys/secrets/default.nix
diff --git a/system/secrets/nheko/conf.apzu b/sys/secrets/nheko/conf.apzu
index a4f704ea..a4f704ea 100644
--- a/system/secrets/nheko/conf.apzu
+++ b/sys/secrets/nheko/conf.apzu
diff --git a/system/secrets/nheko/conf.isimud b/sys/secrets/nheko/conf.isimud
index ef6c52b6..ef6c52b6 100644
--- a/system/secrets/nheko/conf.isimud
+++ b/sys/secrets/nheko/conf.isimud
diff --git a/system/secrets/nheko/conf.tiamat b/sys/secrets/nheko/conf.tiamat
index 51cab7df..51cab7df 100644
--- a/system/secrets/nheko/conf.tiamat
+++ b/sys/secrets/nheko/conf.tiamat
diff --git a/system/secrets/secrets.nix b/sys/secrets/secrets.nix
index 36757546..36757546 100644
--- a/system/secrets/secrets.nix
+++ b/sys/secrets/secrets.nix
diff --git a/system/secrets/serverphone/ca.key b/sys/secrets/serverphone/ca.key
index d49c5395..d49c5395 100644
--- a/system/secrets/serverphone/ca.key
+++ b/sys/secrets/serverphone/ca.key
diff --git a/system/secrets/serverphone/server.key b/sys/secrets/serverphone/server.key
index a2720406..a2720406 100644
--- a/system/secrets/serverphone/server.key
+++ b/sys/secrets/serverphone/server.key
diff --git a/system/sound/default.nix b/sys/sound/default.nix
index 318dcb8b..318dcb8b 100644
--- a/system/sound/default.nix
+++ b/sys/sound/default.nix
diff --git a/system/services/backup/default.nix b/sys/svcs/backup/default.nix
index 171f1043..171f1043 100644
--- a/system/services/backup/default.nix
+++ b/sys/svcs/backup/default.nix
diff --git a/system/services/backup/snap-sync-forked b/sys/svcs/backup/snap-sync-forked
index a66f31ae..a66f31ae 100755
--- a/system/services/backup/snap-sync-forked
+++ b/sys/svcs/backup/snap-sync-forked
diff --git a/system/services/dconf/default.nix b/sys/svcs/dconf/default.nix
index db35208e..db35208e 100644
--- a/system/services/dconf/default.nix
+++ b/sys/svcs/dconf/default.nix
diff --git a/system/services/default.nix b/sys/svcs/default.nix
index c4b95394..c4b95394 100644
--- a/system/services/default.nix
+++ b/sys/svcs/default.nix
diff --git a/system/services/fwupd/default.nix b/sys/svcs/fwupd/default.nix
index 999ca72b..999ca72b 100644
--- a/system/services/fwupd/default.nix
+++ b/sys/svcs/fwupd/default.nix
diff --git a/system/services/nix/default.nix b/sys/svcs/nix/default.nix
index 97b7220d..97b7220d 100644
--- a/system/services/nix/default.nix
+++ b/sys/svcs/nix/default.nix
diff --git a/system/services/openssh/default.nix b/sys/svcs/openssh/default.nix
index b733dbe7..b733dbe7 100644
--- a/system/services/openssh/default.nix
+++ b/sys/svcs/openssh/default.nix
diff --git a/system/services/postgresql/default.nix b/sys/svcs/postgresql/default.nix
index 4fc26034..4fc26034 100644
--- a/system/services/postgresql/default.nix
+++ b/sys/svcs/postgresql/default.nix
diff --git a/system/services/printing/default.nix b/sys/svcs/printing/default.nix
index 7b8a871e..7b8a871e 100644
--- a/system/services/printing/default.nix
+++ b/sys/svcs/printing/default.nix
diff --git a/system/services/scanning/default.nix b/sys/svcs/scanning/default.nix
index 6621e08f..6621e08f 100644
--- a/system/services/scanning/default.nix
+++ b/sys/svcs/scanning/default.nix
diff --git a/system/services/serverphone/certificates/ca.crt b/sys/svcs/serverphone/certificates/ca.crt
index 7a4ae6f9..7a4ae6f9 100644
--- a/system/services/serverphone/certificates/ca.crt
+++ b/sys/svcs/serverphone/certificates/ca.crt
diff --git a/system/services/serverphone/certificates/server.crt b/sys/svcs/serverphone/certificates/server.crt
index f994cdc8..f994cdc8 100644
--- a/system/services/serverphone/certificates/server.crt
+++ b/sys/svcs/serverphone/certificates/server.crt
diff --git a/system/services/serverphone/default.nix b/sys/svcs/serverphone/default.nix
index 20125a75..20125a75 100644
--- a/system/services/serverphone/default.nix
+++ b/sys/svcs/serverphone/default.nix
diff --git a/system/services/serverphone/keys/key_1 b/sys/svcs/serverphone/keys/key_1
index 67720882..67720882 120000
--- a/system/services/serverphone/keys/key_1
+++ b/sys/svcs/serverphone/keys/key_1
diff --git a/system/services/serverphone/keys/key_2 b/sys/svcs/serverphone/keys/key_2
index 24df7207..24df7207 120000
--- a/system/services/serverphone/keys/key_2
+++ b/sys/svcs/serverphone/keys/key_2
diff --git a/system/services/snapper/default.nix b/sys/svcs/snapper/default.nix
index 41e4b381..41e4b381 100644
--- a/system/services/snapper/default.nix
+++ b/sys/svcs/snapper/default.nix
diff --git a/system/services/steam/default.nix b/sys/svcs/steam/default.nix
index 54091493..54091493 100644
--- a/system/services/steam/default.nix
+++ b/sys/svcs/steam/default.nix
diff --git a/system/services/swaylock/default.nix b/sys/svcs/swaylock/default.nix
index 6cbcef28..6cbcef28 100644
--- a/system/services/swaylock/default.nix
+++ b/sys/svcs/swaylock/default.nix
diff --git a/system/services/xdg/default.nix b/sys/svcs/xdg/default.nix
index 297928ce..297928ce 100644
--- a/system/services/xdg/default.nix
+++ b/sys/svcs/xdg/default.nix
diff --git a/system/tempfiles/default.nix b/sys/tempfiles/default.nix
index 2d48b02e..2d48b02e 100644
--- a/system/tempfiles/default.nix
+++ b/sys/tempfiles/default.nix
diff --git a/system/users/default.nix b/sys/users/default.nix
index 365ffd41..365ffd41 100644
--- a/system/users/default.nix
+++ b/sys/users/default.nix