diff --git a/flake-parts/modules.nix b/flake-parts/modules.nix
index e2fa360..a7e1166 100644
--- a/flake-parts/modules.nix
+++ b/flake-parts/modules.nix
@@ -1,7 +1,7 @@
 { self, ... }:
 {
   flake = {
-    nixosModules.default.imports = self.lib.listNixFilesRecursively "${self}/modules/system";
+    nixosModules.default.imports = self.lib.listNixFilesRecursively "${self}/modules/nixos";
     homeModules.default.imports = self.lib.listNixFilesRecursively "${self}/modules/home";
   };
 }
diff --git a/modules/system/boot/loader/grub.nix b/modules/nixos/boot/loader/grub.nix
similarity index 100%
rename from modules/system/boot/loader/grub.nix
rename to modules/nixos/boot/loader/grub.nix
diff --git a/modules/system/boot/loader/systemd-boot.nix b/modules/nixos/boot/loader/systemd-boot.nix
similarity index 100%
rename from modules/system/boot/loader/systemd-boot.nix
rename to modules/nixos/boot/loader/systemd-boot.nix
diff --git a/modules/system/boot/silent.nix b/modules/nixos/boot/silent.nix
similarity index 100%
rename from modules/system/boot/silent.nix
rename to modules/nixos/boot/silent.nix
diff --git a/modules/system/de/hyprland.nix b/modules/nixos/de/hyprland.nix
similarity index 100%
rename from modules/system/de/hyprland.nix
rename to modules/nixos/de/hyprland.nix
diff --git a/modules/system/dm/tuigreet.nix b/modules/nixos/dm/tuigreet.nix
similarity index 100%
rename from modules/system/dm/tuigreet.nix
rename to modules/nixos/dm/tuigreet.nix
diff --git a/modules/system/networking/default.nix b/modules/nixos/networking/default.nix
similarity index 100%
rename from modules/system/networking/default.nix
rename to modules/nixos/networking/default.nix
diff --git a/modules/system/networking/overlay.nix b/modules/nixos/networking/overlay.nix
similarity index 100%
rename from modules/system/networking/overlay.nix
rename to modules/nixos/networking/overlay.nix
diff --git a/modules/system/networking/underlay.nix b/modules/nixos/networking/underlay.nix
similarity index 100%
rename from modules/system/networking/underlay.nix
rename to modules/nixos/networking/underlay.nix
diff --git a/modules/system/persistence.nix b/modules/nixos/persistence.nix
similarity index 100%
rename from modules/system/persistence.nix
rename to modules/nixos/persistence.nix
diff --git a/modules/system/programs/steam.nix b/modules/nixos/programs/steam.nix
similarity index 100%
rename from modules/system/programs/steam.nix
rename to modules/nixos/programs/steam.nix
diff --git a/modules/system/programs/winboat.nix b/modules/nixos/programs/winboat.nix
similarity index 100%
rename from modules/system/programs/winboat.nix
rename to modules/nixos/programs/winboat.nix
diff --git a/modules/system/programs/wireshark.nix b/modules/nixos/programs/wireshark.nix
similarity index 100%
rename from modules/system/programs/wireshark.nix
rename to modules/nixos/programs/wireshark.nix
diff --git a/modules/system/services/alloy.nix b/modules/nixos/services/alloy.nix
similarity index 100%
rename from modules/system/services/alloy.nix
rename to modules/nixos/services/alloy.nix
diff --git a/modules/system/services/atuin.nix b/modules/nixos/services/atuin.nix
similarity index 100%
rename from modules/system/services/atuin.nix
rename to modules/nixos/services/atuin.nix
diff --git a/modules/system/services/auto-gc.nix b/modules/nixos/services/auto-gc.nix
similarity index 100%
rename from modules/system/services/auto-gc.nix
rename to modules/nixos/services/auto-gc.nix
diff --git a/modules/system/services/bluetooth.nix b/modules/nixos/services/bluetooth.nix
similarity index 100%
rename from modules/system/services/bluetooth.nix
rename to modules/nixos/services/bluetooth.nix
diff --git a/modules/system/services/caddy.nix b/modules/nixos/services/caddy.nix
similarity index 100%
rename from modules/system/services/caddy.nix
rename to modules/nixos/services/caddy.nix
diff --git a/modules/system/services/comin.nix b/modules/nixos/services/comin.nix
similarity index 100%
rename from modules/system/services/comin.nix
rename to modules/nixos/services/comin.nix
diff --git a/modules/system/services/dns.nix b/modules/nixos/services/dns.nix
similarity index 100%
rename from modules/system/services/dns.nix
rename to modules/nixos/services/dns.nix
diff --git a/modules/system/services/nebula/ca.crt b/modules/nixos/services/nebula/ca.crt
similarity index 100%
rename from modules/system/services/nebula/ca.crt
rename to modules/nixos/services/nebula/ca.crt
diff --git a/modules/system/services/nebula/default.nix b/modules/nixos/services/nebula/default.nix
similarity index 100%
rename from modules/system/services/nebula/default.nix
rename to modules/nixos/services/nebula/default.nix
diff --git a/modules/system/services/printing.nix b/modules/nixos/services/printing.nix
similarity index 100%
rename from modules/system/services/printing.nix
rename to modules/nixos/services/printing.nix
diff --git a/modules/system/services/restic/backups.nix b/modules/nixos/services/restic/backups.nix
similarity index 100%
rename from modules/system/services/restic/backups.nix
rename to modules/nixos/services/restic/backups.nix
diff --git a/modules/system/services/restic/healthchecks.nix b/modules/nixos/services/restic/healthchecks.nix
similarity index 100%
rename from modules/system/services/restic/healthchecks.nix
rename to modules/nixos/services/restic/healthchecks.nix
diff --git a/modules/system/services/restic/restore.nix b/modules/nixos/services/restic/restore.nix
similarity index 100%
rename from modules/system/services/restic/restore.nix
rename to modules/nixos/services/restic/restore.nix
diff --git a/modules/system/services/sound.nix b/modules/nixos/services/sound.nix
similarity index 100%
rename from modules/system/services/sound.nix
rename to modules/nixos/services/sound.nix
diff --git a/modules/system/services/sshd.nix b/modules/nixos/services/sshd.nix
similarity index 100%
rename from modules/system/services/sshd.nix
rename to modules/nixos/services/sshd.nix
diff --git a/modules/system/services/syncthing.nix b/modules/nixos/services/syncthing.nix
similarity index 100%
rename from modules/system/services/syncthing.nix
rename to modules/nixos/services/syncthing.nix
diff --git a/modules/system/sops.nix b/modules/nixos/sops.nix
similarity index 100%
rename from modules/system/sops.nix
rename to modules/nixos/sops.nix
diff --git a/modules/system/web-services/actualbudget.nix b/modules/nixos/web-services/actualbudget.nix
similarity index 100%
rename from modules/system/web-services/actualbudget.nix
rename to modules/nixos/web-services/actualbudget.nix
diff --git a/modules/system/web-services/filebrowser.nix b/modules/nixos/web-services/filebrowser.nix
similarity index 100%
rename from modules/system/web-services/filebrowser.nix
rename to modules/nixos/web-services/filebrowser.nix
diff --git a/modules/system/web-services/forgejo.nix b/modules/nixos/web-services/forgejo.nix
similarity index 100%
rename from modules/system/web-services/forgejo.nix
rename to modules/nixos/web-services/forgejo.nix
diff --git a/modules/system/web-services/freshrss.nix b/modules/nixos/web-services/freshrss.nix
similarity index 100%
rename from modules/system/web-services/freshrss.nix
rename to modules/nixos/web-services/freshrss.nix
diff --git a/modules/system/web-services/gatus.nix b/modules/nixos/web-services/gatus.nix
similarity index 100%
rename from modules/system/web-services/gatus.nix
rename to modules/nixos/web-services/gatus.nix
diff --git a/modules/system/web-services/grafana.nix b/modules/nixos/web-services/grafana.nix
similarity index 100%
rename from modules/system/web-services/grafana.nix
rename to modules/nixos/web-services/grafana.nix
diff --git a/modules/system/web-services/it-tools.nix b/modules/nixos/web-services/it-tools.nix
similarity index 100%
rename from modules/system/web-services/it-tools.nix
rename to modules/nixos/web-services/it-tools.nix
diff --git a/modules/system/web-services/karakeep.nix b/modules/nixos/web-services/karakeep.nix
similarity index 100%
rename from modules/system/web-services/karakeep.nix
rename to modules/nixos/web-services/karakeep.nix
diff --git a/modules/system/web-services/networking-toolbox.nix b/modules/nixos/web-services/networking-toolbox.nix
similarity index 100%
rename from modules/system/web-services/networking-toolbox.nix
rename to modules/nixos/web-services/networking-toolbox.nix
diff --git a/modules/system/web-services/ntfy.nix b/modules/nixos/web-services/ntfy.nix
similarity index 100%
rename from modules/system/web-services/ntfy.nix
rename to modules/nixos/web-services/ntfy.nix
diff --git a/modules/system/web-services/outline.nix b/modules/nixos/web-services/outline.nix
similarity index 100%
rename from modules/system/web-services/outline.nix
rename to modules/nixos/web-services/outline.nix
diff --git a/modules/system/web-services/personal-blog.nix b/modules/nixos/web-services/personal-blog.nix
similarity index 100%
rename from modules/system/web-services/personal-blog.nix
rename to modules/nixos/web-services/personal-blog.nix
diff --git a/modules/system/web-services/privatebin.nix b/modules/nixos/web-services/privatebin.nix
similarity index 100%
rename from modules/system/web-services/privatebin.nix
rename to modules/nixos/web-services/privatebin.nix
diff --git a/modules/system/web-services/radicale.nix b/modules/nixos/web-services/radicale.nix
similarity index 100%
rename from modules/system/web-services/radicale.nix
rename to modules/nixos/web-services/radicale.nix
diff --git a/modules/system/web-services/screego.nix b/modules/nixos/web-services/screego.nix
similarity index 100%
rename from modules/system/web-services/screego.nix
rename to modules/nixos/web-services/screego.nix
diff --git a/modules/system/web-services/stirling-pdf.nix b/modules/nixos/web-services/stirling-pdf.nix
similarity index 100%
rename from modules/system/web-services/stirling-pdf.nix
rename to modules/nixos/web-services/stirling-pdf.nix
diff --git a/modules/system/web-services/victorialogs.nix b/modules/nixos/web-services/victorialogs.nix
similarity index 100%
rename from modules/system/web-services/victorialogs.nix
rename to modules/nixos/web-services/victorialogs.nix
diff --git a/modules/system/web-services/victoriametrics.nix b/modules/nixos/web-services/victoriametrics.nix
similarity index 100%
rename from modules/system/web-services/victoriametrics.nix
rename to modules/nixos/web-services/victoriametrics.nix