105 files changed, 8 insertions, 8 deletions

diff --git a/features/user/cli/apps/btop.nix b/home-manager/features/cli/apps/btop.nix
index 5bb2499..5bb2499 100644
--- a/features/user/cli/apps/btop.nix
+++ b/home-manager/features/cli/apps/btop.nix
diff --git a/features/user/cli/apps/helix.nix b/home-manager/features/cli/apps/helix.nix
index a267b23..a267b23 100644
--- a/features/user/cli/apps/helix.nix
+++ b/home-manager/features/cli/apps/helix.nix
diff --git a/features/user/cli/apps/lazygit.nix b/home-manager/features/cli/apps/lazygit.nix
index 9d19a36..9d19a36 100644
--- a/features/user/cli/apps/lazygit.nix
+++ b/home-manager/features/cli/apps/lazygit.nix
diff --git a/features/user/cli/apps/zellij.nix b/home-manager/features/cli/apps/zellij.nix
index 8942771..8942771 100644
--- a/features/user/cli/apps/zellij.nix
+++ b/home-manager/features/cli/apps/zellij.nix
diff --git a/features/user/cli/bundles/go-env.nix b/home-manager/features/cli/bundles/go-env.nix
index 6e103a3..6e103a3 100644
--- a/features/user/cli/bundles/go-env.nix
+++ b/home-manager/features/cli/bundles/go-env.nix
diff --git a/features/user/cli/scripts/spiral/default.nix b/home-manager/features/cli/scripts/spiral/default.nix
index 780c207..780c207 100644
--- a/features/user/cli/scripts/spiral/default.nix
+++ b/home-manager/features/cli/scripts/spiral/default.nix
diff --git a/features/user/cli/scripts/spiral/plan.md b/home-manager/features/cli/scripts/spiral/plan.md
index adbcba0..adbcba0 100644
--- a/features/user/cli/scripts/spiral/plan.md
+++ b/home-manager/features/cli/scripts/spiral/plan.md
diff --git a/features/user/cli/scripts/spiral/spiral.nu b/home-manager/features/cli/scripts/spiral/spiral.nu
index 399dace..399dace 100755
--- a/features/user/cli/scripts/spiral/spiral.nu
+++ b/home-manager/features/cli/scripts/spiral/spiral.nu
diff --git a/features/user/cli/shells/nushell/completion.nu b/home-manager/features/cli/shells/nushell/completion.nu
index b25d387..b25d387 100644
--- a/features/user/cli/shells/nushell/completion.nu
+++ b/home-manager/features/cli/shells/nushell/completion.nu
diff --git a/features/user/cli/shells/nushell/default.nix b/home-manager/features/cli/shells/nushell/default.nix
index 7561fb1..7561fb1 100644
--- a/features/user/cli/shells/nushell/default.nix
+++ b/home-manager/features/cli/shells/nushell/default.nix
diff --git a/features/user/cli/shells/nushell/direnv-project-template/.envrc b/home-manager/features/cli/shells/nushell/direnv-project-template/.envrc
index 3550a30..3550a30 100644
--- a/features/user/cli/shells/nushell/direnv-project-template/.envrc
+++ b/home-manager/features/cli/shells/nushell/direnv-project-template/.envrc
diff --git a/features/user/cli/shells/nushell/direnv-project-template/.gitignore b/home-manager/features/cli/shells/nushell/direnv-project-template/.gitignore
index 92b2793..92b2793 100644
--- a/features/user/cli/shells/nushell/direnv-project-template/.gitignore
+++ b/home-manager/features/cli/shells/nushell/direnv-project-template/.gitignore
diff --git a/features/user/cli/shells/nushell/direnv-project-template/flake.nix b/home-manager/features/cli/shells/nushell/direnv-project-template/flake.nix
index 4bab14a..4bab14a 100644
--- a/features/user/cli/shells/nushell/direnv-project-template/flake.nix
+++ b/home-manager/features/cli/shells/nushell/direnv-project-template/flake.nix
diff --git a/features/user/cli/shells/nushell/prompt.nu b/home-manager/features/cli/shells/nushell/prompt.nu
index cfdd478..cfdd478 100644
--- a/features/user/cli/shells/nushell/prompt.nu
+++ b/home-manager/features/cli/shells/nushell/prompt.nu
diff --git a/features/user/cli/utils/git.nix b/home-manager/features/cli/utils/git.nix
index b827d7b..b827d7b 100644
--- a/features/user/cli/utils/git.nix
+++ b/home-manager/features/cli/utils/git.nix
diff --git a/features/user/cli/utils/pandoc.nix b/home-manager/features/cli/utils/pandoc.nix
index 899bd4b..899bd4b 100644
--- a/features/user/cli/utils/pandoc.nix
+++ b/home-manager/features/cli/utils/pandoc.nix
diff --git a/features/user/cli/utils/ssh.nix b/home-manager/features/cli/utils/ssh.nix
index f10d0b2..f10d0b2 100644
--- a/features/user/cli/utils/ssh.nix
+++ b/home-manager/features/cli/utils/ssh.nix
diff --git a/features/user/global/home-manager.nix b/home-manager/features/global/home-manager.nix
index 4be0d07..4be0d07 100644
--- a/features/user/global/home-manager.nix
+++ b/home-manager/features/global/home-manager.nix
diff --git a/features/user/global/nixpkgs.nix b/home-manager/features/global/nixpkgs.nix
index b19d5e0..b19d5e0 100644
--- a/features/user/global/nixpkgs.nix
+++ b/home-manager/features/global/nixpkgs.nix
diff --git a/features/user/gui/apps/foot.nix b/home-manager/features/gui/apps/foot.nix
index 321e7e8..321e7e8 100644
--- a/features/user/gui/apps/foot.nix
+++ b/home-manager/features/gui/apps/foot.nix
diff --git a/features/user/gui/apps/librewolf.nix b/home-manager/features/gui/apps/librewolf.nix
index fc6c2c4..fc6c2c4 100644
--- a/features/user/gui/apps/librewolf.nix
+++ b/home-manager/features/gui/apps/librewolf.nix
diff --git a/features/user/gui/apps/mpv.nix b/home-manager/features/gui/apps/mpv.nix
index 562d151..562d151 100644
--- a/features/user/gui/apps/mpv.nix
+++ b/home-manager/features/gui/apps/mpv.nix
diff --git a/features/user/gui/apps/obs.nix b/home-manager/features/gui/apps/obs.nix
index 916f11e..916f11e 100644
--- a/features/user/gui/apps/obs.nix
+++ b/home-manager/features/gui/apps/obs.nix
diff --git a/features/user/gui/apps/qutebrowser/default.nix b/home-manager/features/gui/apps/qutebrowser/default.nix
index e12c9f3..e12c9f3 100644
--- a/features/user/gui/apps/qutebrowser/default.nix
+++ b/home-manager/features/gui/apps/qutebrowser/default.nix
diff --git a/features/user/gui/apps/qutebrowser/scripts/yt-ad-skip.js b/home-manager/features/gui/apps/qutebrowser/scripts/yt-ad-skip.js
index 56336df..56336df 100644
--- a/features/user/gui/apps/qutebrowser/scripts/yt-ad-skip.js
+++ b/home-manager/features/gui/apps/qutebrowser/scripts/yt-ad-skip.js
diff --git a/features/user/gui/apps/qutebrowser/scripts/yt-dislike-viewer.js b/home-manager/features/gui/apps/qutebrowser/scripts/yt-dislike-viewer.js
index 50f3eff..50f3eff 100644
--- a/features/user/gui/apps/qutebrowser/scripts/yt-dislike-viewer.js
+++ b/home-manager/features/gui/apps/qutebrowser/scripts/yt-dislike-viewer.js
diff --git a/features/user/gui/apps/qutebrowser/scripts/yt-shorts-blocker.js b/home-manager/features/gui/apps/qutebrowser/scripts/yt-shorts-blocker.js
index 383fec3..383fec3 100644
--- a/features/user/gui/apps/qutebrowser/scripts/yt-shorts-blocker.js
+++ b/home-manager/features/gui/apps/qutebrowser/scripts/yt-shorts-blocker.js
diff --git a/features/user/gui/apps/qutebrowser/scripts/yt-sponsor-skip.js b/home-manager/features/gui/apps/qutebrowser/scripts/yt-sponsor-skip.js
index 3779cbf..3779cbf 100644
--- a/features/user/gui/apps/qutebrowser/scripts/yt-sponsor-skip.js
+++ b/home-manager/features/gui/apps/qutebrowser/scripts/yt-sponsor-skip.js
diff --git a/features/user/gui/apps/vesktop.nix b/home-manager/features/gui/apps/vesktop.nix
index f28d719..f28d719 100644
--- a/features/user/gui/apps/vesktop.nix
+++ b/home-manager/features/gui/apps/vesktop.nix
diff --git a/features/user/gui/bundles/video.nix b/home-manager/features/gui/bundles/video.nix
index 491bf21..491bf21 100644
--- a/features/user/gui/bundles/video.nix
+++ b/home-manager/features/gui/bundles/video.nix
diff --git a/features/user/gui/desktops/niri/default.nix b/home-manager/features/gui/desktops/niri/default.nix
index 6304c66..6304c66 100755
--- a/features/user/gui/desktops/niri/default.nix
+++ b/home-manager/features/gui/desktops/niri/default.nix
diff --git a/features/user/gui/desktops/niri/keybinds.nix b/home-manager/features/gui/desktops/niri/keybinds.nix
index 56324bc..56324bc 100644
--- a/features/user/gui/desktops/niri/keybinds.nix
+++ b/home-manager/features/gui/desktops/niri/keybinds.nix
diff --git a/features/user/gui/desktops/niri/parts/fuzzel.nix b/home-manager/features/gui/desktops/niri/parts/fuzzel.nix
index e939f88..e939f88 100755
--- a/features/user/gui/desktops/niri/parts/fuzzel.nix
+++ b/home-manager/features/gui/desktops/niri/parts/fuzzel.nix
diff --git a/features/user/gui/desktops/niri/parts/hyprlock.nix b/home-manager/features/gui/desktops/niri/parts/hyprlock.nix
index f8a50e3..f8a50e3 100755
--- a/features/user/gui/desktops/niri/parts/hyprlock.nix
+++ b/home-manager/features/gui/desktops/niri/parts/hyprlock.nix
diff --git a/features/user/gui/desktops/niri/parts/mako.nix b/home-manager/features/gui/desktops/niri/parts/mako.nix
index e5bc3b8..e5bc3b8 100755
--- a/features/user/gui/desktops/niri/parts/mako.nix
+++ b/home-manager/features/gui/desktops/niri/parts/mako.nix
diff --git a/features/user/gui/desktops/niri/parts/quickshell/.envrc b/home-manager/features/gui/desktops/niri/parts/quickshell/.envrc
index 3550a30..3550a30 100644
--- a/features/user/gui/desktops/niri/parts/quickshell/.envrc
+++ b/home-manager/features/gui/desktops/niri/parts/quickshell/.envrc
diff --git a/features/user/gui/desktops/niri/parts/quickshell/flake.lock b/home-manager/features/gui/desktops/niri/parts/quickshell/flake.lock
index 29f5851..29f5851 100644
--- a/features/user/gui/desktops/niri/parts/quickshell/flake.lock
+++ b/home-manager/features/gui/desktops/niri/parts/quickshell/flake.lock
diff --git a/features/user/gui/desktops/niri/parts/quickshell/flake.nix b/home-manager/features/gui/desktops/niri/parts/quickshell/flake.nix
index 2122f1f..2122f1f 100644
--- a/features/user/gui/desktops/niri/parts/quickshell/flake.nix
+++ b/home-manager/features/gui/desktops/niri/parts/quickshell/flake.nix
diff --git a/features/user/gui/desktops/niri/parts/selectors.nix b/home-manager/features/gui/desktops/niri/parts/selectors.nix
index 1adc917..1adc917 100644
--- a/features/user/gui/desktops/niri/parts/selectors.nix
+++ b/home-manager/features/gui/desktops/niri/parts/selectors.nix
diff --git a/features/user/gui/desktops/niri/parts/swww.nix b/home-manager/features/gui/desktops/niri/parts/swww.nix
index dca163b..dca163b 100755
--- a/features/user/gui/desktops/niri/parts/swww.nix
+++ b/home-manager/features/gui/desktops/niri/parts/swww.nix
diff --git a/features/user/gui/desktops/niri/parts/waybar.nix b/home-manager/features/gui/desktops/niri/parts/waybar.nix
index 7535b0c..7535b0c 100755
--- a/features/user/gui/desktops/niri/parts/waybar.nix
+++ b/home-manager/features/gui/desktops/niri/parts/waybar.nix
diff --git a/features/user/gui/desktops/niri/parts/wl-kbptr.nix b/home-manager/features/gui/desktops/niri/parts/wl-kbptr.nix
index 6f6ed56..6f6ed56 100644
--- a/features/user/gui/desktops/niri/parts/wl-kbptr.nix
+++ b/home-manager/features/gui/desktops/niri/parts/wl-kbptr.nix
diff --git a/features/user/gui/desktops/niri/parts/wluma.nix b/home-manager/features/gui/desktops/niri/parts/wluma.nix
index 21b9edc..21b9edc 100644
--- a/features/user/gui/desktops/niri/parts/wluma.nix
+++ b/home-manager/features/gui/desktops/niri/parts/wluma.nix
diff --git a/features/user/gui/desktops/niri/readme.md b/home-manager/features/gui/desktops/niri/readme.md
index a70f77d..a70f77d 100644
--- a/features/user/gui/desktops/niri/readme.md
+++ b/home-manager/features/gui/desktops/niri/readme.md
diff --git a/features/user/services/flatpak.nix b/home-manager/features/services/flatpak.nix
index 37225aa..37225aa 100644
--- a/features/user/services/flatpak.nix
+++ b/home-manager/features/services/flatpak.nix
diff --git a/features/user/services/udiskie.nix b/home-manager/features/services/udiskie.nix
index 9b79d11..9b79d11 100644
--- a/features/user/services/udiskie.nix
+++ b/home-manager/features/services/udiskie.nix
diff --git a/features/user/services/wluma.nix b/home-manager/features/services/wluma.nix
index 7c9369e..7c9369e 100644
--- a/features/user/services/wluma.nix
+++ b/home-manager/features/services/wluma.nix
diff --git a/modules/user/aesthetics/default.nix b/home-manager/modules/aesthetics/default.nix
index c49a198..c49a198 100644
--- a/modules/user/aesthetics/default.nix
+++ b/home-manager/modules/aesthetics/default.nix
diff --git a/modules/user/aesthetics/readme.md b/home-manager/modules/aesthetics/readme.md
index 75588a2..75588a2 100644
--- a/modules/user/aesthetics/readme.md
+++ b/home-manager/modules/aesthetics/readme.md
diff --git a/modules/user/aesthetics/targets/default.nix b/home-manager/modules/aesthetics/targets/default.nix
index 7dba76d..7dba76d 100644
--- a/modules/user/aesthetics/targets/default.nix
+++ b/home-manager/modules/aesthetics/targets/default.nix
diff --git a/modules/user/aesthetics/targets/foot.nix b/home-manager/modules/aesthetics/targets/foot.nix
index c6c2283..c6c2283 100644
--- a/modules/user/aesthetics/targets/foot.nix
+++ b/home-manager/modules/aesthetics/targets/foot.nix
diff --git a/modules/user/aesthetics/targets/gtk.nix b/home-manager/modules/aesthetics/targets/gtk.nix
index 795365d..795365d 100644
--- a/modules/user/aesthetics/targets/gtk.nix
+++ b/home-manager/modules/aesthetics/targets/gtk.nix
diff --git a/modules/user/aesthetics/targets/helix.nix b/home-manager/modules/aesthetics/targets/helix.nix
index dde557e..dde557e 100644
--- a/modules/user/aesthetics/targets/helix.nix
+++ b/home-manager/modules/aesthetics/targets/helix.nix
diff --git a/modules/user/aesthetics/targets/mako.nix b/home-manager/modules/aesthetics/targets/mako.nix
index 2ade32e..2ade32e 100644
--- a/modules/user/aesthetics/targets/mako.nix
+++ b/home-manager/modules/aesthetics/targets/mako.nix
diff --git a/modules/user/aesthetics/targets/qutebrowser.nix b/home-manager/modules/aesthetics/targets/qutebrowser.nix
index ef7f17d..ef7f17d 100644
--- a/modules/user/aesthetics/targets/qutebrowser.nix
+++ b/home-manager/modules/aesthetics/targets/qutebrowser.nix
diff --git a/modules/user/aesthetics/targets/vesktop.nix b/home-manager/modules/aesthetics/targets/vesktop.nix
index 968df1a..968df1a 100644
--- a/modules/user/aesthetics/targets/vesktop.nix
+++ b/home-manager/modules/aesthetics/targets/vesktop.nix
diff --git a/modules/user/aesthetics/targets/zellij.nix b/home-manager/modules/aesthetics/targets/zellij.nix
index cefd8ab..cefd8ab 100644
--- a/modules/user/aesthetics/targets/zellij.nix
+++ b/home-manager/modules/aesthetics/targets/zellij.nix
diff --git a/modules/user/aesthetics/themes/default.nix b/home-manager/modules/aesthetics/themes/default.nix
index cc5ebdb..cc5ebdb 100644
--- a/modules/user/aesthetics/themes/default.nix
+++ b/home-manager/modules/aesthetics/themes/default.nix
diff --git a/modules/user/aesthetics/themes/oxocarbon/default.nix b/home-manager/modules/aesthetics/themes/oxocarbon/default.nix
index 2c6ee6e..2c6ee6e 100644
--- a/modules/user/aesthetics/themes/oxocarbon/default.nix
+++ b/home-manager/modules/aesthetics/themes/oxocarbon/default.nix
diff --git a/modules/user/aesthetics/themes/oxocarbon/helix-theme.toml b/home-manager/modules/aesthetics/themes/oxocarbon/helix-theme.toml
index 8cf3c49..8cf3c49 100644
--- a/modules/user/aesthetics/themes/oxocarbon/helix-theme.toml
+++ b/home-manager/modules/aesthetics/themes/oxocarbon/helix-theme.toml
diff --git a/modules/user/default-apps.nix b/home-manager/modules/default-apps.nix
index 7ec2b16..7ec2b16 100644
--- a/modules/user/default-apps.nix
+++ b/home-manager/modules/default-apps.nix
diff --git a/modules/user/default.nix b/home-manager/modules/default.nix
index 104148e..104148e 100644
--- a/modules/user/default.nix
+++ b/home-manager/modules/default.nix
diff --git a/users/ideapad-laptop/lucas.nix b/home-manager/users/ideapad-laptop/lucas.nix
index e5caa58..e5caa58 100644
--- a/users/ideapad-laptop/lucas.nix
+++ b/home-manager/users/ideapad-laptop/lucas.nix
diff --git a/users/nzxt-desktop/culsans.nix b/home-manager/users/nzxt-desktop/culsans.nix
index b13ba17..b13ba17 100644
--- a/users/nzxt-desktop/culsans.nix
+++ b/home-manager/users/nzxt-desktop/culsans.nix
diff --git a/users/prodesk-server/server.nix b/home-manager/users/prodesk-server/server.nix
index e69de29..e69de29 100644
--- a/users/prodesk-server/server.nix
+++ b/home-manager/users/prodesk-server/server.nix
diff --git a/users/steam-deck/culsans.nix b/home-manager/users/steam-deck/culsans.nix
index 984c272..984c272 100644
--- a/users/steam-deck/culsans.nix
+++ b/home-manager/users/steam-deck/culsans.nix
diff --git a/users/thinkpad-laptop/lucas.nix b/home-manager/users/thinkpad-laptop/lucas.nix
index bd6ba38..bd6ba38 100644
--- a/users/thinkpad-laptop/lucas.nix
+++ b/home-manager/users/thinkpad-laptop/lucas.nix
diff --git a/lib/helper.nix b/lib/helper.nix
index d3ccc1c..def0ac7 100644
--- a/lib/helper.nix
+++ b/lib/helper.nix
@@ -36,20 +36,20 @@ in rec {
   umport = (import ./umport.nix {inherit (inputs.nixpkgs) lib;}).umport;
 
   # Configuration Buildables
-  mkSystem = system: architecture: (
+  mkNixosSystem = system: architecture: (
     inputs.nixpkgs.lib.nixosSystem {
       specialArgs = {
         inherit inputs helper;
       };
       modules =
         [
-          ../systems/${system}/system.nix
-          ../modules/system
+          ../nixos/systems/${system}/system.nix
+          ../nixos/modules
           customPackagesOverlay
         ]
         ++ umport {
           paths = [
-            ../features/system
+            ../nixos/features
           ];
           recursive = true;
         };
@@ -57,7 +57,7 @@ in rec {
     }
   );
 
-  mkHome = user: system: architecture: (
+  mkHomeManagerUser = user: system: architecture: (
     inputs.home-manager.lib.homeManagerConfiguration {
       pkgs = pkgsFor architecture;
       extraSpecialArgs = {
@@ -65,13 +65,13 @@ in rec {
       };
       modules =
         [
-          ../users/${system}/${user}.nix
-          ../modules/user
+          ../home-manager/users/${system}/${user}.nix
+          ../home-manager/modules
           customPackagesOverlay
         ]
         ++ umport {
           paths = [
-            ../features/user
+            ../home-manager/features
           ];
           recursive = true;
         };
diff --git a/features/system/cli/shells/nushell.nix b/nixos/features/cli/shells/nushell.nix
index 0974e9a..0974e9a 100644
--- a/features/system/cli/shells/nushell.nix
+++ b/nixos/features/cli/shells/nushell.nix
diff --git a/features/system/cli/utils/nh.nix b/nixos/features/cli/utils/nh.nix
index e34157e..e34157e 100644
--- a/features/system/cli/utils/nh.nix
+++ b/nixos/features/cli/utils/nh.nix
diff --git a/features/system/global/agenix.nix b/nixos/features/global/agenix.nix
index f232886..f232886 100644
--- a/features/system/global/agenix.nix
+++ b/nixos/features/global/agenix.nix
diff --git a/features/system/global/nix.nix b/nixos/features/global/nix.nix
index a0ece02..a0ece02 100644
--- a/features/system/global/nix.nix
+++ b/nixos/features/global/nix.nix
diff --git a/features/system/global/noxterm.nix b/nixos/features/global/noxterm.nix
index 44c0917..44c0917 100644
--- a/features/system/global/noxterm.nix
+++ b/nixos/features/global/noxterm.nix
diff --git a/features/system/gui/apps/steam.nix b/nixos/features/gui/apps/steam.nix
index 046b814..046b814 100644
--- a/features/system/gui/apps/steam.nix
+++ b/nixos/features/gui/apps/steam.nix
diff --git a/features/system/gui/apps/virtualbox.nix b/nixos/features/gui/apps/virtualbox.nix
index 0b633c7..0b633c7 100644
--- a/features/system/gui/apps/virtualbox.nix
+++ b/nixos/features/gui/apps/virtualbox.nix
diff --git a/features/system/gui/apps/vmware.nix b/nixos/features/gui/apps/vmware.nix
index 4da3f09..4da3f09 100644
--- a/features/system/gui/apps/vmware.nix
+++ b/nixos/features/gui/apps/vmware.nix
diff --git a/features/system/gui/desktops/niri.nix b/nixos/features/gui/desktops/niri.nix
index c68a4b6..c68a4b6 100644
--- a/features/system/gui/desktops/niri.nix
+++ b/nixos/features/gui/desktops/niri.nix
diff --git a/features/system/server/cloud/syncthing.nix b/nixos/features/server/cloud/syncthing.nix
index 0967ef4..0967ef4 100644
--- a/features/system/server/cloud/syncthing.nix
+++ b/nixos/features/server/cloud/syncthing.nix
diff --git a/features/system/server/core/ssh.nix b/nixos/features/server/core/ssh.nix
index 16fec48..16fec48 100644
--- a/features/system/server/core/ssh.nix
+++ b/nixos/features/server/core/ssh.nix
diff --git a/features/system/server/development/git-server.nix b/nixos/features/server/development/git-server.nix
index 0967ef4..0967ef4 100644
--- a/features/system/server/development/git-server.nix
+++ b/nixos/features/server/development/git-server.nix
diff --git a/features/system/server/gaming/minecraft.nix b/nixos/features/server/gaming/minecraft.nix
index 0967ef4..0967ef4 100644
--- a/features/system/server/gaming/minecraft.nix
+++ b/nixos/features/server/gaming/minecraft.nix
diff --git a/features/system/server/media/calibre.nix b/nixos/features/server/media/calibre.nix
index 0967ef4..0967ef4 100644
--- a/features/system/server/media/calibre.nix
+++ b/nixos/features/server/media/calibre.nix
diff --git a/features/system/server/media/invidious.nix b/nixos/features/server/media/invidious.nix
index 0967ef4..0967ef4 100644
--- a/features/system/server/media/invidious.nix
+++ b/nixos/features/server/media/invidious.nix
diff --git a/features/system/services/bundles/printing.nix b/nixos/features/services/bundles/printing.nix
index ea255be..ea255be 100644
--- a/features/system/services/bundles/printing.nix
+++ b/nixos/features/services/bundles/printing.nix
diff --git a/features/system/services/core/systemd-boot.nix b/nixos/features/services/core/systemd-boot.nix
index 2826f1b..2826f1b 100644
--- a/features/system/services/core/systemd-boot.nix
+++ b/nixos/features/services/core/systemd-boot.nix
diff --git a/features/system/services/extra/plymouth.nix b/nixos/features/services/extra/plymouth.nix
index 07f00cd..07f00cd 100644
--- a/features/system/services/extra/plymouth.nix
+++ b/nixos/features/services/extra/plymouth.nix
diff --git a/features/system/services/extra/sddm.nix b/nixos/features/services/extra/sddm.nix
index f266575..f266575 100644
--- a/features/system/services/extra/sddm.nix
+++ b/nixos/features/services/extra/sddm.nix
diff --git a/features/system/services/extra/ssh.nix b/nixos/features/services/extra/ssh.nix
index d1cee26..d1cee26 100644
--- a/features/system/services/extra/ssh.nix
+++ b/nixos/features/services/extra/ssh.nix
diff --git a/features/system/services/extra/syncthing-client.nix b/nixos/features/services/extra/syncthing-client.nix
index 6d3d3d3..6d3d3d3 100644
--- a/features/system/services/extra/syncthing-client.nix
+++ b/nixos/features/services/extra/syncthing-client.nix
diff --git a/features/system/services/extra/udisks2.nix b/nixos/features/services/extra/udisks2.nix
index 2ec2fa4..2ec2fa4 100644
--- a/features/system/services/extra/udisks2.nix
+++ b/nixos/features/services/extra/udisks2.nix
diff --git a/features/system/services/hardware/bluetooth.nix b/nixos/features/services/hardware/bluetooth.nix
index a9829ac..a9829ac 100644
--- a/features/system/services/hardware/bluetooth.nix
+++ b/nixos/features/services/hardware/bluetooth.nix
diff --git a/features/system/services/hardware/iwd.nix b/nixos/features/services/hardware/iwd.nix
index c2394bc..c2394bc 100644
--- a/features/system/services/hardware/iwd.nix
+++ b/nixos/features/services/hardware/iwd.nix
diff --git a/features/system/services/hardware/networkmanager.nix b/nixos/features/services/hardware/networkmanager.nix
index 49cc7bc..49cc7bc 100644
--- a/features/system/services/hardware/networkmanager.nix
+++ b/nixos/features/services/hardware/networkmanager.nix
diff --git a/features/system/services/hardware/pipewire.nix b/nixos/features/services/hardware/pipewire.nix
index f36a0e9..f36a0e9 100644
--- a/features/system/services/hardware/pipewire.nix
+++ b/nixos/features/services/hardware/pipewire.nix
diff --git a/modules/system/default.nix b/nixos/modules/default.nix
index cd7e8d6..cd7e8d6 100644
--- a/modules/system/default.nix
+++ b/nixos/modules/default.nix
diff --git a/modules/system/general-settings/default.nix b/nixos/modules/general-settings/default.nix
index 0001f5f..0001f5f 100644
--- a/modules/system/general-settings/default.nix
+++ b/nixos/modules/general-settings/default.nix
diff --git a/systems/ideapad-laptop/hardware.nix b/nixos/systems/ideapad-laptop/hardware.nix
index 1065266..1065266 100644
--- a/systems/ideapad-laptop/hardware.nix
+++ b/nixos/systems/ideapad-laptop/hardware.nix
diff --git a/systems/ideapad-laptop/system.nix b/nixos/systems/ideapad-laptop/system.nix
index 9067924..9067924 100644
--- a/systems/ideapad-laptop/system.nix
+++ b/nixos/systems/ideapad-laptop/system.nix
diff --git a/systems/nzxt-desktop/hardware.nix b/nixos/systems/nzxt-desktop/hardware.nix
index cf6f399..cf6f399 100644
--- a/systems/nzxt-desktop/hardware.nix
+++ b/nixos/systems/nzxt-desktop/hardware.nix
diff --git a/systems/nzxt-desktop/system.nix b/nixos/systems/nzxt-desktop/system.nix
index db42aa1..db42aa1 100644
--- a/systems/nzxt-desktop/system.nix
+++ b/nixos/systems/nzxt-desktop/system.nix
diff --git a/systems/prodesk-server/hardware.nix b/nixos/systems/prodesk-server/hardware.nix
index e69de29..e69de29 100644
--- a/systems/prodesk-server/hardware.nix
+++ b/nixos/systems/prodesk-server/hardware.nix
diff --git a/systems/prodesk-server/system.nix b/nixos/systems/prodesk-server/system.nix
index e69de29..e69de29 100644
--- a/systems/prodesk-server/system.nix
+++ b/nixos/systems/prodesk-server/system.nix
diff --git a/systems/steam-deck/system.nix b/nixos/systems/steam-deck/system.nix
index 515e0f2..515e0f2 100644
--- a/systems/steam-deck/system.nix
+++ b/nixos/systems/steam-deck/system.nix
diff --git a/systems/thinkpad-laptop/hardware.nix b/nixos/systems/thinkpad-laptop/hardware.nix
index b0470aa..b0470aa 100644
--- a/systems/thinkpad-laptop/hardware.nix
+++ b/nixos/systems/thinkpad-laptop/hardware.nix
diff --git a/systems/thinkpad-laptop/system.nix b/nixos/systems/thinkpad-laptop/system.nix
index f1d227f..f1d227f 100644
--- a/systems/thinkpad-laptop/system.nix
+++ b/nixos/systems/thinkpad-laptop/system.nix