refactor: more sane profile structure

Swarsel · Jan 1, 2025 · 2257a42 · 2257a42
1 parent a73f0e8
commit 2257a42
Show file tree

Hide file tree

Showing 123 changed files with 204 additions and 347 deletions.
diff --git a/SwarselSystems.org b/SwarselSystems.org
diff --git a/flake.nix b/flake.nix
@@ -100,7 +100,7 @@
         inputs.sops-nix.nixosModules.sops
         inputs.nswitch-rcm-nix.nixosModules.nswitch-rcm
         inputs.nix-topology.nixosModules.default
-        ./profiles/common/nixos
+        ./profiles/nixos/common
       ];
 
       # Home-Manager modules wanted on non-NixOS systems
@@ -112,7 +112,7 @@
       mixedModules = [
         inputs.sops-nix.homeManagerModules.sops
         inputs.nix-index-database.hmModules.nix-index
-        ./profiles/common/home
+        ./profiles/home/common
       ];
 
     in

diff --git a/hosts/darwin/nbm-imba-166/default.nix b/hosts/darwin/nbm-imba-166/default.nix
@@ -4,12 +4,12 @@ let
 in
 {
   imports = [
-    "${profilesPath}/darwin/common/nixos"
+    "${profilesPath}/darwin/nixos/common"
 
     inputs.home-manager.darwinModules.home-manager
     {
       home-manager.users."leon.schwarzaeugl".imports = [
-        "${profilesPath}/darwin/common/home"
+        "${profilesPath}/darwin/home"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
   ] ++ (builtins.attrValues outputs.nixosModules);

diff --git a/hosts/nixos/chaostheatre/default.nix b/hosts/nixos/chaostheatre/default.nix
@@ -8,7 +8,7 @@ in
 
     ./hardware-configuration.nix
 
-    "${profilesPath}/optional/nixos/autologin.nix"
+    "${profilesPath}/nixos/optional/autologin.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {

diff --git a/hosts/nixos/iso/default.nix b/hosts/nixos/iso/default.nix
@@ -18,7 +18,7 @@ in
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = [
-        "${self}/profiles/common/home/settings.nix"
+        "${self}/profiles/home/common/settings.nix"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
   ];

diff --git a/hosts/nixos/nbl-imba-2/default.nix b/hosts/nixos/nbl-imba-2/default.nix
@@ -14,18 +14,18 @@ in
     ./hardware-configuration.nix
     ./disk-config.nix
 
-    "${profilesPath}/optional/nixos/virtualbox.nix"
-    # "${profilesPath}/optional/nixos/vmware.nix"
-    "${profilesPath}/optional/nixos/autologin.nix"
-    "${profilesPath}/optional/nixos/nswitch-rcm.nix"
-    "${profilesPath}/optional/nixos/gaming.nix"
-    "${profilesPath}/optional/nixos/work.nix"
+    "${profilesPath}/nixos/optional/virtualbox.nix"
+    # "${profilesPath}/nixos/optional/vmware.nix"
+    "${profilesPath}/nixos/optional/autologin.nix"
+    "${profilesPath}/nixos/optional/nswitch-rcm.nix"
+    "${profilesPath}/nixos/optional/gaming.nix"
+    "${profilesPath}/nixos/optional/work.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = outputs.mixedModules ++ [
-        "${profilesPath}/optional/home/gaming.nix"
-        "${profilesPath}/optional/home/work.nix"
+        "${profilesPath}/home/optional/gaming.nix"
+        "${profilesPath}/home/optional/work.nix"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
   ] ++ (builtins.attrValues outputs.nixosModules);

diff --git a/hosts/nixos/sync/default.nix b/hosts/nixos/sync/default.nix
@@ -6,13 +6,13 @@ in
   imports = [
 
     inputs.sops-nix.nixosModules.sops
-    "${profilesPath}/server/nixos"
+    "${profilesPath}/nixos/server"
     ./hardware-configuration.nix
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = [
-        "${profilesPath}/server/home"
+        "${profilesPath}/home/server"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
 

diff --git a/hosts/nixos/toto/default.nix b/hosts/nixos/toto/default.nix
@@ -16,23 +16,23 @@ in
     inputs.impermanence.nixosModules.impermanence
     inputs.lanzaboote.nixosModules.lanzaboote
 
-    "${profilesPath}/optional/nixos/autologin.nix"
-    "${profilesPath}/common/nixos/settings.nix"
-    "${profilesPath}/common/nixos/home-manager.nix"
-    "${profilesPath}/common/nixos/xserver.nix"
-    "${profilesPath}/common/nixos/users.nix"
-    "${profilesPath}/common/nixos/impermanence.nix"
-    "${profilesPath}/common/nixos/lanzaboote.nix"
-    "${profilesPath}/common/nixos/sops.nix"
-    "${profilesPath}/server/nixos/ssh.nix"
+    "${profilesPath}/nixos/optional/autologin.nix"
+    "${profilesPath}/nixos/common/settings.nix"
+    "${profilesPath}/nixos/common/home-manager.nix"
+    "${profilesPath}/nixos/common/xserver.nix"
+    "${profilesPath}/nixos/common/users.nix"
+    "${profilesPath}/nixos/common/impermanence.nix"
+    "${profilesPath}/nixos/common/lanzaboote.nix"
+    "${profilesPath}/nixos/common/sops.nix"
+    "${profilesPath}/nixos/server/ssh.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = [
         inputs.sops-nix.homeManagerModules.sops
-        "${profilesPath}/common/home/settings.nix"
-        "${profilesPath}/common/home/sops.nix"
-        "${profilesPath}/common/home/ssh.nix"
+        "${profilesPath}/home/common/settings.nix"
+        "${profilesPath}/home/common/sops.nix"
+        "${profilesPath}/home/common/ssh.nix"
 
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }

diff --git a/hosts/nixos/winters/default.nix b/hosts/nixos/winters/default.nix
@@ -9,13 +9,13 @@ in
 
     ./hardware-configuration.nix
 
-    "${profilesPath}/optional/nixos/autologin.nix"
-    "${profilesPath}/server/nixos"
+    "${profilesPath}/nixos/optional/autologin.nix"
+    "${profilesPath}/nixos/server"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = [
-        "${profilesPath}/server/home"
+        "${profilesPath}/home/server"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
 

diff --git a/profiles/common/disks/btrfs-luks.nix b/profiles/common/disks/btrfs-luks.nix
diff --git a/profiles/common/nixos/emacs.nix b/profiles/common/nixos/emacs.nix
diff --git a/profiles/common/nixos/safeeyes.nix b/profiles/common/nixos/safeeyes.nix
diff --git a/profiles/darwin/home/default.nix b/profiles/darwin/home/default.nix
@@ -4,6 +4,6 @@ let
 in
 {
   imports = [
-    "${profilesPath}/common/home/settings.nix"
+    "${profilesPath}/home/common/settings.nix"
   ];
 }
diff --git a/profiles/common/home/custom-packages.nix → profiles/home/common/custom-packages.nix b/profiles/common/home/custom-packages.nix → profiles/home/common/custom-packages.nix
diff --git a/profiles/common/home/default.nix → profiles/home/common/default.nix b/profiles/common/home/default.nix → profiles/home/common/default.nix
diff --git a/profiles/common/home/desktop.nix → profiles/home/common/desktop.nix b/profiles/common/home/desktop.nix → profiles/home/common/desktop.nix
diff --git a/profiles/common/home/direnv.nix → profiles/home/common/direnv.nix b/profiles/common/home/direnv.nix → profiles/home/common/direnv.nix
diff --git a/profiles/common/home/emacs.nix → profiles/home/common/emacs.nix b/profiles/common/home/emacs.nix → profiles/home/common/emacs.nix
diff --git a/profiles/common/home/env.nix → profiles/home/common/env.nix b/profiles/common/home/env.nix → profiles/home/common/env.nix
diff --git a/profiles/common/home/eza.nix → profiles/home/common/eza.nix b/profiles/common/home/eza.nix → profiles/home/common/eza.nix
diff --git a/profiles/common/home/firefox.nix → profiles/home/common/firefox.nix b/profiles/common/home/firefox.nix → profiles/home/common/firefox.nix
diff --git a/profiles/common/home/fuzzel.nix → profiles/home/common/fuzzel.nix b/profiles/common/home/fuzzel.nix → profiles/home/common/fuzzel.nix
diff --git a/profiles/common/home/gammastep.nix → profiles/home/common/gammastep.nix b/profiles/common/home/gammastep.nix → profiles/home/common/gammastep.nix
diff --git a/profiles/common/home/git.nix → profiles/home/common/git.nix b/profiles/common/home/git.nix → profiles/home/common/git.nix
diff --git a/profiles/common/home/gnome-keyring.nix → profiles/home/common/gnome-keyring.nix b/profiles/common/home/gnome-keyring.nix → profiles/home/common/gnome-keyring.nix
diff --git a/profiles/common/home/gpg-agent.nix → profiles/home/common/gpg-agent.nix b/profiles/common/home/gpg-agent.nix → profiles/home/common/gpg-agent.nix
diff --git a/profiles/common/home/kdeconnect.nix → profiles/home/common/kdeconnect.nix b/profiles/common/home/kdeconnect.nix → profiles/home/common/kdeconnect.nix
diff --git a/profiles/common/home/kitty.nix → profiles/home/common/kitty.nix b/profiles/common/home/kitty.nix → profiles/home/common/kitty.nix
diff --git a/profiles/common/home/mail.nix → profiles/home/common/mail.nix b/profiles/common/home/mail.nix → profiles/home/common/mail.nix
diff --git a/profiles/common/home/mako.nix → profiles/home/common/mako.nix b/profiles/common/home/mako.nix → profiles/home/common/mako.nix
diff --git a/profiles/common/home/nix-index.nix → profiles/home/common/nix-index.nix b/profiles/common/home/nix-index.nix → profiles/home/common/nix-index.nix
diff --git a/profiles/common/home/packages.nix → profiles/home/common/packages.nix b/profiles/common/home/packages.nix → profiles/home/common/packages.nix
diff --git a/profiles/common/home/password-store.nix → profiles/home/common/password-store.nix b/profiles/common/home/password-store.nix → profiles/home/common/password-store.nix
diff --git a/profiles/common/home/programs.nix → profiles/home/common/programs.nix b/profiles/common/home/programs.nix → profiles/home/common/programs.nix
diff --git a/profiles/common/home/settings.nix → profiles/home/common/settings.nix b/profiles/common/home/settings.nix → profiles/home/common/settings.nix
diff --git a/profiles/common/home/sops.nix → profiles/home/common/sops.nix b/profiles/common/home/sops.nix → profiles/home/common/sops.nix
diff --git a/profiles/common/home/ssh.nix → profiles/home/common/ssh.nix b/profiles/common/home/ssh.nix → profiles/home/common/ssh.nix
diff --git a/profiles/common/home/starship.nix → profiles/home/common/starship.nix b/profiles/common/home/starship.nix → profiles/home/common/starship.nix
diff --git a/profiles/common/home/stylix.nix → profiles/home/common/stylix.nix b/profiles/common/home/stylix.nix → profiles/home/common/stylix.nix
diff --git a/profiles/common/home/sway.nix → profiles/home/common/sway.nix b/profiles/common/home/sway.nix → profiles/home/common/sway.nix
diff --git a/profiles/common/home/symlink.nix → profiles/home/common/symlink.nix b/profiles/common/home/symlink.nix → profiles/home/common/symlink.nix
diff --git a/profiles/common/home/tmux.nix → profiles/home/common/tmux.nix b/profiles/common/home/tmux.nix → profiles/home/common/tmux.nix
diff --git a/profiles/common/home/waybar.nix → profiles/home/common/waybar.nix b/profiles/common/home/waybar.nix → profiles/home/common/waybar.nix
diff --git a/...es/common/home/yubikey-touch-detector.nix → ...es/home/common/yubikey-touch-detector.nix b/...es/common/home/yubikey-touch-detector.nix → ...es/home/common/yubikey-touch-detector.nix
diff --git a/profiles/common/home/zellij.nix → profiles/home/common/zellij.nix b/profiles/common/home/zellij.nix → profiles/home/common/zellij.nix
diff --git a/profiles/common/home/zsh.nix → profiles/home/common/zsh.nix b/profiles/common/home/zsh.nix → profiles/home/common/zsh.nix
diff --git a/profiles/optional/home/gaming.nix → profiles/home/optional/gaming.nix b/profiles/optional/home/gaming.nix → profiles/home/optional/gaming.nix
diff --git a/profiles/optional/home/work.nix → profiles/home/optional/work.nix b/profiles/optional/home/work.nix → profiles/home/optional/work.nix
diff --git a/profiles/server/home/default.nix → profiles/home/server/default.nix b/profiles/server/home/default.nix → profiles/home/server/default.nix
@@ -4,7 +4,7 @@ let
 in
 {
   imports = [
-    "${profilesPath}/common/home/settings.nix"
+    "${profilesPath}/home/common/settings.nix"
     ./symlink.nix
   ];
 }
diff --git a/profiles/server/home/symlink.nix → profiles/home/server/symlink.nix b/profiles/server/home/symlink.nix → profiles/home/server/symlink.nix
diff --git a/profiles/common/nixos/blueman.nix → profiles/nixos/common/blueman.nix b/profiles/common/nixos/blueman.nix → profiles/nixos/common/blueman.nix
diff --git a/profiles/common/nixos/default.nix → profiles/nixos/common/default.nix b/profiles/common/nixos/default.nix → profiles/nixos/common/default.nix
diff --git a/profiles/common/nixos/distrobox.nix → profiles/nixos/common/distrobox.nix b/profiles/common/nixos/distrobox.nix → profiles/nixos/common/distrobox.nix
diff --git a/profiles/common/nixos/env.nix → profiles/nixos/common/env.nix b/profiles/common/nixos/env.nix → profiles/nixos/common/env.nix
diff --git a/profiles/common/nixos/gc.nix → profiles/nixos/common/gc.nix b/profiles/common/nixos/gc.nix → profiles/nixos/common/gc.nix
diff --git a/profiles/common/nixos/gnome-keyring.nix → profiles/nixos/common/gnome-keyring.nix b/profiles/common/nixos/gnome-keyring.nix → profiles/nixos/common/gnome-keyring.nix
diff --git a/profiles/common/nixos/gvfs.nix → profiles/nixos/common/gvfs.nix b/profiles/common/nixos/gvfs.nix → profiles/nixos/common/gvfs.nix
diff --git a/profiles/common/nixos/hardware.nix → profiles/nixos/common/hardware.nix b/profiles/common/nixos/hardware.nix → profiles/nixos/common/hardware.nix
diff --git a/...es/common/nixos/hardwarecompatibility.nix → ...es/nixos/common/hardwarecompatibility.nix b/...es/common/nixos/hardwarecompatibility.nix → ...es/nixos/common/hardwarecompatibility.nix
diff --git a/profiles/common/nixos/home-manager.nix → profiles/nixos/common/home-manager.nix b/profiles/common/nixos/home-manager.nix → profiles/nixos/common/home-manager.nix
diff --git a/profiles/common/nixos/impermanence.nix → profiles/nixos/common/impermanence.nix b/profiles/common/nixos/impermanence.nix → profiles/nixos/common/impermanence.nix
diff --git a/profiles/common/nixos/interceptiontools.nix → profiles/nixos/common/interceptiontools.nix b/profiles/common/nixos/interceptiontools.nix → profiles/nixos/common/interceptiontools.nix
diff --git a/profiles/common/nixos/lanzaboote.nix → profiles/nixos/common/lanzaboote.nix b/profiles/common/nixos/lanzaboote.nix → profiles/nixos/common/lanzaboote.nix
diff --git a/profiles/common/nixos/lid.nix → profiles/nixos/common/lid.nix b/profiles/common/nixos/lid.nix → profiles/nixos/common/lid.nix
diff --git a/profiles/common/nixos/login.nix → profiles/nixos/common/login.nix b/profiles/common/nixos/login.nix → profiles/nixos/common/login.nix
diff --git a/profiles/common/nixos/lowbattery.nix → profiles/nixos/common/lowbattery.nix b/profiles/common/nixos/lowbattery.nix → profiles/nixos/common/lowbattery.nix
diff --git a/profiles/common/nixos/network.nix → profiles/nixos/common/network.nix b/profiles/common/nixos/network.nix → profiles/nixos/common/network.nix
diff --git a/profiles/common/nixos/networkdevices.nix → profiles/nixos/common/networkdevices.nix b/profiles/common/nixos/networkdevices.nix → profiles/nixos/common/networkdevices.nix
diff --git a/profiles/common/nixos/nix-ld.nix → profiles/nixos/common/nix-ld.nix b/profiles/common/nixos/nix-ld.nix → profiles/nixos/common/nix-ld.nix
diff --git a/profiles/common/nixos/nvd-rebuild.nix → profiles/nixos/common/nvd-rebuild.nix b/profiles/common/nixos/nvd-rebuild.nix → profiles/nixos/common/nvd-rebuild.nix
diff --git a/profiles/common/nixos/packages.nix → profiles/nixos/common/packages.nix b/profiles/common/nixos/packages.nix → profiles/nixos/common/packages.nix
diff --git a/profiles/common/nixos/pipewire.nix → profiles/nixos/common/pipewire.nix b/profiles/common/nixos/pipewire.nix → profiles/nixos/common/pipewire.nix
diff --git a/profiles/common/nixos/polkit.nix → profiles/nixos/common/polkit.nix b/profiles/common/nixos/polkit.nix → profiles/nixos/common/polkit.nix
diff --git a/...es/common/nixos/power-profiles-daemon.nix → ...es/nixos/common/power-profiles-daemon.nix b/...es/common/nixos/power-profiles-daemon.nix → ...es/nixos/common/power-profiles-daemon.nix
diff --git a/profiles/common/nixos/programs.nix → profiles/nixos/common/programs.nix b/profiles/common/nixos/programs.nix → profiles/nixos/common/programs.nix
diff --git a/profiles/common/home/safeeyes.nix → profiles/nixos/common/safeeyes.nix b/profiles/common/home/safeeyes.nix → profiles/nixos/common/safeeyes.nix
diff --git a/profiles/common/nixos/settings.nix → profiles/nixos/common/settings.nix b/profiles/common/nixos/settings.nix → profiles/nixos/common/settings.nix
diff --git a/profiles/common/nixos/sops.nix → profiles/nixos/common/sops.nix b/profiles/common/nixos/sops.nix → profiles/nixos/common/sops.nix
diff --git a/profiles/common/nixos/store.nix → profiles/nixos/common/store.nix b/profiles/common/nixos/store.nix → profiles/nixos/common/store.nix
diff --git a/profiles/common/nixos/stylix.nix → profiles/nixos/common/stylix.nix b/profiles/common/nixos/stylix.nix → profiles/nixos/common/stylix.nix
diff --git a/profiles/common/nixos/sway.nix → profiles/nixos/common/sway.nix b/profiles/common/nixos/sway.nix → profiles/nixos/common/sway.nix
diff --git a/profiles/common/nixos/syncthing.nix → profiles/nixos/common/syncthing.nix b/profiles/common/nixos/syncthing.nix → profiles/nixos/common/syncthing.nix
diff --git a/profiles/common/nixos/systemd.nix → profiles/nixos/common/systemd.nix b/profiles/common/nixos/systemd.nix → profiles/nixos/common/systemd.nix
diff --git a/profiles/common/nixos/time.nix → profiles/nixos/common/time.nix b/profiles/common/nixos/time.nix → profiles/nixos/common/time.nix
diff --git a/profiles/common/nixos/users.nix → profiles/nixos/common/users.nix b/profiles/common/nixos/users.nix → profiles/nixos/common/users.nix
diff --git a/profiles/common/nixos/xdg-portal.nix → profiles/nixos/common/xdg-portal.nix b/profiles/common/nixos/xdg-portal.nix → profiles/nixos/common/xdg-portal.nix
diff --git a/profiles/common/nixos/xserver.nix → profiles/nixos/common/xserver.nix b/profiles/common/nixos/xserver.nix → profiles/nixos/common/xserver.nix
diff --git a/profiles/common/nixos/zsh.nix → profiles/nixos/common/zsh.nix b/profiles/common/nixos/zsh.nix → profiles/nixos/common/zsh.nix
diff --git a/profiles/optional/nixos/autologin.nix → profiles/nixos/optional/autologin.nix b/profiles/optional/nixos/autologin.nix → profiles/nixos/optional/autologin.nix
diff --git a/profiles/optional/nixos/gaming.nix → profiles/nixos/optional/gaming.nix b/profiles/optional/nixos/gaming.nix → profiles/nixos/optional/gaming.nix
diff --git a/profiles/optional/nixos/nswitch-rcm.nix → profiles/nixos/optional/nswitch-rcm.nix b/profiles/optional/nixos/nswitch-rcm.nix → profiles/nixos/optional/nswitch-rcm.nix
diff --git a/profiles/optional/nixos/virtualbox.nix → profiles/nixos/optional/virtualbox.nix b/profiles/optional/nixos/virtualbox.nix → profiles/nixos/optional/virtualbox.nix
diff --git a/profiles/optional/nixos/vmware.nix → profiles/nixos/optional/vmware.nix b/profiles/optional/nixos/vmware.nix → profiles/nixos/optional/vmware.nix
diff --git a/profiles/optional/nixos/work.nix → profiles/nixos/optional/work.nix b/profiles/optional/nixos/work.nix → profiles/nixos/optional/work.nix
diff --git a/profiles/server/nixos/ankisync.nix → profiles/nixos/server/ankisync.nix b/profiles/server/nixos/ankisync.nix → profiles/nixos/server/ankisync.nix
diff --git a/profiles/server/nixos/default.nix → profiles/nixos/server/default.nix b/profiles/server/nixos/default.nix → profiles/nixos/server/default.nix
@@ -4,14 +4,14 @@ let
 in
 {
   imports = [
-    "${profilesPath}/common/nixos/settings.nix"
-    "${profilesPath}/common/nixos/home-manager.nix"
-    "${profilesPath}/common/nixos/xserver.nix"
-    "${profilesPath}/common/nixos/gc.nix"
-    "${profilesPath}/common/nixos/store.nix"
-    "${profilesPath}/common/nixos/time.nix"
-    "${profilesPath}/common/nixos/users.nix"
-    "${profilesPath}/common/nixos/nix-ld.nix"
+    "${profilesPath}/nixos/common/settings.nix"
+    "${profilesPath}/nixos/common/home-manager.nix"
+    "${profilesPath}/nixos/common/xserver.nix"
+    "${profilesPath}/nixos/common/gc.nix"
+    "${profilesPath}/nixos/common/store.nix"
+    "${profilesPath}/nixos/common/time.nix"
+    "${profilesPath}/nixos/common/users.nix"
+    "${profilesPath}/nixos/common/nix-ld.nix"
     ./settings.nix
     ./packages.nix
     ./sops.nix

diff --git a/profiles/server/nixos/emacs.nix → profiles/nixos/server/emacs.nix b/profiles/server/nixos/emacs.nix → profiles/nixos/server/emacs.nix
diff --git a/profiles/server/nixos/forgejo.nix → profiles/nixos/server/forgejo.nix b/profiles/server/nixos/forgejo.nix → profiles/nixos/server/forgejo.nix
diff --git a/profiles/server/nixos/freshrss.nix → profiles/nixos/server/freshrss.nix b/profiles/server/nixos/freshrss.nix → profiles/nixos/server/freshrss.nix
diff --git a/profiles/server/nixos/immich.nix → profiles/nixos/server/immich.nix b/profiles/server/nixos/immich.nix → profiles/nixos/server/immich.nix
diff --git a/profiles/server/nixos/jellyfin.nix → profiles/nixos/server/jellyfin.nix b/profiles/server/nixos/jellyfin.nix → profiles/nixos/server/jellyfin.nix
diff --git a/profiles/server/nixos/jenkins.nix → profiles/nixos/server/jenkins.nix b/profiles/server/nixos/jenkins.nix → profiles/nixos/server/jenkins.nix
diff --git a/profiles/server/nixos/kavita.nix → profiles/nixos/server/kavita.nix b/profiles/server/nixos/kavita.nix → profiles/nixos/server/kavita.nix
diff --git a/profiles/server/nixos/matrix.nix → profiles/nixos/server/matrix.nix b/profiles/server/nixos/matrix.nix → profiles/nixos/server/matrix.nix
diff --git a/profiles/server/nixos/monitoring.nix → profiles/nixos/server/monitoring.nix b/profiles/server/nixos/monitoring.nix → profiles/nixos/server/monitoring.nix
diff --git a/profiles/server/nixos/mpd.nix → profiles/nixos/server/mpd.nix b/profiles/server/nixos/mpd.nix → profiles/nixos/server/mpd.nix
diff --git a/profiles/server/nixos/navidrome.nix → profiles/nixos/server/navidrome.nix b/profiles/server/nixos/navidrome.nix → profiles/nixos/server/navidrome.nix
diff --git a/profiles/server/nixos/nextcloud.nix → profiles/nixos/server/nextcloud.nix b/profiles/server/nixos/nextcloud.nix → profiles/nixos/server/nextcloud.nix
diff --git a/profiles/server/nixos/nfs.nix → profiles/nixos/server/nfs.nix b/profiles/server/nixos/nfs.nix → profiles/nixos/server/nfs.nix
diff --git a/profiles/server/nixos/nginx.nix → profiles/nixos/server/nginx.nix b/profiles/server/nixos/nginx.nix → profiles/nixos/server/nginx.nix
diff --git a/profiles/server/nixos/packages.nix → profiles/nixos/server/packages.nix b/profiles/server/nixos/packages.nix → profiles/nixos/server/packages.nix
diff --git a/profiles/server/nixos/paperless.nix → profiles/nixos/server/paperless.nix b/profiles/server/nixos/paperless.nix → profiles/nixos/server/paperless.nix
diff --git a/profiles/server/nixos/pipewire.nix → profiles/nixos/server/pipewire.nix b/profiles/server/nixos/pipewire.nix → profiles/nixos/server/pipewire.nix
diff --git a/profiles/server/nixos/restic.nix → profiles/nixos/server/restic.nix b/profiles/server/nixos/restic.nix → profiles/nixos/server/restic.nix
diff --git a/profiles/server/nixos/settings.nix → profiles/nixos/server/settings.nix b/profiles/server/nixos/settings.nix → profiles/nixos/server/settings.nix
diff --git a/profiles/server/nixos/sops.nix → profiles/nixos/server/sops.nix b/profiles/server/nixos/sops.nix → profiles/nixos/server/sops.nix
diff --git a/profiles/server/nixos/spotifyd.nix → profiles/nixos/server/spotifyd.nix b/profiles/server/nixos/spotifyd.nix → profiles/nixos/server/spotifyd.nix
diff --git a/profiles/server/nixos/ssh.nix → profiles/nixos/server/ssh.nix b/profiles/server/nixos/ssh.nix → profiles/nixos/server/ssh.nix
diff --git a/profiles/server/nixos/syncthing.nix → profiles/nixos/server/syncthing.nix b/profiles/server/nixos/syncthing.nix → profiles/nixos/server/syncthing.nix
diff --git a/profiles/server/nixos/transmission.nix → profiles/nixos/server/transmission.nix b/profiles/server/nixos/transmission.nix → profiles/nixos/server/transmission.nix
diff --git a/profiles/optional/nixos/steam.nix b/profiles/optional/nixos/steam.nix
diff --git a/profiles/server/nixos/calibre.nix b/profiles/server/nixos/calibre.nix
diff --git a/templates/hosts/nixos/default.nix b/templates/hosts/nixos/default.nix
@@ -13,16 +13,16 @@ in
     ./hardware-configuration.nix
     ./disk-config.nix
 
-    "${profilesPath}/optional/nixos/virtualbox.nix"
-    # "${profilesPath}/optional/nixos/vmware.nix"
-    "${profilesPath}/optional/nixos/autologin.nix"
-    "${profilesPath}/optional/nixos/nswitch-rcm.nix"
-    "${profilesPath}/optional/nixos/gaming.nix"
+    "${profilesPath}/nixos/optional/virtualbox.nix"
+    # "${profilesPath}/nixos/optional/vmware.nix"
+    "${profilesPath}/nixos/optional/autologin.nix"
+    "${profilesPath}/nixos/optional/nswitch-rcm.nix"
+    "${profilesPath}/nixos/optional/gaming.nix"
 
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager.users.swarsel.imports = outputs.mixedModules ++ [
-        "${profilesPath}/optional/home/gaming.nix"
+        "${profilesPath}/home/optional/gaming.nix"
       ] ++ (builtins.attrValues outputs.homeManagerModules);
     }
   ] ++ (builtins.attrValues outputs.nixosModules);