refactor(modules): Move all system modules to `by-name`

From now on all modules should be added to the new `by-name` directory.
This should help remove the (superficial and utterly useless)
distinction between `home-manager` and `NixOS` modules.

341 files changed, 59 insertions, 51 deletions

diff --git a/modules/by-name-overlay.nix b/modules/by-name-overlay.nix
new file mode 100644
index 00000000..b96c1d25
--- /dev/null
+++ b/modules/by-name-overlay.nix
@@ -0,0 +1,48 @@
+# Adapted from this: https://github.com/NixOS/nixpkgs/blob/1814b56453c91192f6d5a6276079948f9fe96c18/pkgs/top-level/by-name-overlay.nix
+{baseDirectory}: let
+  # Taken straight out of the `nixpkgs/lib/lists.nix` file.
+  # We can't depended on `pkgs` (and thus on `lib`), because the `pkgs` module argument
+  # is only defined in modules we import.
+  flatten = x:
+    if builtins.isList x
+    then builtins.concatMap flatten x
+    else [x];
+  # Same thing as flatten.
+  warn =
+    # Since Nix 2.23, https://github.com/NixOS/nix/pull/10592
+    builtins.warn
+    or (
+      # Do not eta reduce v, so that we have the same strictness as `builtins.warn`.
+      msg: v:
+      # `builtins.warn` requires a string message, so we enforce that in our implementation, so that callers aren't accidentally incompatible with newer Nix versions.
+        assert builtins.isString msg;
+          builtins.trace "[1;35mevaluation warning:[0m ${msg}" v
+    );
+  # Same thing as flatten.
+  mapAttrsToList = f: attrs:
+    builtins.map (name: f name attrs.${name}) (builtins.attrNames attrs);
+
+  # Module files for a single shard
+  # Type: String -> String -> ListOf Path
+  namesForShard = shard: type:
+    if type != "directory"
+    then warn "Ignored non-directory, whilst importing by-name modules: '${shard}'" []
+    else let
+      mkPath = name: _type: let
+        path = baseDirectory + "/${shard}/${name}/module.nix";
+      in
+        if builtins.pathExists path
+        then path
+        else warn "'${builtins.toString path}' does not exist. Skipped" null;
+    in
+      flatten
+      (builtins.filter (it: it != null)
+        (mapAttrsToList
+          mkPath
+          (builtins.readDir (baseDirectory + "/${shard}"))));
+
+  # A list of all module paths.
+  # These can the be simply injected into `import`
+  moduleFiles = flatten (mapAttrsToList namesForShard (builtins.readDir baseDirectory));
+in
+  moduleFiles
diff --git a/modules/system/services/adb/default.nix b/modules/by-name/ad/adb/module.nix
index ec5d4be6..ec5d4be6 100644
--- a/modules/system/services/adb/default.nix
+++ b/modules/by-name/ad/adb/module.nix
diff --git a/modules/system/services/backup/default.nix b/modules/by-name/ba/backup/module.nix
index 92700bf2..92700bf2 100644
--- a/modules/system/services/backup/default.nix
+++ b/modules/by-name/ba/backup/module.nix
diff --git a/modules/system/bluetooth/default.nix b/modules/by-name/bl/bluetooth/module.nix
index bf1c6a90..bf1c6a90 100644
--- a/modules/system/bluetooth/default.nix
+++ b/modules/by-name/bl/bluetooth/module.nix
diff --git a/modules/home/conf/swaylock/gnu.png b/modules/by-name/bo/boot/boot_pictures/gnu.png
index d07dee3e..d07dee3e 100644..100755
--- a/modules/home/conf/swaylock/gnu.png
+++ b/modules/by-name/bo/boot/boot_pictures/gnu.png
Binary files differdiff --git a/modules/system/boot/boot_pictures/gnulin_emb_1.png b/modules/by-name/bo/boot/boot_pictures/gnulin_emb_1.png
index 483f2681..483f2681 100755
--- a/modules/system/boot/boot_pictures/gnulin_emb_1.png
+++ b/modules/by-name/bo/boot/boot_pictures/gnulin_emb_1.png
Binary files differdiff --git a/modules/system/boot/boot_pictures/gnulin_emb_2.png b/modules/by-name/bo/boot/boot_pictures/gnulin_emb_2.png
index 48cd6ad7..48cd6ad7 100755
--- a/modules/system/boot/boot_pictures/gnulin_emb_2.png
+++ b/modules/by-name/bo/boot/boot_pictures/gnulin_emb_2.png
Binary files differdiff --git a/modules/system/boot/iso_entry/archlive_iso.nix b/modules/by-name/bo/boot/iso_entry/archlive_iso.nix
index d19a4a87..d19a4a87 100644
--- a/modules/system/boot/iso_entry/archlive_iso.nix
+++ b/modules/by-name/bo/boot/iso_entry/archlive_iso.nix
diff --git a/modules/system/boot/iso_entry/signing_key.nix b/modules/by-name/bo/boot/iso_entry/signing_key.nix
index 788447be..788447be 100644
--- a/modules/system/boot/iso_entry/signing_key.nix
+++ b/modules/by-name/bo/boot/iso_entry/signing_key.nix
diff --git a/modules/system/boot/default.nix b/modules/by-name/bo/boot/module.nix
index 711e9d23..711e9d23 100644
--- a/modules/system/boot/default.nix
+++ b/modules/by-name/bo/boot/module.nix
diff --git a/modules/system/cleanup/default.nix b/modules/by-name/cl/cleanup/module.nix
index f8307b73..f8307b73 100644
--- a/modules/system/cleanup/default.nix
+++ b/modules/by-name/cl/cleanup/module.nix
diff --git a/modules/system/services/dconf/default.nix b/modules/by-name/dc/dconf/module.nix
index e4a1c7a9..e4a1c7a9 100644
--- a/modules/system/services/dconf/default.nix
+++ b/modules/by-name/dc/dconf/module.nix
diff --git a/modules/system/disks/fstrim.nix b/modules/by-name/di/disks/fstrim.nix
index 6daeb65e..6daeb65e 100644
--- a/modules/system/disks/fstrim.nix
+++ b/modules/by-name/di/disks/fstrim.nix
diff --git a/modules/system/disks/hibernate.nix b/modules/by-name/di/disks/hibernate.nix
index a50e5b57..a50e5b57 100644
--- a/modules/system/disks/hibernate.nix
+++ b/modules/by-name/di/disks/hibernate.nix
diff --git a/modules/system/disks/default.nix b/modules/by-name/di/disks/module.nix
index c0e5bcfd..c0e5bcfd 100644
--- a/modules/system/disks/default.nix
+++ b/modules/by-name/di/disks/module.nix
diff --git a/modules/system/documentation/default.nix b/modules/by-name/do/documentation/module.nix
index 4616a991..4616a991 100644
--- a/modules/system/documentation/default.nix
+++ b/modules/by-name/do/documentation/module.nix
diff --git a/modules/system/fonts/emoji_font.xml b/modules/by-name/fo/fonts/emoji_font.xml
index f3f6bb3e..f3f6bb3e 100644
--- a/modules/system/fonts/emoji_font.xml
+++ b/modules/by-name/fo/fonts/emoji_font.xml
diff --git a/modules/system/fonts/default.nix b/modules/by-name/fo/fonts/module.nix
index abd5664b..abd5664b 100644
--- a/modules/system/fonts/default.nix
+++ b/modules/by-name/fo/fonts/module.nix
diff --git a/modules/system/services/fwupd/default.nix b/modules/by-name/fw/fwupd/module.nix
index 5ad4f467..5ad4f467 100644
--- a/modules/system/services/fwupd/default.nix
+++ b/modules/by-name/fw/fwupd/module.nix
diff --git a/modules/system/hardware/default.nix b/modules/by-name/ha/hardware/module.nix
index 850416b7..850416b7 100644
--- a/modules/system/hardware/default.nix
+++ b/modules/by-name/ha/hardware/module.nix
diff --git a/modules/system/home-manager/default.nix b/modules/by-name/ho/home-manager/module.nix
index 096aaceb..d95bb6ac 100644
--- a/modules/system/home-manager/default.nix
+++ b/modules/by-name/ho/home-manager/module.nix
@@ -28,7 +28,7 @@ in {
     home-manager = {
       useGlobalPkgs = true;
       useUserPackages = true;
-      users.soispha = import ../../home;
+      users.soispha = import ../../../home.legacy;
       extraSpecialArgs = {
         inherit
           nixpkgs_open_prs
diff --git a/modules/system/impermanence/default.nix b/modules/by-name/im/impermanence/module.nix
index 9730dde6..9730dde6 100644
--- a/modules/system/impermanence/default.nix
+++ b/modules/by-name/im/impermanence/module.nix
diff --git a/modules/system/services/issue_file/default.nix b/modules/by-name/is/issue_file/module.nix
index d8b6faa8..d8b6faa8 100644
--- a/modules/system/services/issue_file/default.nix
+++ b/modules/by-name/is/issue_file/module.nix
diff --git a/modules/system/laptop/default.nix b/modules/by-name/la/laptop/module.nix
index f70230ad..f70230ad 100644
--- a/modules/system/laptop/default.nix
+++ b/modules/by-name/la/laptop/module.nix
diff --git a/modules/system/libvirtd/default.nix b/modules/by-name/li/libvirtd/module.nix
index 5c519550..5c519550 100644
--- a/modules/system/libvirtd/default.nix
+++ b/modules/by-name/li/libvirtd/module.nix
diff --git a/modules/system/locale/keymaps/dvorak_modified.xkb b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb
index 63f5d4fb..63f5d4fb 100644
--- a/modules/system/locale/keymaps/dvorak_modified.xkb
+++ b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb
diff --git a/modules/system/locale/keymaps/us_modified.xkb b/modules/by-name/lo/locale/keymaps/us_modified.xkb
index 6299a5e9..6299a5e9 100644
--- a/modules/system/locale/keymaps/us_modified.xkb
+++ b/modules/by-name/lo/locale/keymaps/us_modified.xkb
diff --git a/modules/system/locale/default.nix b/modules/by-name/lo/locale/module.nix
index 10569216..10569216 100644
--- a/modules/system/locale/default.nix
+++ b/modules/by-name/lo/locale/module.nix
diff --git a/modules/system/networking/default.nix b/modules/by-name/ne/networking/module.nix
index c5f0e491..c5f0e491 100644
--- a/modules/system/networking/default.nix
+++ b/modules/by-name/ne/networking/module.nix
diff --git a/modules/system/services/nix/default.nix b/modules/by-name/ni/nix/module.nix
index 980bbd39..980bbd39 100644
--- a/modules/system/services/nix/default.nix
+++ b/modules/by-name/ni/nix/module.nix
diff --git a/modules/system/nixpkgs/config.nix b/modules/by-name/ni/nixpkgs/config.nix
index 1a24444d..1a24444d 100644
--- a/modules/system/nixpkgs/config.nix
+++ b/modules/by-name/ni/nixpkgs/config.nix
diff --git a/modules/system/nixpkgs/default.nix b/modules/by-name/ni/nixpkgs/module.nix
index eda3ac89..eda3ac89 100644
--- a/modules/system/nixpkgs/default.nix
+++ b/modules/by-name/ni/nixpkgs/module.nix
diff --git a/modules/system/services/openssh/default.nix b/modules/by-name/op/openssh/module.nix
index b733dbe7..b733dbe7 100644
--- a/modules/system/services/openssh/default.nix
+++ b/modules/by-name/op/openssh/module.nix
diff --git a/modules/system/services/printing/default.nix b/modules/by-name/pi/printing/module.nix
index 85d15b16..85d15b16 100644
--- a/modules/system/services/printing/default.nix
+++ b/modules/by-name/pi/printing/module.nix
diff --git a/modules/system/polkit/default.nix b/modules/by-name/po/polkit/module.nix
index fb13505b..fb13505b 100644
--- a/modules/system/polkit/default.nix
+++ b/modules/by-name/po/polkit/module.nix
diff --git a/modules/system/services/postgresql/default.nix b/modules/by-name/po/postgresql/module.nix
index c47a235c..c47a235c 100644
--- a/modules/system/services/postgresql/default.nix
+++ b/modules/by-name/po/postgresql/module.nix
diff --git a/modules/system/power/default.nix b/modules/by-name/po/power/module.nix
index 13013879..13013879 100644
--- a/modules/system/power/default.nix
+++ b/modules/by-name/po/power/module.nix
diff --git a/modules/system/services/scanning/default.nix b/modules/by-name/sc/scanning/module.nix
index dda507fa..dda507fa 100644
--- a/modules/system/services/scanning/default.nix
+++ b/modules/by-name/sc/scanning/module.nix
diff --git a/modules/system/secrets/lf/cd_paths.age b/modules/by-name/se/secrets/lf/cd_paths.age
index 3b018fb7..3b018fb7 100644
--- a/modules/system/secrets/lf/cd_paths.age
+++ b/modules/by-name/se/secrets/lf/cd_paths.age
diff --git a/modules/system/secrets/default.nix b/modules/by-name/se/secrets/module.nix
index 8b3188b0..8b3188b0 100644
--- a/modules/system/secrets/default.nix
+++ b/modules/by-name/se/secrets/module.nix
diff --git a/modules/system/secrets/secrets.nix b/modules/by-name/se/secrets/secrets.nix
index ff97c0fd..ff97c0fd 100644
--- a/modules/system/secrets/secrets.nix
+++ b/modules/by-name/se/secrets/secrets.nix
diff --git a/modules/system/secrets/serverphone/ca.key b/modules/by-name/se/secrets/serverphone/ca.key
index d49c5395..d49c5395 100644
--- a/modules/system/secrets/serverphone/ca.key
+++ b/modules/by-name/se/secrets/serverphone/ca.key
diff --git a/modules/system/secrets/serverphone/server.key b/modules/by-name/se/secrets/serverphone/server.key
index a2720406..a2720406 100644
--- a/modules/system/secrets/serverphone/server.key
+++ b/modules/by-name/se/secrets/serverphone/server.key
diff --git a/modules/system/secrets/taskserver/ca.cert b/modules/by-name/se/secrets/taskserver/ca.cert
index 203d62a8..203d62a8 100644
--- a/modules/system/secrets/taskserver/ca.cert
+++ b/modules/by-name/se/secrets/taskserver/ca.cert
diff --git a/modules/system/secrets/taskserver/credentials b/modules/by-name/se/secrets/taskserver/credentials
index f3aaf502..f3aaf502 100644
--- a/modules/system/secrets/taskserver/credentials
+++ b/modules/by-name/se/secrets/taskserver/credentials
diff --git a/modules/system/secrets/taskserver/private.key b/modules/by-name/se/secrets/taskserver/private.key
index 5afecdaf..5afecdaf 100644
--- a/modules/system/secrets/taskserver/private.key
+++ b/modules/by-name/se/secrets/taskserver/private.key
diff --git a/modules/system/secrets/taskserver/public.cert b/modules/by-name/se/secrets/taskserver/public.cert
index 1cf9b5f0..1cf9b5f0 100644
--- a/modules/system/secrets/taskserver/public.cert
+++ b/modules/by-name/se/secrets/taskserver/public.cert
diff --git a/modules/system/secrets/update_secrets.sh b/modules/by-name/se/secrets/update_secrets.sh
index f1c27d77..f1c27d77 100755
--- a/modules/system/secrets/update_secrets.sh
+++ b/modules/by-name/se/secrets/update_secrets.sh
diff --git a/modules/system/services/serverphone/certificates/ca.crt b/modules/by-name/se/serverphone/certificates/ca.crt
index 7a4ae6f9..7a4ae6f9 100644
--- a/modules/system/services/serverphone/certificates/ca.crt
+++ b/modules/by-name/se/serverphone/certificates/ca.crt
diff --git a/modules/system/services/serverphone/certificates/server.crt b/modules/by-name/se/serverphone/certificates/server.crt
index f994cdc8..f994cdc8 100644
--- a/modules/system/services/serverphone/certificates/server.crt
+++ b/modules/by-name/se/serverphone/certificates/server.crt
diff --git a/modules/system/services/serverphone/keys/key_1 b/modules/by-name/se/serverphone/keys/key_1
index 67720882..67720882 120000
--- a/modules/system/services/serverphone/keys/key_1
+++ b/modules/by-name/se/serverphone/keys/key_1
diff --git a/modules/system/services/serverphone/keys/key_2 b/modules/by-name/se/serverphone/keys/key_2
index 24df7207..24df7207 120000
--- a/modules/system/services/serverphone/keys/key_2
+++ b/modules/by-name/se/serverphone/keys/key_2
diff --git a/modules/system/services/serverphone/default.nix b/modules/by-name/se/serverphone/module.currently_ignored.nix
index 20125a75..20125a75 100644
--- a/modules/system/services/serverphone/default.nix
+++ b/modules/by-name/se/serverphone/module.currently_ignored.nix
diff --git a/modules/system/services/snapper/default.nix b/modules/by-name/sn/snapper/module.nix
index bf8201a4..bf8201a4 100644
--- a/modules/system/services/snapper/default.nix
+++ b/modules/by-name/sn/snapper/module.nix
diff --git a/modules/system/sound/default.nix b/modules/by-name/so/sound/module.nix
index f3120a67..f3120a67 100644
--- a/modules/system/sound/default.nix
+++ b/modules/by-name/so/sound/module.nix
diff --git a/modules/system/services/steam/default.nix b/modules/by-name/st/steam/module.nix
index 49149cd7..49149cd7 100644
--- a/modules/system/services/steam/default.nix
+++ b/modules/by-name/st/steam/module.nix
diff --git a/modules/system/services/swaylock/default.nix b/modules/by-name/sw/swaylock/module.nix
index 6cbcef28..6cbcef28 100644
--- a/modules/system/services/swaylock/default.nix
+++ b/modules/by-name/sw/swaylock/module.nix
diff --git a/modules/system/services/system_diff/default.nix b/modules/by-name/sy/system_diff/module.nix
index 052ffae2..052ffae2 100644
--- a/modules/system/services/system_diff/default.nix
+++ b/modules/by-name/sy/system_diff/module.nix
diff --git a/modules/system/tempfiles/default.nix b/modules/by-name/te/tempfiles/module.nix
index f8bfd4dc..f8bfd4dc 100644
--- a/modules/system/tempfiles/default.nix
+++ b/modules/by-name/te/tempfiles/module.nix
diff --git a/modules/system/users/default.nix b/modules/by-name/us/users/module.nix
index a44df7e8..a44df7e8 100644
--- a/modules/system/users/default.nix
+++ b/modules/by-name/us/users/module.nix
diff --git a/modules/system/version/default.nix b/modules/by-name/ve/version/module.nix
index 77cada14..77cada14 100644
--- a/modules/system/version/default.nix
+++ b/modules/by-name/ve/version/module.nix
diff --git a/modules/system/waydroid/default.nix b/modules/by-name/wa/waydroid/module.nix
index 4680db63..4680db63 100644
--- a/modules/system/waydroid/default.nix
+++ b/modules/by-name/wa/waydroid/module.nix
diff --git a/modules/system/services/xdg/default.nix b/modules/by-name/xd/xdg/module.nix
index 5140a832..5140a832 100644
--- a/modules/system/services/xdg/default.nix
+++ b/modules/by-name/xd/xdg/module.nix
diff --git a/modules/system/services/xdg/scripts/lf_wrapper.sh b/modules/by-name/xd/xdg/scripts/lf_wrapper.sh
index 16603fe4..16603fe4 100755
--- a/modules/system/services/xdg/scripts/lf_wrapper.sh
+++ b/modules/by-name/xd/xdg/scripts/lf_wrapper.sh
diff --git a/modules/system/services/xdg/scripts/ranger_wrapper.sh b/modules/by-name/xd/xdg/scripts/ranger_wrapper.sh
index e148bf19..e148bf19 100755
--- a/modules/system/services/xdg/scripts/ranger_wrapper.sh
+++ b/modules/by-name/xd/xdg/scripts/ranger_wrapper.sh
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 00000000..a3bc1735
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,10 @@
+# NOTE: This file **must** not depend on `pkgs`. This is because `pkgs` is defined in a
+# module imported by it, and thus would require infinite recursion.  <2024-10-18>
+{...}: let
+  files = import ./by-name-overlay.nix {
+    baseDirectory =
+      ./by-name;
+  };
+in {
+  imports = files;
+}
diff --git a/modules/home/conf/alacritty/default.nix b/modules/home.legacy/conf/alacritty/default.nix
index c1cf5e44..c1cf5e44 100644
--- a/modules/home/conf/alacritty/default.nix
+++ b/modules/home.legacy/conf/alacritty/default.nix
diff --git a/modules/home/conf/alacritty/toml/base.toml b/modules/home.legacy/conf/alacritty/toml/base.toml
index 93c9942f..93c9942f 100644
--- a/modules/home/conf/alacritty/toml/base.toml
+++ b/modules/home.legacy/conf/alacritty/toml/base.toml
diff --git a/modules/home/conf/alacritty/toml/bell.toml b/modules/home.legacy/conf/alacritty/toml/bell.toml
index 912d08e3..912d08e3 100644
--- a/modules/home/conf/alacritty/toml/bell.toml
+++ b/modules/home.legacy/conf/alacritty/toml/bell.toml
diff --git a/modules/home/conf/alacritty/toml/colorscheme.toml b/modules/home.legacy/conf/alacritty/toml/colorscheme.toml
index f98a5b91..f98a5b91 100644
--- a/modules/home/conf/alacritty/toml/colorscheme.toml
+++ b/modules/home.legacy/conf/alacritty/toml/colorscheme.toml
diff --git a/modules/home/conf/alacritty/toml/cursor.toml b/modules/home.legacy/conf/alacritty/toml/cursor.toml
index d9cb93f4..d9cb93f4 100644
--- a/modules/home/conf/alacritty/toml/cursor.toml
+++ b/modules/home.legacy/conf/alacritty/toml/cursor.toml
diff --git a/modules/home/conf/alacritty/toml/env.toml b/modules/home.legacy/conf/alacritty/toml/env.toml
index fdd4e5d1..fdd4e5d1 100644
--- a/modules/home/conf/alacritty/toml/env.toml
+++ b/modules/home.legacy/conf/alacritty/toml/env.toml
diff --git a/modules/home/conf/alacritty/toml/font.toml b/modules/home.legacy/conf/alacritty/toml/font.toml
index dd18a6fb..dd18a6fb 100644
--- a/modules/home/conf/alacritty/toml/font.toml
+++ b/modules/home.legacy/conf/alacritty/toml/font.toml
diff --git a/modules/home/conf/alacritty/toml/hints.toml b/modules/home.legacy/conf/alacritty/toml/hints.toml
index 31d91a37..31d91a37 100644
--- a/modules/home/conf/alacritty/toml/hints.toml
+++ b/modules/home.legacy/conf/alacritty/toml/hints.toml
diff --git a/modules/home/conf/alacritty/toml/keyboard_bindings.toml b/modules/home.legacy/conf/alacritty/toml/keyboard_bindings.toml
index 8e0b1e13..8e0b1e13 100644
--- a/modules/home/conf/alacritty/toml/keyboard_bindings.toml
+++ b/modules/home.legacy/conf/alacritty/toml/keyboard_bindings.toml
diff --git a/modules/home/conf/alacritty/toml/mouse.toml b/modules/home.legacy/conf/alacritty/toml/mouse.toml
index eba68edf..eba68edf 100644
--- a/modules/home/conf/alacritty/toml/mouse.toml
+++ b/modules/home.legacy/conf/alacritty/toml/mouse.toml
diff --git a/modules/home/conf/alacritty/toml/mouse_bindings.toml b/modules/home.legacy/conf/alacritty/toml/mouse_bindings.toml
index 1b281748..1b281748 100644
--- a/modules/home/conf/alacritty/toml/mouse_bindings.toml
+++ b/modules/home.legacy/conf/alacritty/toml/mouse_bindings.toml
diff --git a/modules/home/conf/alacritty/toml/scrolling.toml b/modules/home.legacy/conf/alacritty/toml/scrolling.toml
index ed7c22cf..ed7c22cf 100644
--- a/modules/home/conf/alacritty/toml/scrolling.toml
+++ b/modules/home.legacy/conf/alacritty/toml/scrolling.toml
diff --git a/modules/home/conf/alacritty/toml/selection.toml b/modules/home.legacy/conf/alacritty/toml/selection.toml
index 60ea0495..60ea0495 100644
--- a/modules/home/conf/alacritty/toml/selection.toml
+++ b/modules/home.legacy/conf/alacritty/toml/selection.toml
diff --git a/modules/home/conf/alacritty/toml/window.toml b/modules/home.legacy/conf/alacritty/toml/window.toml
index 123b5b7a..123b5b7a 100644
--- a/modules/home/conf/alacritty/toml/window.toml
+++ b/modules/home.legacy/conf/alacritty/toml/window.toml
diff --git a/modules/home/conf/alacritty/yaml/base.yml b/modules/home.legacy/conf/alacritty/yaml/base.yml
index 0791a60f..0791a60f 100644
--- a/modules/home/conf/alacritty/yaml/base.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/base.yml
diff --git a/modules/home/conf/alacritty/yaml/bell.yml b/modules/home.legacy/conf/alacritty/yaml/bell.yml
index bd071aeb..bd071aeb 100644
--- a/modules/home/conf/alacritty/yaml/bell.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/bell.yml
diff --git a/modules/home/conf/alacritty/yaml/colors.yml b/modules/home.legacy/conf/alacritty/yaml/colors.yml
index 899c660a..899c660a 100644
--- a/modules/home/conf/alacritty/yaml/colors.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/colors.yml
diff --git a/modules/home/conf/alacritty/yaml/colorscheme.yml b/modules/home.legacy/conf/alacritty/yaml/colorscheme.yml
index 4e0abfae..4e0abfae 100644
--- a/modules/home/conf/alacritty/yaml/colorscheme.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/colorscheme.yml
diff --git a/modules/home/conf/alacritty/yaml/cursor.yml b/modules/home.legacy/conf/alacritty/yaml/cursor.yml
index ef700ebc..ef700ebc 100644
--- a/modules/home/conf/alacritty/yaml/cursor.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/cursor.yml
diff --git a/modules/home/conf/alacritty/yaml/debug.yml b/modules/home.legacy/conf/alacritty/yaml/debug.yml
index 2c391da2..2c391da2 100644
--- a/modules/home/conf/alacritty/yaml/debug.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/debug.yml
diff --git a/modules/home/conf/alacritty/yaml/env.yml b/modules/home.legacy/conf/alacritty/yaml/env.yml
index ee7528b7..ee7528b7 100644
--- a/modules/home/conf/alacritty/yaml/env.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/env.yml
diff --git a/modules/home/conf/alacritty/yaml/font.yml b/modules/home.legacy/conf/alacritty/yaml/font.yml
index a3fd3b1d..a3fd3b1d 100644
--- a/modules/home/conf/alacritty/yaml/font.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/font.yml
diff --git a/modules/home/conf/alacritty/yaml/hints.yml b/modules/home.legacy/conf/alacritty/yaml/hints.yml
index 8c35548b..8c35548b 100644
--- a/modules/home/conf/alacritty/yaml/hints.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/hints.yml
diff --git a/modules/home/conf/alacritty/yaml/key_bindings.yml b/modules/home.legacy/conf/alacritty/yaml/key_bindings.yml
index c8be747e..c8be747e 100644
--- a/modules/home/conf/alacritty/yaml/key_bindings.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/key_bindings.yml
diff --git a/modules/home/conf/alacritty/yaml/mouse.yml b/modules/home.legacy/conf/alacritty/yaml/mouse.yml
index 4bdb408b..4bdb408b 100644
--- a/modules/home/conf/alacritty/yaml/mouse.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/mouse.yml
diff --git a/modules/home/conf/alacritty/yaml/mouse_bindings.yml b/modules/home.legacy/conf/alacritty/yaml/mouse_bindings.yml
index ab244d21..ab244d21 100644
--- a/modules/home/conf/alacritty/yaml/mouse_bindings.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/mouse_bindings.yml
diff --git a/modules/home/conf/alacritty/yaml/scrolling.yml b/modules/home.legacy/conf/alacritty/yaml/scrolling.yml
index 50365627..50365627 100644
--- a/modules/home/conf/alacritty/yaml/scrolling.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/scrolling.yml
diff --git a/modules/home/conf/alacritty/yaml/selection.yml b/modules/home.legacy/conf/alacritty/yaml/selection.yml
index 5e5bd544..5e5bd544 100644
--- a/modules/home/conf/alacritty/yaml/selection.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/selection.yml
diff --git a/modules/home/conf/alacritty/yaml/shell.yml b/modules/home.legacy/conf/alacritty/yaml/shell.yml
index 04844dd0..04844dd0 100644
--- a/modules/home/conf/alacritty/yaml/shell.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/shell.yml
diff --git a/modules/home/conf/alacritty/yaml/window.yml b/modules/home.legacy/conf/alacritty/yaml/window.yml
index 7b89b6ed..7b89b6ed 100644
--- a/modules/home/conf/alacritty/yaml/window.yml
+++ b/modules/home.legacy/conf/alacritty/yaml/window.yml
diff --git a/modules/home/conf/beets/default.nix b/modules/home.legacy/conf/beets/default.nix
index 8d6277b7..8d6277b7 100644
--- a/modules/home/conf/beets/default.nix
+++ b/modules/home.legacy/conf/beets/default.nix
diff --git a/modules/home/conf/beets/plugins.nix b/modules/home.legacy/conf/beets/plugins.nix
index bea2fefe..bea2fefe 100644
--- a/modules/home/conf/beets/plugins.nix
+++ b/modules/home.legacy/conf/beets/plugins.nix
diff --git a/modules/home/conf/beets/plugins/badfiles/default.nix b/modules/home.legacy/conf/beets/plugins/badfiles/default.nix
index 33884785..33884785 100644
--- a/modules/home/conf/beets/plugins/badfiles/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/badfiles/default.nix
diff --git a/modules/home/conf/beets/plugins/default.nix b/modules/home.legacy/conf/beets/plugins/default.nix
index 3bea5ea8..3bea5ea8 100644
--- a/modules/home/conf/beets/plugins/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/default.nix
diff --git a/modules/home/conf/beets/plugins/duplicates/default.nix b/modules/home.legacy/conf/beets/plugins/duplicates/default.nix
index c8a6c108..c8a6c108 100644
--- a/modules/home/conf/beets/plugins/duplicates/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/duplicates/default.nix
diff --git a/modules/home/conf/beets/plugins/fuzzy/default.nix b/modules/home.legacy/conf/beets/plugins/fuzzy/default.nix
index b86b3a20..b86b3a20 100644
--- a/modules/home/conf/beets/plugins/fuzzy/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/fuzzy/default.nix
diff --git a/modules/home/conf/beets/plugins/ihate/default.nix b/modules/home.legacy/conf/beets/plugins/ihate/default.nix
index 145f5f8b..145f5f8b 100644
--- a/modules/home/conf/beets/plugins/ihate/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/ihate/default.nix
diff --git a/modules/home/conf/beets/plugins/inline/default.nix b/modules/home.legacy/conf/beets/plugins/inline/default.nix
index 0dda8cfc..0dda8cfc 100644
--- a/modules/home/conf/beets/plugins/inline/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/inline/default.nix
diff --git a/modules/home/conf/beets/plugins/lastgenre/default.nix b/modules/home.legacy/conf/beets/plugins/lastgenre/default.nix
index d10ca49f..d10ca49f 100644
--- a/modules/home/conf/beets/plugins/lastgenre/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/lastgenre/default.nix
diff --git a/modules/home/conf/beets/plugins/lyrics/default.nix b/modules/home.legacy/conf/beets/plugins/lyrics/default.nix
index 80544aea..80544aea 100644
--- a/modules/home/conf/beets/plugins/lyrics/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/lyrics/default.nix
diff --git a/modules/home/conf/beets/plugins/mbsubmit/default.nix b/modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix
index b70f1c63..b70f1c63 100644
--- a/modules/home/conf/beets/plugins/mbsubmit/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix
diff --git a/modules/home/conf/beets/plugins/play/default.nix b/modules/home.legacy/conf/beets/plugins/play/default.nix
index f5bc3c9b..f5bc3c9b 100644
--- a/modules/home/conf/beets/plugins/play/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/play/default.nix
diff --git a/modules/home/conf/beets/plugins/replaygain/default.nix b/modules/home.legacy/conf/beets/plugins/replaygain/default.nix
index 611f3799..611f3799 100644
--- a/modules/home/conf/beets/plugins/replaygain/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/replaygain/default.nix
diff --git a/modules/home/conf/beets/plugins/smartplaylist/default.nix b/modules/home.legacy/conf/beets/plugins/smartplaylist/default.nix
index b55c487c..b55c487c 100644
--- a/modules/home/conf/beets/plugins/smartplaylist/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/smartplaylist/default.nix
diff --git a/modules/home/conf/beets/plugins/xtractor/default.nix b/modules/home.legacy/conf/beets/plugins/xtractor/default.nix
index d4582c5f..d4582c5f 100644
--- a/modules/home/conf/beets/plugins/xtractor/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/xtractor/default.nix
diff --git a/modules/home/conf/beets/replace_override.yaml b/modules/home.legacy/conf/beets/replace_override.yaml
index 23d6ea55..23d6ea55 100644
--- a/modules/home/conf/beets/replace_override.yaml
+++ b/modules/home.legacy/conf/beets/replace_override.yaml
diff --git a/modules/home/conf/btop/default.nix b/modules/home.legacy/conf/btop/default.nix
index 06b56ea7..06b56ea7 100644
--- a/modules/home/conf/btop/default.nix
+++ b/modules/home.legacy/conf/btop/default.nix
diff --git a/modules/home/conf/dconf/default.nix b/modules/home.legacy/conf/dconf/default.nix
index dc439e1e..dc439e1e 100644
--- a/modules/home/conf/dconf/default.nix
+++ b/modules/home.legacy/conf/dconf/default.nix
diff --git a/modules/home/conf/default.nix b/modules/home.legacy/conf/default.nix
index b6eddec4..b6eddec4 100644
--- a/modules/home/conf/default.nix
+++ b/modules/home.legacy/conf/default.nix
diff --git a/modules/home/conf/direnv/default.nix b/modules/home.legacy/conf/direnv/default.nix
index 3a7b8add..3a7b8add 100644
--- a/modules/home/conf/direnv/default.nix
+++ b/modules/home.legacy/conf/direnv/default.nix
diff --git a/modules/home/conf/firefox/config/bookmarks/default.nix b/modules/home.legacy/conf/firefox/config/bookmarks/default.nix
index c612bf4d..c612bf4d 100644
--- a/modules/home/conf/firefox/config/bookmarks/default.nix
+++ b/modules/home.legacy/conf/firefox/config/bookmarks/default.nix
diff --git a/modules/home/conf/firefox/config/bookmarks/lib.nix b/modules/home.legacy/conf/firefox/config/bookmarks/lib.nix
index d1d89dd2..d1d89dd2 100644
--- a/modules/home/conf/firefox/config/bookmarks/lib.nix
+++ b/modules/home.legacy/conf/firefox/config/bookmarks/lib.nix
diff --git a/modules/home/conf/firefox/config/chrome/userChrome.css b/modules/home.legacy/conf/firefox/config/chrome/userChrome.css
index 0b3aff77..0b3aff77 100644
--- a/modules/home/conf/firefox/config/chrome/userChrome.css
+++ b/modules/home.legacy/conf/firefox/config/chrome/userChrome.css
diff --git a/modules/home/conf/firefox/config/extensions/extensions.json b/modules/home.legacy/conf/firefox/config/extensions/extensions.json
index be05e957..be05e957 100644
--- a/modules/home/conf/firefox/config/extensions/extensions.json
+++ b/modules/home.legacy/conf/firefox/config/extensions/extensions.json
diff --git a/modules/home/conf/firefox/config/extensions/native_messaging_hosts/default.nix b/modules/home.legacy/conf/firefox/config/extensions/native_messaging_hosts/default.nix
index 9aaa1682..9aaa1682 100644
--- a/modules/home/conf/firefox/config/extensions/native_messaging_hosts/default.nix
+++ b/modules/home.legacy/conf/firefox/config/extensions/native_messaging_hosts/default.nix
diff --git a/modules/home/conf/firefox/config/policies/default.nix b/modules/home.legacy/conf/firefox/config/policies/default.nix
index 02c740f6..02c740f6 100644
--- a/modules/home/conf/firefox/config/policies/default.nix
+++ b/modules/home.legacy/conf/firefox/config/policies/default.nix
diff --git a/modules/home/conf/firefox/config/prefs/default.nix b/modules/home.legacy/conf/firefox/config/prefs/default.nix
index 80c6d274..80c6d274 100644
--- a/modules/home/conf/firefox/config/prefs/default.nix
+++ b/modules/home.legacy/conf/firefox/config/prefs/default.nix
diff --git a/modules/home/conf/firefox/config/prefs/override.js b/modules/home.legacy/conf/firefox/config/prefs/override.js
index bf874b33..bf874b33 100644
--- a/modules/home/conf/firefox/config/prefs/override.js
+++ b/modules/home.legacy/conf/firefox/config/prefs/override.js
diff --git a/modules/home/conf/firefox/config/search/engines/default.nix b/modules/home.legacy/conf/firefox/config/search/engines/default.nix
index a47c77df..a47c77df 100644
--- a/modules/home/conf/firefox/config/search/engines/default.nix
+++ b/modules/home.legacy/conf/firefox/config/search/engines/default.nix
diff --git a/modules/home/conf/firefox/config/search/engines/logos/arch_linux.svg b/modules/home.legacy/conf/firefox/config/search/engines/logos/arch_linux.svg
index 949b5c5f..949b5c5f 100644
--- a/modules/home/conf/firefox/config/search/engines/logos/arch_linux.svg
+++ b/modules/home.legacy/conf/firefox/config/search/engines/logos/arch_linux.svg
diff --git a/modules/home/conf/firefox/config/search/engines/logos/brave.svg b/modules/home.legacy/conf/firefox/config/search/engines/logos/brave.svg
index 09dd2e42..09dd2e42 100644
--- a/modules/home/conf/firefox/config/search/engines/logos/brave.svg
+++ b/modules/home.legacy/conf/firefox/config/search/engines/logos/brave.svg
diff --git a/modules/home/conf/firefox/config/search/engines/logos/google_scholar.ico b/modules/home.legacy/conf/firefox/config/search/engines/logos/google_scholar.ico
index 85d0c664..85d0c664 100644
--- a/modules/home/conf/firefox/config/search/engines/logos/google_scholar.ico
+++ b/modules/home.legacy/conf/firefox/config/search/engines/logos/google_scholar.ico
Binary files differdiff --git a/modules/home/conf/firefox/config/search/engines/logos/rust_std.svg b/modules/home.legacy/conf/firefox/config/search/engines/logos/rust_std.svg
index 0091b5a8..0091b5a8 100644
--- a/modules/home/conf/firefox/config/search/engines/logos/rust_std.svg
+++ b/modules/home.legacy/conf/firefox/config/search/engines/logos/rust_std.svg
diff --git a/modules/home/conf/firefox/config/search/engines/logos/rust_tokio.png b/modules/home.legacy/conf/firefox/config/search/engines/logos/rust_tokio.png
index f1de55ff..f1de55ff 100644
--- a/modules/home/conf/firefox/config/search/engines/logos/rust_tokio.png
+++ b/modules/home.legacy/conf/firefox/config/search/engines/logos/rust_tokio.png
Binary files differdiff --git a/modules/home/conf/firefox/config/search/engines/logos/wikipedia.svg b/modules/home.legacy/conf/firefox/config/search/engines/logos/wikipedia.svg
index dc32f984..dc32f984 100644
--- a/modules/home/conf/firefox/config/search/engines/logos/wikipedia.svg
+++ b/modules/home.legacy/conf/firefox/config/search/engines/logos/wikipedia.svg
diff --git a/modules/home/conf/firefox/default.nix b/modules/home.legacy/conf/firefox/default.nix
index f2ccfc99..f2ccfc99 100644
--- a/modules/home/conf/firefox/default.nix
+++ b/modules/home.legacy/conf/firefox/default.nix
diff --git a/modules/home/conf/firefox/package.nix b/modules/home.legacy/conf/firefox/package.nix
index f7e4319b..f7e4319b 100644
--- a/modules/home/conf/firefox/package.nix
+++ b/modules/home.legacy/conf/firefox/package.nix
diff --git a/modules/home/conf/firefox/scripts/default.nix b/modules/home.legacy/conf/firefox/scripts/default.nix
index 1127662b..1127662b 100644
--- a/modules/home/conf/firefox/scripts/default.nix
+++ b/modules/home.legacy/conf/firefox/scripts/default.nix
diff --git a/modules/home/conf/firefox/scripts/extract_cookies.sh b/modules/home.legacy/conf/firefox/scripts/extract_cookies.sh
index e3d50d43..e3d50d43 100755
--- a/modules/home/conf/firefox/scripts/extract_cookies.sh
+++ b/modules/home.legacy/conf/firefox/scripts/extract_cookies.sh
diff --git a/modules/home/conf/firefox/scripts/unzip_mozlz4.py b/modules/home.legacy/conf/firefox/scripts/unzip_mozlz4.py
index 9a2348bf..9a2348bf 100755
--- a/modules/home/conf/firefox/scripts/unzip_mozlz4.py
+++ b/modules/home.legacy/conf/firefox/scripts/unzip_mozlz4.py
diff --git a/modules/home/conf/firefox/scripts/update_extensions.sh b/modules/home.legacy/conf/firefox/scripts/update_extensions.sh
index 86bd843c..86bd843c 100755
--- a/modules/home/conf/firefox/scripts/update_extensions.sh
+++ b/modules/home.legacy/conf/firefox/scripts/update_extensions.sh
diff --git a/modules/home/conf/gammastep/default.nix b/modules/home.legacy/conf/gammastep/default.nix
index 1ae0550b..1ae0550b 100644
--- a/modules/home/conf/gammastep/default.nix
+++ b/modules/home.legacy/conf/gammastep/default.nix
diff --git a/modules/home/conf/git/aliases.nix b/modules/home.legacy/conf/git/aliases.nix
index 15bf613d..15bf613d 100644
--- a/modules/home/conf/git/aliases.nix
+++ b/modules/home.legacy/conf/git/aliases.nix
diff --git a/modules/home/conf/git/default.nix b/modules/home.legacy/conf/git/default.nix
index 6680c598..6680c598 100644
--- a/modules/home/conf/git/default.nix
+++ b/modules/home.legacy/conf/git/default.nix
diff --git a/modules/home/conf/git/git_ignore.git b/modules/home.legacy/conf/git/git_ignore.git
index 8f29815e..8f29815e 100644
--- a/modules/home/conf/git/git_ignore.git
+++ b/modules/home.legacy/conf/git/git_ignore.git
diff --git a/modules/home/conf/git/git_template.git b/modules/home.legacy/conf/git/git_template.git
index 6af39119..6af39119 100644
--- a/modules/home/conf/git/git_template.git
+++ b/modules/home.legacy/conf/git/git_template.git
diff --git a/modules/home/conf/gpg/default.nix b/modules/home.legacy/conf/gpg/default.nix
index 1acdf628..1acdf628 100644
--- a/modules/home/conf/gpg/default.nix
+++ b/modules/home.legacy/conf/gpg/default.nix
diff --git a/modules/home/conf/gpg/keys/key_1.asc b/modules/home.legacy/conf/gpg/keys/key_1.asc
index 795f82af..795f82af 100644
--- a/modules/home/conf/gpg/keys/key_1.asc
+++ b/modules/home.legacy/conf/gpg/keys/key_1.asc
diff --git a/modules/home/conf/gpg/keys/key_2.asc b/modules/home.legacy/conf/gpg/keys/key_2.asc
index 47188da7..47188da7 100644
--- a/modules/home/conf/gpg/keys/key_2.asc
+++ b/modules/home.legacy/conf/gpg/keys/key_2.asc
diff --git a/modules/home/conf/gtk/default.nix b/modules/home.legacy/conf/gtk/default.nix
index f5411369..f5411369 100644
--- a/modules/home/conf/gtk/default.nix
+++ b/modules/home.legacy/conf/gtk/default.nix
diff --git a/modules/home/conf/himalaya/default.nix b/modules/home.legacy/conf/himalaya/default.nix
index c072693e..c072693e 100644
--- a/modules/home/conf/himalaya/default.nix
+++ b/modules/home.legacy/conf/himalaya/default.nix
diff --git a/modules/home/conf/hyfetch/default.nix b/modules/home.legacy/conf/hyfetch/default.nix
index aec21dbc..aec21dbc 100644
--- a/modules/home/conf/hyfetch/default.nix
+++ b/modules/home.legacy/conf/hyfetch/default.nix
diff --git a/modules/home/conf/iamb/config.json b/modules/home.legacy/conf/iamb/config.json
index ca06d543..ca06d543 100644
--- a/modules/home/conf/iamb/config.json
+++ b/modules/home.legacy/conf/iamb/config.json
diff --git a/modules/home/conf/iamb/default.nix b/modules/home.legacy/conf/iamb/default.nix
index 2a93472c..2a93472c 100644
--- a/modules/home/conf/iamb/default.nix
+++ b/modules/home.legacy/conf/iamb/default.nix
diff --git a/modules/home/conf/keepassxc/default.nix b/modules/home.legacy/conf/keepassxc/default.nix
index 3ac82812..3ac82812 100644
--- a/modules/home/conf/keepassxc/default.nix
+++ b/modules/home.legacy/conf/keepassxc/default.nix
diff --git a/modules/home/conf/keepassxc/keepassxc.ini b/modules/home.legacy/conf/keepassxc/keepassxc.ini
index 288a194b..288a194b 100644
--- a/modules/home/conf/keepassxc/keepassxc.ini
+++ b/modules/home.legacy/conf/keepassxc/keepassxc.ini
diff --git a/modules/home/conf/latexindent/default.nix b/modules/home.legacy/conf/latexindent/default.nix
index 0d776e14..0d776e14 100644
--- a/modules/home/conf/latexindent/default.nix
+++ b/modules/home.legacy/conf/latexindent/default.nix
diff --git a/modules/home/conf/latexindent/indentconfig.yaml b/modules/home.legacy/conf/latexindent/indentconfig.yaml
index d67351f3..d67351f3 100644
--- a/modules/home/conf/latexindent/indentconfig.yaml
+++ b/modules/home.legacy/conf/latexindent/indentconfig.yaml
diff --git a/modules/home/conf/latexindent/mysettings.yaml b/modules/home.legacy/conf/latexindent/mysettings.yaml
index 9a0f8b2f..9a0f8b2f 100644
--- a/modules/home/conf/latexindent/mysettings.yaml
+++ b/modules/home.legacy/conf/latexindent/mysettings.yaml
diff --git a/modules/home/conf/less/command.less b/modules/home.legacy/conf/less/command.less
index 95b79b02..95b79b02 100644
--- a/modules/home/conf/less/command.less
+++ b/modules/home.legacy/conf/less/command.less
diff --git a/modules/home/conf/less/default.nix b/modules/home.legacy/conf/less/default.nix
index 9991ebef..9991ebef 100644
--- a/modules/home/conf/less/default.nix
+++ b/modules/home.legacy/conf/less/default.nix
diff --git a/modules/home/conf/less/env.less b/modules/home.legacy/conf/less/env.less
index 30f7645d..30f7645d 100644
--- a/modules/home/conf/less/env.less
+++ b/modules/home.legacy/conf/less/env.less
diff --git a/modules/home/conf/less/line-edit.less b/modules/home.legacy/conf/less/line-edit.less
index a7e889db..a7e889db 100644
--- a/modules/home/conf/less/line-edit.less
+++ b/modules/home.legacy/conf/less/line-edit.less
diff --git a/modules/home/conf/lf/colors b/modules/home.legacy/conf/lf/colors
index 1c2853ec..1c2853ec 100644
--- a/modules/home/conf/lf/colors
+++ b/modules/home.legacy/conf/lf/colors
diff --git a/modules/home/conf/lf/commands/default.nix b/modules/home.legacy/conf/lf/commands/default.nix
index 933769ac..933769ac 100644
--- a/modules/home/conf/lf/commands/default.nix
+++ b/modules/home.legacy/conf/lf/commands/default.nix
diff --git a/modules/home/conf/lf/commands/scripts/archive.sh b/modules/home.legacy/conf/lf/commands/scripts/archive.sh
index 25f40534..25f40534 100755
--- a/modules/home/conf/lf/commands/scripts/archive.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/archive.sh
diff --git a/modules/home/conf/lf/commands/scripts/broot_jump.sh b/modules/home.legacy/conf/lf/commands/scripts/broot_jump.sh
index 8f40ba01..8f40ba01 100755
--- a/modules/home/conf/lf/commands/scripts/broot_jump.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/broot_jump.sh
diff --git a/modules/home/conf/lf/commands/scripts/chmod.sh b/modules/home.legacy/conf/lf/commands/scripts/chmod.sh
index 9859127b..9859127b 100755
--- a/modules/home/conf/lf/commands/scripts/chmod.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/chmod.sh
diff --git a/modules/home/conf/lf/commands/scripts/clear_trash.sh b/modules/home.legacy/conf/lf/commands/scripts/clear_trash.sh
index 9052bb5f..9052bb5f 100755
--- a/modules/home/conf/lf/commands/scripts/clear_trash.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/clear_trash.sh
diff --git a/modules/home/conf/lf/commands/scripts/cow_cp.sh b/modules/home.legacy/conf/lf/commands/scripts/cow_cp.sh
index 98675b9e..98675b9e 100755
--- a/modules/home/conf/lf/commands/scripts/cow_cp.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/cow_cp.sh
diff --git a/modules/home/conf/lf/commands/scripts/dl_file.sh b/modules/home.legacy/conf/lf/commands/scripts/dl_file.sh
index c7e3d8b2..c7e3d8b2 100755
--- a/modules/home/conf/lf/commands/scripts/dl_file.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/dl_file.sh
diff --git a/modules/home/conf/lf/commands/scripts/dragon.sh b/modules/home.legacy/conf/lf/commands/scripts/dragon.sh
index cf3c3176..cf3c3176 100755
--- a/modules/home/conf/lf/commands/scripts/dragon.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/dragon.sh
diff --git a/modules/home/conf/lf/commands/scripts/dragon_individual.sh b/modules/home.legacy/conf/lf/commands/scripts/dragon_individual.sh
index 2465cdfa..2465cdfa 100755
--- a/modules/home/conf/lf/commands/scripts/dragon_individual.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/dragon_individual.sh
diff --git a/modules/home/conf/lf/commands/scripts/dragon_stay.sh b/modules/home.legacy/conf/lf/commands/scripts/dragon_stay.sh
index 066b4c75..066b4c75 100755
--- a/modules/home/conf/lf/commands/scripts/dragon_stay.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/dragon_stay.sh
diff --git a/modules/home/conf/lf/commands/scripts/execute.sh b/modules/home.legacy/conf/lf/commands/scripts/execute.sh
index aa97fd7f..aa97fd7f 100755
--- a/modules/home/conf/lf/commands/scripts/execute.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/execute.sh
diff --git a/modules/home/conf/lf/commands/scripts/follow_link.sh b/modules/home.legacy/conf/lf/commands/scripts/follow_link.sh
index 80413990..80413990 100755
--- a/modules/home/conf/lf/commands/scripts/follow_link.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/follow_link.sh
diff --git a/modules/home/conf/lf/commands/scripts/fzf_jump.sh b/modules/home.legacy/conf/lf/commands/scripts/fzf_jump.sh
index ad1633fb..ad1633fb 100755
--- a/modules/home/conf/lf/commands/scripts/fzf_jump.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/fzf_jump.sh
diff --git a/modules/home/conf/lf/commands/scripts/go_project_root.sh b/modules/home.legacy/conf/lf/commands/scripts/go_project_root.sh
index 5f7746d3..5f7746d3 100755
--- a/modules/home/conf/lf/commands/scripts/go_project_root.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/go_project_root.sh
diff --git a/modules/home/conf/lf/commands/scripts/mk_dir.sh b/modules/home.legacy/conf/lf/commands/scripts/mk_dir.sh
index 150f7eed..150f7eed 100755
--- a/modules/home/conf/lf/commands/scripts/mk_dir.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/mk_dir.sh
diff --git a/modules/home/conf/lf/commands/scripts/mk_file.sh b/modules/home.legacy/conf/lf/commands/scripts/mk_file.sh
index 41d5cf1a..41d5cf1a 100755
--- a/modules/home/conf/lf/commands/scripts/mk_file.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/mk_file.sh
diff --git a/modules/home/conf/lf/commands/scripts/mk_file_and_edit.sh b/modules/home.legacy/conf/lf/commands/scripts/mk_file_and_edit.sh
index 19fc51db..19fc51db 100755
--- a/modules/home/conf/lf/commands/scripts/mk_file_and_edit.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/mk_file_and_edit.sh
diff --git a/modules/home/conf/lf/commands/scripts/mk_ln.sh b/modules/home.legacy/conf/lf/commands/scripts/mk_ln.sh
index 7fab8e22..7fab8e22 100755
--- a/modules/home/conf/lf/commands/scripts/mk_ln.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/mk_ln.sh
diff --git a/modules/home/conf/lf/commands/scripts/mk_scr_default.sh b/modules/home.legacy/conf/lf/commands/scripts/mk_scr_default.sh
index 47d05080..47d05080 100755
--- a/modules/home/conf/lf/commands/scripts/mk_scr_default.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/mk_scr_default.sh
diff --git a/modules/home/conf/lf/commands/scripts/mk_scr_temp.sh b/modules/home.legacy/conf/lf/commands/scripts/mk_scr_temp.sh
index 512b5d0b..512b5d0b 100755
--- a/modules/home/conf/lf/commands/scripts/mk_scr_temp.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/mk_scr_temp.sh
diff --git a/modules/home/conf/lf/commands/scripts/restore_trash.sh b/modules/home.legacy/conf/lf/commands/scripts/restore_trash.sh
index b4ef492f..b4ef492f 100755
--- a/modules/home/conf/lf/commands/scripts/restore_trash.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/restore_trash.sh
diff --git a/modules/home/conf/lf/commands/scripts/set_wall_paper.sh b/modules/home.legacy/conf/lf/commands/scripts/set_wall_paper.sh
index 2e607d33..2e607d33 100755
--- a/modules/home/conf/lf/commands/scripts/set_wall_paper.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/set_wall_paper.sh
diff --git a/modules/home/conf/lf/commands/scripts/stripspace.sh b/modules/home.legacy/conf/lf/commands/scripts/stripspace.sh
index 33b1cbcf..33b1cbcf 100755
--- a/modules/home/conf/lf/commands/scripts/stripspace.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/stripspace.sh
diff --git a/modules/home/conf/lf/commands/scripts/trash.sh b/modules/home.legacy/conf/lf/commands/scripts/trash.sh
index f4878c49..f4878c49 100755
--- a/modules/home/conf/lf/commands/scripts/trash.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/trash.sh
diff --git a/modules/home/conf/lf/commands/scripts/unarchive.sh b/modules/home.legacy/conf/lf/commands/scripts/unarchive.sh
index d4835f6b..d4835f6b 100755
--- a/modules/home/conf/lf/commands/scripts/unarchive.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/unarchive.sh
diff --git a/modules/home/conf/lf/commands/scripts/view_file.sh b/modules/home.legacy/conf/lf/commands/scripts/view_file.sh
index 6258d755..6258d755 100755
--- a/modules/home/conf/lf/commands/scripts/view_file.sh
+++ b/modules/home.legacy/conf/lf/commands/scripts/view_file.sh
diff --git a/modules/home/conf/lf/default.nix b/modules/home.legacy/conf/lf/default.nix
index 7b604ed0..7b604ed0 100644
--- a/modules/home/conf/lf/default.nix
+++ b/modules/home.legacy/conf/lf/default.nix
diff --git a/modules/home/conf/lf/icons b/modules/home.legacy/conf/lf/icons
index 9047fbfb..9047fbfb 100644
--- a/modules/home/conf/lf/icons
+++ b/modules/home.legacy/conf/lf/icons
diff --git a/modules/home/conf/lf/keybindings/default.nix b/modules/home.legacy/conf/lf/keybindings/default.nix
index b41004dc..b41004dc 100644
--- a/modules/home/conf/lf/keybindings/default.nix
+++ b/modules/home.legacy/conf/lf/keybindings/default.nix
diff --git a/modules/home/conf/mail/accounts/benedikt.nix b/modules/home.legacy/conf/mail/accounts/benedikt.nix
index 87ede61b..87ede61b 100644
--- a/modules/home/conf/mail/accounts/benedikt.nix
+++ b/modules/home.legacy/conf/mail/accounts/benedikt.nix
diff --git a/modules/home/conf/mail/accounts/soispha.nix b/modules/home.legacy/conf/mail/accounts/soispha.nix
index 012e84d6..012e84d6 100644
--- a/modules/home/conf/mail/accounts/soispha.nix
+++ b/modules/home.legacy/conf/mail/accounts/soispha.nix
diff --git a/modules/home/conf/mail/default.nix b/modules/home.legacy/conf/mail/default.nix
index 0ecbe40a..0ecbe40a 100644
--- a/modules/home/conf/mail/default.nix
+++ b/modules/home.legacy/conf/mail/default.nix
diff --git a/modules/home/conf/mako/default.nix b/modules/home.legacy/conf/mako/default.nix
index 711457f2..711457f2 100644
--- a/modules/home/conf/mako/default.nix
+++ b/modules/home.legacy/conf/mako/default.nix
diff --git a/modules/home/conf/mbsync/default.nix b/modules/home.legacy/conf/mbsync/default.nix
index ac9808c9..ac9808c9 100644
--- a/modules/home/conf/mbsync/default.nix
+++ b/modules/home.legacy/conf/mbsync/default.nix
diff --git a/modules/home/conf/mpd/default.nix b/modules/home.legacy/conf/mpd/default.nix
index b30f6995..b30f6995 100644
--- a/modules/home/conf/mpd/default.nix
+++ b/modules/home.legacy/conf/mpd/default.nix
diff --git a/modules/home/conf/mpd/mpdconf.example b/modules/home.legacy/conf/mpd/mpdconf.example
index eaa5e641..eaa5e641 100644
--- a/modules/home/conf/mpd/mpdconf.example
+++ b/modules/home.legacy/conf/mpd/mpdconf.example
diff --git a/modules/home/conf/mpv/default.nix b/modules/home.legacy/conf/mpv/default.nix
index 6b252a38..6b252a38 100644
--- a/modules/home/conf/mpv/default.nix
+++ b/modules/home.legacy/conf/mpv/default.nix
diff --git a/modules/home/conf/mumble/Mumble.conf b/modules/home.legacy/conf/mumble/Mumble.conf
index 2d895f41..2d895f41 100644
--- a/modules/home/conf/mumble/Mumble.conf
+++ b/modules/home.legacy/conf/mumble/Mumble.conf
diff --git a/modules/home/conf/mumble/default.nix b/modules/home.legacy/conf/mumble/default.nix
index 6fa524dc..6fa524dc 100644
--- a/modules/home/conf/mumble/default.nix
+++ b/modules/home.legacy/conf/mumble/default.nix
diff --git a/modules/home/conf/neomutt/default.nix b/modules/home.legacy/conf/neomutt/default.nix
index e4fbcb39..e4fbcb39 100644
--- a/modules/home/conf/neomutt/default.nix
+++ b/modules/home.legacy/conf/neomutt/default.nix
diff --git a/modules/home/conf/nix-index/default.nix b/modules/home.legacy/conf/nix-index/default.nix
index eb8132d9..eb8132d9 100644
--- a/modules/home/conf/nix-index/default.nix
+++ b/modules/home.legacy/conf/nix-index/default.nix
diff --git a/modules/home/conf/npm/.npmrc b/modules/home.legacy/conf/npm/.npmrc
index d0d846bd..d0d846bd 100644
--- a/modules/home/conf/npm/.npmrc
+++ b/modules/home.legacy/conf/npm/.npmrc
diff --git a/modules/home/conf/npm/default.nix b/modules/home.legacy/conf/npm/default.nix
index 7b4bb6a1..7b4bb6a1 100644
--- a/modules/home/conf/npm/default.nix
+++ b/modules/home.legacy/conf/npm/default.nix
diff --git a/modules/home/conf/nvim/autocmds/default.nix b/modules/home.legacy/conf/nvim/autocmds/default.nix
index a8f00bdc..a8f00bdc 100644
--- a/modules/home/conf/nvim/autocmds/default.nix
+++ b/modules/home.legacy/conf/nvim/autocmds/default.nix
diff --git a/modules/home/conf/nvim/clipboard/default.nix b/modules/home.legacy/conf/nvim/clipboard/default.nix
index 0a686190..0a686190 100644
--- a/modules/home/conf/nvim/clipboard/default.nix
+++ b/modules/home.legacy/conf/nvim/clipboard/default.nix
diff --git a/modules/home/conf/nvim/default.nix b/modules/home.legacy/conf/nvim/default.nix
index 2da80c22..2da80c22 100644
--- a/modules/home/conf/nvim/default.nix
+++ b/modules/home.legacy/conf/nvim/default.nix
diff --git a/modules/home/conf/nvim/files/default.nix b/modules/home.legacy/conf/nvim/files/default.nix
index f935ac7b..f935ac7b 100644
--- a/modules/home/conf/nvim/files/default.nix
+++ b/modules/home.legacy/conf/nvim/files/default.nix
diff --git a/modules/home/conf/nvim/files/ftplugin/tex.lua b/modules/home.legacy/conf/nvim/files/ftplugin/tex.lua
index f3fffa86..f3fffa86 100644
--- a/modules/home/conf/nvim/files/ftplugin/tex.lua
+++ b/modules/home.legacy/conf/nvim/files/ftplugin/tex.lua
diff --git a/modules/home/conf/nvim/mappings/default.nix b/modules/home.legacy/conf/nvim/mappings/default.nix
index af800d22..af800d22 100644
--- a/modules/home/conf/nvim/mappings/default.nix
+++ b/modules/home.legacy/conf/nvim/mappings/default.nix
diff --git a/modules/home/conf/nvim/options/default.nix b/modules/home.legacy/conf/nvim/options/default.nix
index d22bdd8f..d22bdd8f 100644
--- a/modules/home/conf/nvim/options/default.nix
+++ b/modules/home.legacy/conf/nvim/options/default.nix
diff --git a/modules/home/conf/nvim/plgs/colorscheme/default.nix b/modules/home.legacy/conf/nvim/plgs/colorscheme/default.nix
index 11357f77..11357f77 100644
--- a/modules/home/conf/nvim/plgs/colorscheme/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/colorscheme/default.nix
diff --git a/modules/home/conf/nvim/plgs/colorscheme/lua/mk_todos_readable.lua b/modules/home.legacy/conf/nvim/plgs/colorscheme/lua/mk_todos_readable.lua
index d02171b5..d02171b5 100644
--- a/modules/home/conf/nvim/plgs/colorscheme/lua/mk_todos_readable.lua
+++ b/modules/home.legacy/conf/nvim/plgs/colorscheme/lua/mk_todos_readable.lua
diff --git a/modules/home/conf/nvim/plgs/colorscheme/lua/nightfox.lua b/modules/home.legacy/conf/nvim/plgs/colorscheme/lua/nightfox.lua
index 4c502153..4c502153 100644
--- a/modules/home/conf/nvim/plgs/colorscheme/lua/nightfox.lua
+++ b/modules/home.legacy/conf/nvim/plgs/colorscheme/lua/nightfox.lua
diff --git a/modules/home/conf/nvim/plgs/comment-nvim/default.nix b/modules/home.legacy/conf/nvim/plgs/comment-nvim/default.nix
index 2a73b8db..2a73b8db 100644
--- a/modules/home/conf/nvim/plgs/comment-nvim/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/comment-nvim/default.nix
diff --git a/modules/home/conf/nvim/plgs/debugprint/default.nix b/modules/home.legacy/conf/nvim/plgs/debugprint/default.nix
index 3c591e9f..3c591e9f 100644
--- a/modules/home/conf/nvim/plgs/debugprint/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/debugprint/default.nix
diff --git a/modules/home/conf/nvim/plgs/debugprint/lua/debugprint.lua b/modules/home.legacy/conf/nvim/plgs/debugprint/lua/debugprint.lua
index da7e1735..da7e1735 100644
--- a/modules/home/conf/nvim/plgs/debugprint/lua/debugprint.lua
+++ b/modules/home.legacy/conf/nvim/plgs/debugprint/lua/debugprint.lua
diff --git a/modules/home/conf/nvim/plgs/default.nix b/modules/home.legacy/conf/nvim/plgs/default.nix
index 991bc315..991bc315 100644
--- a/modules/home/conf/nvim/plgs/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/default.nix
diff --git a/modules/home/conf/nvim/plgs/femaco/default.nix b/modules/home.legacy/conf/nvim/plgs/femaco/default.nix
index 6c4a7d89..6c4a7d89 100644
--- a/modules/home/conf/nvim/plgs/femaco/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/femaco/default.nix
diff --git a/modules/home/conf/nvim/plgs/femaco/lua/femaco.lua b/modules/home.legacy/conf/nvim/plgs/femaco/lua/femaco.lua
index da3be8e1..da3be8e1 100644
--- a/modules/home/conf/nvim/plgs/femaco/lua/femaco.lua
+++ b/modules/home.legacy/conf/nvim/plgs/femaco/lua/femaco.lua
diff --git a/modules/home/conf/nvim/plgs/flatten-nvim/default.nix b/modules/home.legacy/conf/nvim/plgs/flatten-nvim/default.nix
index cd6f8bcc..cd6f8bcc 100644
--- a/modules/home/conf/nvim/plgs/flatten-nvim/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/flatten-nvim/default.nix
diff --git a/modules/home/conf/nvim/plgs/flatten-nvim/lua/flatten-nvim.lua b/modules/home.legacy/conf/nvim/plgs/flatten-nvim/lua/flatten-nvim.lua
index 42ea1eb6..42ea1eb6 100644
--- a/modules/home/conf/nvim/plgs/flatten-nvim/lua/flatten-nvim.lua
+++ b/modules/home.legacy/conf/nvim/plgs/flatten-nvim/lua/flatten-nvim.lua
diff --git a/modules/home/conf/nvim/plgs/goto-preview/default.nix b/modules/home.legacy/conf/nvim/plgs/goto-preview/default.nix
index 3de28c68..3de28c68 100644
--- a/modules/home/conf/nvim/plgs/goto-preview/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/goto-preview/default.nix
diff --git a/modules/home/conf/nvim/plgs/goto-preview/lua/goto-preview.lua b/modules/home.legacy/conf/nvim/plgs/goto-preview/lua/goto-preview.lua
index 9687a5a0..9687a5a0 100644
--- a/modules/home/conf/nvim/plgs/goto-preview/lua/goto-preview.lua
+++ b/modules/home.legacy/conf/nvim/plgs/goto-preview/lua/goto-preview.lua
diff --git a/modules/home/conf/nvim/plgs/harpoon/default.nix b/modules/home.legacy/conf/nvim/plgs/harpoon/default.nix
index 465f24f0..465f24f0 100644
--- a/modules/home/conf/nvim/plgs/harpoon/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/harpoon/default.nix
diff --git a/modules/home/conf/nvim/plgs/leap/default.nix b/modules/home.legacy/conf/nvim/plgs/leap/default.nix
index 4e7ae60c..4e7ae60c 100644
--- a/modules/home/conf/nvim/plgs/leap/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/leap/default.nix
diff --git a/modules/home/conf/nvim/plgs/lf-nvim/default.nix b/modules/home.legacy/conf/nvim/plgs/lf-nvim/default.nix
index 11ad2807..11ad2807 100644
--- a/modules/home/conf/nvim/plgs/lf-nvim/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lf-nvim/default.nix
diff --git a/modules/home/conf/nvim/plgs/lf-nvim/lua/lf-nvim.lua b/modules/home.legacy/conf/nvim/plgs/lf-nvim/lua/lf-nvim.lua
index 1eadf375..1eadf375 100644
--- a/modules/home/conf/nvim/plgs/lf-nvim/lua/lf-nvim.lua
+++ b/modules/home.legacy/conf/nvim/plgs/lf-nvim/lua/lf-nvim.lua
diff --git a/modules/home/conf/nvim/plgs/lsp-progress-nvim/default.nix b/modules/home.legacy/conf/nvim/plgs/lsp-progress-nvim/default.nix
index 6602ceb6..6602ceb6 100644
--- a/modules/home/conf/nvim/plgs/lsp-progress-nvim/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp-progress-nvim/default.nix
diff --git a/modules/home/conf/nvim/plgs/lsp-progress-nvim/lua/lsp-progress-nvim.lua b/modules/home.legacy/conf/nvim/plgs/lsp-progress-nvim/lua/lsp-progress-nvim.lua
index efb15720..efb15720 100644
--- a/modules/home/conf/nvim/plgs/lsp-progress-nvim/lua/lsp-progress-nvim.lua
+++ b/modules/home.legacy/conf/nvim/plgs/lsp-progress-nvim/lua/lsp-progress-nvim.lua
diff --git a/modules/home/conf/nvim/plgs/lsp/default.nix b/modules/home.legacy/conf/nvim/plgs/lsp/default.nix
index b7c1e174..b7c1e174 100644
--- a/modules/home/conf/nvim/plgs/lsp/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/default.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/keymaps/default.nix b/modules/home.legacy/conf/nvim/plgs/lsp/keymaps/default.nix
index b1276639..b1276639 100644
--- a/modules/home/conf/nvim/plgs/lsp/keymaps/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/keymaps/default.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/default.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/default.nix
index 605046d4..605046d4 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/default.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/bashls.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/bashls.nix
index 0577a335..0577a335 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/bashls.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/bashls.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/ccls.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ccls.nix
index 0698bcce..0698bcce 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/ccls.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ccls.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/ltex.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ltex.nix
index 3224bc41..3224bc41 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/ltex.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ltex.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/lua-ls.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/lua-ls.nix
index 4f20558c..4f20558c 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/lua-ls.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/lua-ls.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix
index f0cccbdc..f0cccbdc 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/nil-ls.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/openscad.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/openscad.nix
index a0221cc4..a0221cc4 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/openscad.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/openscad.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/pylyzer.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/pylyzer.nix
index b1042221..b1042221 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/pylyzer.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/pylyzer.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/quick-lint-js.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/quick-lint-js.nix
index 23c3054a..23c3054a 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/quick-lint-js.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/quick-lint-js.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/ruff-lsp.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ruff-lsp.nix
index 6fbdc998..6fbdc998 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/ruff-lsp.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/ruff-lsp.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/rust-analyzer.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/rust-analyzer.nix
index 5da61a71..5da61a71 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/rust-analyzer.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/rust-analyzer.nix
diff --git a/modules/home/conf/nvim/plgs/lsp/servers/servers/texlab.nix b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/texlab.nix
index 59af8d39..59af8d39 100644
--- a/modules/home/conf/nvim/plgs/lsp/servers/servers/texlab.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lsp/servers/servers/texlab.nix
diff --git a/modules/home/conf/nvim/plgs/lspkind/default.nix b/modules/home.legacy/conf/nvim/plgs/lspkind/default.nix
index ed7d411b..ed7d411b 100644
--- a/modules/home/conf/nvim/plgs/lspkind/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lspkind/default.nix
diff --git a/modules/home/conf/nvim/plgs/ltex_extra/default.nix b/modules/home.legacy/conf/nvim/plgs/ltex_extra/default.nix
index af78c7a5..af78c7a5 100644
--- a/modules/home/conf/nvim/plgs/ltex_extra/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/ltex_extra/default.nix
diff --git a/modules/home/conf/nvim/plgs/ltex_extra/lua/ltex_extra.lua b/modules/home.legacy/conf/nvim/plgs/ltex_extra/lua/ltex_extra.lua
index d532428a..d532428a 100644
--- a/modules/home/conf/nvim/plgs/ltex_extra/lua/ltex_extra.lua
+++ b/modules/home.legacy/conf/nvim/plgs/ltex_extra/lua/ltex_extra.lua
diff --git a/modules/home/conf/nvim/plgs/lualine/default.nix b/modules/home.legacy/conf/nvim/plgs/lualine/default.nix
index 54d20380..54d20380 100644
--- a/modules/home/conf/nvim/plgs/lualine/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/lualine/default.nix
diff --git a/modules/home/conf/nvim/plgs/luasnip/default.nix b/modules/home.legacy/conf/nvim/plgs/luasnip/default.nix
index 130fafee..130fafee 100644
--- a/modules/home/conf/nvim/plgs/luasnip/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/luasnip/default.nix
diff --git a/modules/home/conf/nvim/plgs/luasnip/lua/luasnip.lua b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/luasnip.lua
index a05fa57f..a05fa57f 100644
--- a/modules/home/conf/nvim/plgs/luasnip/lua/luasnip.lua
+++ b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/luasnip.lua
diff --git a/modules/home/conf/nvim/plgs/luasnip/lua/snippets/all.lua b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/snippets/all.lua
index c3f75058..c3f75058 100644
--- a/modules/home/conf/nvim/plgs/luasnip/lua/snippets/all.lua
+++ b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/snippets/all.lua
diff --git a/modules/home/conf/nvim/plgs/luasnip/lua/snippets/html/html.lua b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/snippets/html/html.lua
index 17e1e7fb..17e1e7fb 100644
--- a/modules/home/conf/nvim/plgs/luasnip/lua/snippets/html/html.lua
+++ b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/snippets/html/html.lua
diff --git a/modules/home/conf/nvim/plgs/luasnip/lua/snippets/tex/delimiter.lua b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/snippets/tex/delimiter.lua
index 22434aa3..22434aa3 100644
--- a/modules/home/conf/nvim/plgs/luasnip/lua/snippets/tex/delimiter.lua
+++ b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/snippets/tex/delimiter.lua
diff --git a/modules/home/conf/nvim/plgs/luasnip/lua/snippets/tex/greek.lua b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/snippets/tex/greek.lua
index ebf4f9d7..ebf4f9d7 100644
--- a/modules/home/conf/nvim/plgs/luasnip/lua/snippets/tex/greek.lua
+++ b/modules/home.legacy/conf/nvim/plgs/luasnip/lua/snippets/tex/greek.lua
diff --git a/modules/home/conf/nvim/plgs/neorg/default.nix b/modules/home.legacy/conf/nvim/plgs/neorg/default.nix
index 7d61ce09..7d61ce09 100644
--- a/modules/home/conf/nvim/plgs/neorg/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/neorg/default.nix
diff --git a/modules/home/conf/nvim/plgs/nvim-cmp/default.nix b/modules/home.legacy/conf/nvim/plgs/nvim-cmp/default.nix
index ed0e57c3..ed0e57c3 100644
--- a/modules/home/conf/nvim/plgs/nvim-cmp/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/nvim-cmp/default.nix
diff --git a/modules/home/conf/nvim/plgs/nvim-lint/default.nix b/modules/home.legacy/conf/nvim/plgs/nvim-lint/default.nix
index f5cb9acf..f5cb9acf 100644
--- a/modules/home/conf/nvim/plgs/nvim-lint/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/nvim-lint/default.nix
diff --git a/modules/home/conf/nvim/plgs/nvim-lint/lua/nvim-lint.lua b/modules/home.legacy/conf/nvim/plgs/nvim-lint/lua/nvim-lint.lua
index 4ed49f7b..4ed49f7b 100644
--- a/modules/home/conf/nvim/plgs/nvim-lint/lua/nvim-lint.lua
+++ b/modules/home.legacy/conf/nvim/plgs/nvim-lint/lua/nvim-lint.lua
diff --git a/modules/home/conf/nvim/plgs/raw_plugins/default.nix b/modules/home.legacy/conf/nvim/plgs/raw_plugins/default.nix
index 941cb7cb..941cb7cb 100644
--- a/modules/home/conf/nvim/plgs/raw_plugins/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/raw_plugins/default.nix
diff --git a/modules/home/conf/nvim/plgs/telescope/default.nix b/modules/home.legacy/conf/nvim/plgs/telescope/default.nix
index c32e139c..c32e139c 100644
--- a/modules/home/conf/nvim/plgs/telescope/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/default.nix
diff --git a/modules/home/conf/nvim/plgs/telescope/defaults/default.nix b/modules/home.legacy/conf/nvim/plgs/telescope/defaults/default.nix
index 933089ef..933089ef 100644
--- a/modules/home/conf/nvim/plgs/telescope/defaults/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/defaults/default.nix
diff --git a/modules/home/conf/nvim/plgs/telescope/extensions/bibtex/default.nix b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/bibtex/default.nix
index 6f3cc2ea..6f3cc2ea 100644
--- a/modules/home/conf/nvim/plgs/telescope/extensions/bibtex/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/bibtex/default.nix
diff --git a/modules/home/conf/nvim/plgs/telescope/extensions/default.nix b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/default.nix
index 0b1e033a..0b1e033a 100644
--- a/modules/home/conf/nvim/plgs/telescope/extensions/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/default.nix
diff --git a/modules/home/conf/nvim/plgs/telescope/extensions/frecency/default.nix b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/frecency/default.nix
index 0e007b80..0e007b80 100644
--- a/modules/home/conf/nvim/plgs/telescope/extensions/frecency/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/frecency/default.nix
diff --git a/modules/home/conf/nvim/plgs/telescope/extensions/fzy-native/default.nix b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/fzy-native/default.nix
index ce0bdccc..ce0bdccc 100644
--- a/modules/home/conf/nvim/plgs/telescope/extensions/fzy-native/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/fzy-native/default.nix
diff --git a/modules/home/conf/nvim/plgs/telescope/extensions/rooter/default.nix b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/rooter/default.nix
index 779448cc..779448cc 100644
--- a/modules/home/conf/nvim/plgs/telescope/extensions/rooter/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/rooter/default.nix
diff --git a/modules/home/conf/nvim/plgs/telescope/extensions/rooter/lua/rooter.lua b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/rooter/lua/rooter.lua
index 7235c5a3..7235c5a3 100644
--- a/modules/home/conf/nvim/plgs/telescope/extensions/rooter/lua/rooter.lua
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/rooter/lua/rooter.lua
diff --git a/modules/home/conf/nvim/plgs/telescope/extensions/symbols/default.nix b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/symbols/default.nix
index 05b4a4f2..05b4a4f2 100644
--- a/modules/home/conf/nvim/plgs/telescope/extensions/symbols/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/extensions/symbols/default.nix
diff --git a/modules/home/conf/nvim/plgs/telescope/keymaps/default.nix b/modules/home.legacy/conf/nvim/plgs/telescope/keymaps/default.nix
index e551cc5a..e551cc5a 100644
--- a/modules/home/conf/nvim/plgs/telescope/keymaps/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/telescope/keymaps/default.nix
diff --git a/modules/home/conf/nvim/plgs/todo-comments/default.nix b/modules/home.legacy/conf/nvim/plgs/todo-comments/default.nix
index e33f961b..e33f961b 100644
--- a/modules/home/conf/nvim/plgs/todo-comments/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/todo-comments/default.nix
diff --git a/modules/home/conf/nvim/plgs/treesitter/default.nix b/modules/home.legacy/conf/nvim/plgs/treesitter/default.nix
index b4b20388..b4b20388 100644
--- a/modules/home/conf/nvim/plgs/treesitter/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/treesitter/default.nix
diff --git a/modules/home/conf/nvim/plgs/vim-tex/default.nix b/modules/home.legacy/conf/nvim/plgs/vim-tex/default.nix
index 0b92c429..0b92c429 100644
--- a/modules/home/conf/nvim/plgs/vim-tex/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/vim-tex/default.nix
diff --git a/modules/home/conf/nvim/plgs/which-key/default.nix b/modules/home.legacy/conf/nvim/plgs/which-key/default.nix
index be63f7ac..be63f7ac 100644
--- a/modules/home/conf/nvim/plgs/which-key/default.nix
+++ b/modules/home.legacy/conf/nvim/plgs/which-key/default.nix
diff --git a/modules/home/conf/prusa_slicer/default.nix b/modules/home.legacy/conf/prusa_slicer/default.nix
index 9529e13d..9529e13d 100644
--- a/modules/home/conf/prusa_slicer/default.nix
+++ b/modules/home.legacy/conf/prusa_slicer/default.nix
diff --git a/modules/home/conf/prusa_slicer/prusa_slicer.ini b/modules/home.legacy/conf/prusa_slicer/prusa_slicer.ini
index 0416a398..0416a398 100644
--- a/modules/home/conf/prusa_slicer/prusa_slicer.ini
+++ b/modules/home.legacy/conf/prusa_slicer/prusa_slicer.ini
diff --git a/modules/home/conf/python/default.nix b/modules/home.legacy/conf/python/default.nix
index 826d466d..826d466d 100644
--- a/modules/home/conf/python/default.nix
+++ b/modules/home.legacy/conf/python/default.nix
diff --git a/modules/home/conf/python/pythonrc.py b/modules/home.legacy/conf/python/pythonrc.py
index 466d9788..466d9788 100644
--- a/modules/home/conf/python/pythonrc.py
+++ b/modules/home.legacy/conf/python/pythonrc.py
diff --git a/modules/home/conf/rclone/default.nix b/modules/home.legacy/conf/rclone/default.nix
index bd0c1ac2..bd0c1ac2 100644
--- a/modules/home/conf/rclone/default.nix
+++ b/modules/home.legacy/conf/rclone/default.nix
diff --git a/modules/home/conf/rclone/rclone.conf b/modules/home.legacy/conf/rclone/rclone.conf
index 9e1c4f08..9e1c4f08 100644
--- a/modules/home/conf/rclone/rclone.conf
+++ b/modules/home.legacy/conf/rclone/rclone.conf
diff --git a/modules/home/conf/rofi/default.nix b/modules/home.legacy/conf/rofi/default.nix
index 10363ab5..10363ab5 100644
--- a/modules/home/conf/rofi/default.nix
+++ b/modules/home.legacy/conf/rofi/default.nix
diff --git a/modules/home/conf/rofi/nord-twoLines.rasi b/modules/home.legacy/conf/rofi/nord-twoLines.rasi
index 612b907f..612b907f 100644
--- a/modules/home/conf/rofi/nord-twoLines.rasi
+++ b/modules/home.legacy/conf/rofi/nord-twoLines.rasi
diff --git a/modules/home/conf/ssh/default.nix b/modules/home.legacy/conf/ssh/default.nix
index de9b0d90..de9b0d90 100644
--- a/modules/home/conf/ssh/default.nix
+++ b/modules/home.legacy/conf/ssh/default.nix
diff --git a/modules/home/conf/starship/default.nix b/modules/home.legacy/conf/starship/default.nix
index 5db6eb8b..5db6eb8b 100644
--- a/modules/home/conf/starship/default.nix
+++ b/modules/home.legacy/conf/starship/default.nix
diff --git a/modules/home/conf/swayidle/config b/modules/home.legacy/conf/swayidle/config
index a48f670b..a48f670b 100644
--- a/modules/home/conf/swayidle/config
+++ b/modules/home.legacy/conf/swayidle/config
diff --git a/modules/home/conf/swayidle/default.nix b/modules/home.legacy/conf/swayidle/default.nix
index 6b8a7d80..6b8a7d80 100644
--- a/modules/home/conf/swayidle/default.nix
+++ b/modules/home.legacy/conf/swayidle/default.nix
diff --git a/modules/home/conf/swaylock/GTDcanonical.png b/modules/home.legacy/conf/swaylock/GTDcanonical.png
index ef41d79d..ef41d79d 100644
--- a/modules/home/conf/swaylock/GTDcanonical.png
+++ b/modules/home.legacy/conf/swaylock/GTDcanonical.png
Binary files differdiff --git a/modules/home/conf/swaylock/commands.jpg b/modules/home.legacy/conf/swaylock/commands.jpg
index 54016503..54016503 100644
--- a/modules/home/conf/swaylock/commands.jpg
+++ b/modules/home.legacy/conf/swaylock/commands.jpg
Binary files differdiff --git a/modules/home/conf/swaylock/default.nix b/modules/home.legacy/conf/swaylock/default.nix
index 9e5eabac..9e5eabac 100644
--- a/modules/home/conf/swaylock/default.nix
+++ b/modules/home.legacy/conf/swaylock/default.nix
diff --git a/modules/system/boot/boot_pictures/gnu.png b/modules/home.legacy/conf/swaylock/gnu.png
index d07dee3e..d07dee3e 100755..100644
--- a/modules/system/boot/boot_pictures/gnu.png
+++ b/modules/home.legacy/conf/swaylock/gnu.png
Binary files differdiff --git a/modules/home/conf/taskwarrior/default.nix b/modules/home.legacy/conf/taskwarrior/default.nix
index d7aec156..d7aec156 100644
--- a/modules/home/conf/taskwarrior/default.nix
+++ b/modules/home.legacy/conf/taskwarrior/default.nix
diff --git a/modules/home/conf/taskwarrior/firefox/default.nix b/modules/home.legacy/conf/taskwarrior/firefox/default.nix
index fb5daaa8..fb5daaa8 100644
--- a/modules/home/conf/taskwarrior/firefox/default.nix
+++ b/modules/home.legacy/conf/taskwarrior/firefox/default.nix
diff --git a/modules/home/conf/taskwarrior/hooks/default.nix b/modules/home.legacy/conf/taskwarrior/hooks/default.nix
index ef97e1b5..ef97e1b5 100644
--- a/modules/home/conf/taskwarrior/hooks/default.nix
+++ b/modules/home.legacy/conf/taskwarrior/hooks/default.nix
diff --git a/modules/home/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh
index eaf7f30c..eaf7f30c 100755
--- a/modules/home/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh
+++ b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh
diff --git a/modules/home/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh
index dadc96b0..dadc96b0 100755
--- a/modules/home/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh
+++ b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh
diff --git a/modules/home/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh
index 25813e46..25813e46 100755
--- a/modules/home/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh
+++ b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh
diff --git a/modules/home/conf/taskwarrior/hooks/scripts/on-modify_track-timewarrior.py b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-modify_track-timewarrior.py
index b482af6a..b482af6a 100755
--- a/modules/home/conf/taskwarrior/hooks/scripts/on-modify_track-timewarrior.py
+++ b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-modify_track-timewarrior.py
diff --git a/modules/home/conf/taskwarrior/hooks/scripts/on-modify_track-total-active-time.py b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-modify_track-total-active-time.py
index d5b380d0..d5b380d0 100755
--- a/modules/home/conf/taskwarrior/hooks/scripts/on-modify_track-total-active-time.py
+++ b/modules/home.legacy/conf/taskwarrior/hooks/scripts/on-modify_track-total-active-time.py
diff --git a/modules/home/conf/taskwarrior/nord.theme b/modules/home.legacy/conf/taskwarrior/nord.theme
index 2897418f..2897418f 100644
--- a/modules/home/conf/taskwarrior/nord.theme
+++ b/modules/home.legacy/conf/taskwarrior/nord.theme
diff --git a/modules/home/conf/taskwarrior/projects/default.nix b/modules/home.legacy/conf/taskwarrior/projects/default.nix
index 9b555fef..9b555fef 100644
--- a/modules/home/conf/taskwarrior/projects/default.nix
+++ b/modules/home.legacy/conf/taskwarrior/projects/default.nix
diff --git a/modules/home/conf/timewarrior/default.nix b/modules/home.legacy/conf/timewarrior/default.nix
index bcb627f5..bcb627f5 100644
--- a/modules/home/conf/timewarrior/default.nix
+++ b/modules/home.legacy/conf/timewarrior/default.nix
diff --git a/modules/home/conf/timewarrior/nord.theme b/modules/home.legacy/conf/timewarrior/nord.theme
index da3c387a..da3c387a 100644
--- a/modules/home/conf/timewarrior/nord.theme
+++ b/modules/home.legacy/conf/timewarrior/nord.theme
diff --git a/modules/home/conf/tridactyl/config.vim b/modules/home.legacy/conf/tridactyl/config.vim
index 84e290cb..84e290cb 100644
--- a/modules/home/conf/tridactyl/config.vim
+++ b/modules/home.legacy/conf/tridactyl/config.vim
diff --git a/modules/home/conf/tridactyl/default.nix b/modules/home.legacy/conf/tridactyl/default.nix
index 23307cfe..23307cfe 100644
--- a/modules/home/conf/tridactyl/default.nix
+++ b/modules/home.legacy/conf/tridactyl/default.nix
diff --git a/modules/home/conf/unison/default.nix b/modules/home.legacy/conf/unison/default.nix
index ae682235..ae682235 100644
--- a/modules/home/conf/unison/default.nix
+++ b/modules/home.legacy/conf/unison/default.nix
diff --git a/modules/home/conf/xdg/default.nix b/modules/home.legacy/conf/xdg/default.nix
index 4099720d..4099720d 100644
--- a/modules/home/conf/xdg/default.nix
+++ b/modules/home.legacy/conf/xdg/default.nix
diff --git a/modules/home/conf/xdg/url_handler.sh b/modules/home.legacy/conf/xdg/url_handler.sh
index 95eedffb..95eedffb 100755
--- a/modules/home/conf/xdg/url_handler.sh
+++ b/modules/home.legacy/conf/xdg/url_handler.sh
diff --git a/modules/home/conf/xdg/xdg_vars.nix b/modules/home.legacy/conf/xdg/xdg_vars.nix
index 3f7d5e00..3f7d5e00 100644
--- a/modules/home/conf/xdg/xdg_vars.nix
+++ b/modules/home.legacy/conf/xdg/xdg_vars.nix
diff --git a/modules/home/conf/yambar/config/config.yml b/modules/home.legacy/conf/yambar/config/config.yml
index 3d9f0687..3d9f0687 100644
--- a/modules/home/conf/yambar/config/config.yml
+++ b/modules/home.legacy/conf/yambar/config/config.yml
diff --git a/modules/home/conf/yambar/config/laptop.yml b/modules/home.legacy/conf/yambar/config/laptop.yml
index 8de2f508..8de2f508 100644
--- a/modules/home/conf/yambar/config/laptop.yml
+++ b/modules/home.legacy/conf/yambar/config/laptop.yml
diff --git a/modules/home/conf/yambar/default.nix b/modules/home.legacy/conf/yambar/default.nix
index 007e7f25..007e7f25 100644
--- a/modules/home/conf/yambar/default.nix
+++ b/modules/home.legacy/conf/yambar/default.nix
diff --git a/modules/home/conf/yambar/scripts/disk.sh b/modules/home.legacy/conf/yambar/scripts/disk.sh
index a5547a74..a5547a74 100755
--- a/modules/home/conf/yambar/scripts/disk.sh
+++ b/modules/home.legacy/conf/yambar/scripts/disk.sh
diff --git a/modules/home/conf/yambar/scripts/mpd_song_name.sh b/modules/home.legacy/conf/yambar/scripts/mpd_song_name.sh
index 7d294781..7d294781 100755
--- a/modules/home/conf/yambar/scripts/mpd_song_name.sh
+++ b/modules/home.legacy/conf/yambar/scripts/mpd_song_name.sh
diff --git a/modules/home/conf/yambar/scripts/network.sh b/modules/home.legacy/conf/yambar/scripts/network.sh
index adfc93df..adfc93df 100755
--- a/modules/home/conf/yambar/scripts/network.sh
+++ b/modules/home.legacy/conf/yambar/scripts/network.sh
diff --git a/modules/home/conf/yambar/scripts/sound-volume.sh b/modules/home.legacy/conf/yambar/scripts/sound-volume.sh
index 8a98daf7..8a98daf7 100755
--- a/modules/home/conf/yambar/scripts/sound-volume.sh
+++ b/modules/home.legacy/conf/yambar/scripts/sound-volume.sh
diff --git a/modules/home/conf/yt/config.toml b/modules/home.legacy/conf/yt/config.toml
index 981481d9..981481d9 100644
--- a/modules/home/conf/yt/config.toml
+++ b/modules/home.legacy/conf/yt/config.toml
diff --git a/modules/home/conf/yt/default.nix b/modules/home.legacy/conf/yt/default.nix
index 507a0db1..507a0db1 100644
--- a/modules/home/conf/yt/default.nix
+++ b/modules/home.legacy/conf/yt/default.nix
diff --git a/modules/home/conf/yt/input.conf b/modules/home.legacy/conf/yt/input.conf
index f374f062..f374f062 100644
--- a/modules/home/conf/yt/input.conf
+++ b/modules/home.legacy/conf/yt/input.conf
diff --git a/modules/home/conf/yt/mpv.conf b/modules/home.legacy/conf/yt/mpv.conf
index b6d2501f..b6d2501f 100644
--- a/modules/home/conf/yt/mpv.conf
+++ b/modules/home.legacy/conf/yt/mpv.conf
diff --git a/modules/home/conf/ytcc/default.nix b/modules/home.legacy/conf/ytcc/default.nix
index 87300ec1..87300ec1 100644
--- a/modules/home/conf/ytcc/default.nix
+++ b/modules/home.legacy/conf/ytcc/default.nix
diff --git a/modules/home/conf/ytcc/ytcc.conf b/modules/home.legacy/conf/ytcc/ytcc.conf
index 289843ad..289843ad 100644
--- a/modules/home/conf/ytcc/ytcc.conf
+++ b/modules/home.legacy/conf/ytcc/ytcc.conf
diff --git a/modules/home/conf/zsh/config/command_not_found.sh b/modules/home.legacy/conf/zsh/config/command_not_found.sh
index fb21b676..fb21b676 100644
--- a/modules/home/conf/zsh/config/command_not_found.sh
+++ b/modules/home.legacy/conf/zsh/config/command_not_found.sh
diff --git a/modules/home/conf/zsh/config/command_not_found_insult.sh b/modules/home.legacy/conf/zsh/config/command_not_found_insult.sh
index 5126845a..5126845a 100644
--- a/modules/home/conf/zsh/config/command_not_found_insult.sh
+++ b/modules/home.legacy/conf/zsh/config/command_not_found_insult.sh
diff --git a/modules/home/conf/zsh/config/custom_cursor.zsh b/modules/home.legacy/conf/zsh/config/custom_cursor.zsh
index 37390c1c..37390c1c 100644
--- a/modules/home/conf/zsh/config/custom_cursor.zsh
+++ b/modules/home.legacy/conf/zsh/config/custom_cursor.zsh
diff --git a/modules/home/conf/zsh/config/zsh-init.zsh b/modules/home.legacy/conf/zsh/config/zsh-init.zsh
index cd8d34a9..cd8d34a9 100644
--- a/modules/home/conf/zsh/config/zsh-init.zsh
+++ b/modules/home.legacy/conf/zsh/config/zsh-init.zsh
diff --git a/modules/home/conf/zsh/default.nix b/modules/home.legacy/conf/zsh/default.nix
index f5c65081..f5c65081 100644
--- a/modules/home/conf/zsh/default.nix
+++ b/modules/home.legacy/conf/zsh/default.nix
diff --git a/modules/home/default.nix b/modules/home.legacy/default.nix
index 574ed66a..574ed66a 100644
--- a/modules/home/default.nix
+++ b/modules/home.legacy/default.nix
diff --git a/modules/home/files/default.nix b/modules/home.legacy/files/default.nix
index 16fe9afe..16fe9afe 100644
--- a/modules/home/files/default.nix
+++ b/modules/home.legacy/files/default.nix
diff --git a/modules/home/files/manifest_json/default.nix b/modules/home.legacy/files/manifest_json/default.nix
index af8d85d2..af8d85d2 100644
--- a/modules/home/files/manifest_json/default.nix
+++ b/modules/home.legacy/files/manifest_json/default.nix
diff --git a/modules/home/files/manifest_json/profile/manifest.json b/modules/home.legacy/files/manifest_json/profile/manifest.json
index bd74d935..bd74d935 100644
--- a/modules/home/files/manifest_json/profile/manifest.json
+++ b/modules/home.legacy/files/manifest_json/profile/manifest.json
diff --git a/modules/home/files/wallpaper/abstract-nord.png b/modules/home.legacy/files/wallpaper/abstract-nord.png
index 5ef498bf..5ef498bf 100644
--- a/modules/home/files/wallpaper/abstract-nord.png
+++ b/modules/home.legacy/files/wallpaper/abstract-nord.png
Binary files differdiff --git a/modules/home/files/wallpaper/default.nix b/modules/home.legacy/files/wallpaper/default.nix
index 119df225..119df225 100644
--- a/modules/home/files/wallpaper/default.nix
+++ b/modules/home.legacy/files/wallpaper/default.nix
diff --git a/modules/home/impermanence/default.nix b/modules/home.legacy/impermanence/default.nix
index dcb60f3b..dcb60f3b 100644
--- a/modules/home/impermanence/default.nix
+++ b/modules/home.legacy/impermanence/default.nix
diff --git a/modules/home/pkgs/default.nix b/modules/home.legacy/pkgs/default.nix
index ad77c5fb..ad77c5fb 100644
--- a/modules/home/pkgs/default.nix
+++ b/modules/home.legacy/pkgs/default.nix
diff --git a/modules/home/wms/default.nix b/modules/home.legacy/wms/default.nix
index 610ea2f4..610ea2f4 100644
--- a/modules/home/wms/default.nix
+++ b/modules/home.legacy/wms/default.nix
diff --git a/modules/home/wms/plasma/default.nix b/modules/home.legacy/wms/plasma/default.nix
index f68ee272..f68ee272 100644
--- a/modules/home/wms/plasma/default.nix
+++ b/modules/home.legacy/wms/plasma/default.nix
diff --git a/modules/home/wms/river/default.nix b/modules/home.legacy/wms/river/default.nix
index 36a9ca74..36a9ca74 100644
--- a/modules/home/wms/river/default.nix
+++ b/modules/home.legacy/wms/river/default.nix
diff --git a/modules/home/wms/river/init.sh b/modules/home.legacy/wms/river/init.sh
index 06a2e2f4..06a2e2f4 100755
--- a/modules/home/wms/river/init.sh
+++ b/modules/home.legacy/wms/river/init.sh
diff --git a/modules/home/wms/river/res/keys.ron b/modules/home.legacy/wms/river/res/keys.ron
index a2bc0fa1..a2bc0fa1 100644
--- a/modules/home/wms/river/res/keys.ron
+++ b/modules/home.legacy/wms/river/res/keys.ron
diff --git a/modules/home/wms/river/res/moonlander.ron b/modules/home.legacy/wms/river/res/moonlander.ron
index 77ffa5c4..77ffa5c4 100644
--- a/modules/home/wms/river/res/moonlander.ron
+++ b/modules/home.legacy/wms/river/res/moonlander.ron
diff --git a/modules/home/wms/sway/default.nix b/modules/home.legacy/wms/sway/default.nix
index bb3ddb49..bb3ddb49 100644
--- a/modules/home/wms/sway/default.nix
+++ b/modules/home.legacy/wms/sway/default.nix
diff --git a/modules/system/default.nix b/modules/system/default.nix
deleted file mode 100644
index 85f8dfb3..00000000
--- a/modules/system/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{config, ...}: let
-  cfg = config.soispha;
-in {
-  imports = [
-    ./bluetooth
-    ./boot
-    ./cleanup
-    ./disks
-    ./documentation
-    ./fonts
-    ./hardware
-    ./home-manager
-    ./impermanence
-    ./laptop
-    ./locale
-    ./networking
-    ./nixpkgs
-    ./polkit
-    ./power
-    ./secrets
-    ./services
-    ./sound
-    ./tempfiles
-    ./users
-    ./version
-    ./waydroid
-  ];
-  options = {};
-  config = {};
-}
diff --git a/modules/system/services/default.nix b/modules/system/services/default.nix
deleted file mode 100644
index b5d500bd..00000000
--- a/modules/system/services/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{...}: {
-  imports = [
-    #./serverphone
-    ./adb
-    ./backup
-    ./dconf
-    ./fwupd
-    ./issue_file
-    ./nix
-    ./openssh
-    ./postgresql
-    ./printing
-    ./scanning
-    ./snapper
-    ./steam
-    ./swaylock
-    ./system_diff
-    ./xdg
-  ];
-}