diff --git a/flake/nixos.nix b/flake/nixos.nix
index 9eb6388..541e658 100644
--- a/flake/nixos.nix
+++ b/flake/nixos.nix
@@ -13,7 +13,7 @@ let
       ];
     }
     # Include generic settings
-    "${self}/modules"
+    "${self}/modules/nixos"
     # Include bundles of settings
     "${self}/profiles"
   ];
diff --git a/modules/default.nix b/modules/nixos/default.nix
similarity index 100%
rename from modules/default.nix
rename to modules/nixos/default.nix
diff --git a/modules/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix
similarity index 100%
rename from modules/hardware/bluetooth/default.nix
rename to modules/nixos/hardware/bluetooth/default.nix
diff --git a/modules/hardware/default.nix b/modules/nixos/hardware/default.nix
similarity index 100%
rename from modules/hardware/default.nix
rename to modules/nixos/hardware/default.nix
diff --git a/modules/hardware/ergodox/default.nix b/modules/nixos/hardware/ergodox/default.nix
similarity index 100%
rename from modules/hardware/ergodox/default.nix
rename to modules/nixos/hardware/ergodox/default.nix
diff --git a/modules/hardware/firmware/default.nix b/modules/nixos/hardware/firmware/default.nix
similarity index 100%
rename from modules/hardware/firmware/default.nix
rename to modules/nixos/hardware/firmware/default.nix
diff --git a/modules/hardware/mx-ergo/default.nix b/modules/nixos/hardware/mx-ergo/default.nix
similarity index 100%
rename from modules/hardware/mx-ergo/default.nix
rename to modules/nixos/hardware/mx-ergo/default.nix
diff --git a/modules/hardware/networking/default.nix b/modules/nixos/hardware/networking/default.nix
similarity index 100%
rename from modules/hardware/networking/default.nix
rename to modules/nixos/hardware/networking/default.nix
diff --git a/modules/hardware/sound/default.nix b/modules/nixos/hardware/sound/default.nix
similarity index 100%
rename from modules/hardware/sound/default.nix
rename to modules/nixos/hardware/sound/default.nix
diff --git a/modules/hardware/upower/default.nix b/modules/nixos/hardware/upower/default.nix
similarity index 100%
rename from modules/hardware/upower/default.nix
rename to modules/nixos/hardware/upower/default.nix
diff --git a/modules/home/default.nix b/modules/nixos/home/default.nix
similarity index 100%
rename from modules/home/default.nix
rename to modules/nixos/home/default.nix
diff --git a/modules/programs/default.nix b/modules/nixos/programs/default.nix
similarity index 100%
rename from modules/programs/default.nix
rename to modules/nixos/programs/default.nix
diff --git a/modules/programs/steam/default.nix b/modules/nixos/programs/steam/default.nix
similarity index 100%
rename from modules/programs/steam/default.nix
rename to modules/nixos/programs/steam/default.nix
diff --git a/modules/secrets/default.nix b/modules/nixos/secrets/default.nix
similarity index 100%
rename from modules/secrets/default.nix
rename to modules/nixos/secrets/default.nix
diff --git a/modules/secrets/secrets.nix b/modules/nixos/secrets/secrets.nix
similarity index 100%
rename from modules/secrets/secrets.nix
rename to modules/nixos/secrets/secrets.nix
diff --git a/modules/secrets/users/ambroisie/hashed-password.age b/modules/nixos/secrets/users/ambroisie/hashed-password.age
similarity index 100%
rename from modules/secrets/users/ambroisie/hashed-password.age
rename to modules/nixos/secrets/users/ambroisie/hashed-password.age
diff --git a/modules/secrets/users/root/hashed-password.age b/modules/nixos/secrets/users/root/hashed-password.age
similarity index 100%
rename from modules/secrets/users/root/hashed-password.age
rename to modules/nixos/secrets/users/root/hashed-password.age
diff --git a/modules/services/adblock/default.nix b/modules/nixos/services/adblock/default.nix
similarity index 100%
rename from modules/services/adblock/default.nix
rename to modules/nixos/services/adblock/default.nix
diff --git a/modules/services/backup/default.nix b/modules/nixos/services/backup/default.nix
similarity index 100%
rename from modules/services/backup/default.nix
rename to modules/nixos/services/backup/default.nix
diff --git a/modules/services/blog/default.nix b/modules/nixos/services/blog/default.nix
similarity index 100%
rename from modules/services/blog/default.nix
rename to modules/nixos/services/blog/default.nix
diff --git a/modules/services/calibre-web/default.nix b/modules/nixos/services/calibre-web/default.nix
similarity index 100%
rename from modules/services/calibre-web/default.nix
rename to modules/nixos/services/calibre-web/default.nix
diff --git a/modules/services/default.nix b/modules/nixos/services/default.nix
similarity index 100%
rename from modules/services/default.nix
rename to modules/nixos/services/default.nix
diff --git a/modules/services/drone/default.nix b/modules/nixos/services/drone/default.nix
similarity index 100%
rename from modules/services/drone/default.nix
rename to modules/nixos/services/drone/default.nix
diff --git a/modules/services/drone/runner-docker/default.nix b/modules/nixos/services/drone/runner-docker/default.nix
similarity index 100%
rename from modules/services/drone/runner-docker/default.nix
rename to modules/nixos/services/drone/runner-docker/default.nix
diff --git a/modules/services/drone/runner-exec/default.nix b/modules/nixos/services/drone/runner-exec/default.nix
similarity index 100%
rename from modules/services/drone/runner-exec/default.nix
rename to modules/nixos/services/drone/runner-exec/default.nix
diff --git a/modules/services/drone/server/default.nix b/modules/nixos/services/drone/server/default.nix
similarity index 100%
rename from modules/services/drone/server/default.nix
rename to modules/nixos/services/drone/server/default.nix
diff --git a/modules/services/fail2ban/default.nix b/modules/nixos/services/fail2ban/default.nix
similarity index 100%
rename from modules/services/fail2ban/default.nix
rename to modules/nixos/services/fail2ban/default.nix
diff --git a/modules/services/flood/default.nix b/modules/nixos/services/flood/default.nix
similarity index 100%
rename from modules/services/flood/default.nix
rename to modules/nixos/services/flood/default.nix
diff --git a/modules/services/gitea/default.nix b/modules/nixos/services/gitea/default.nix
similarity index 100%
rename from modules/services/gitea/default.nix
rename to modules/nixos/services/gitea/default.nix
diff --git a/modules/services/grocy/default.nix b/modules/nixos/services/grocy/default.nix
similarity index 100%
rename from modules/services/grocy/default.nix
rename to modules/nixos/services/grocy/default.nix
diff --git a/modules/services/indexers/default.nix b/modules/nixos/services/indexers/default.nix
similarity index 100%
rename from modules/services/indexers/default.nix
rename to modules/nixos/services/indexers/default.nix
diff --git a/modules/services/jellyfin/default.nix b/modules/nixos/services/jellyfin/default.nix
similarity index 100%
rename from modules/services/jellyfin/default.nix
rename to modules/nixos/services/jellyfin/default.nix
diff --git a/modules/services/lohr/default.nix b/modules/nixos/services/lohr/default.nix
similarity index 100%
rename from modules/services/lohr/default.nix
rename to modules/nixos/services/lohr/default.nix
diff --git a/modules/services/matrix/default.nix b/modules/nixos/services/matrix/default.nix
similarity index 100%
rename from modules/services/matrix/default.nix
rename to modules/nixos/services/matrix/default.nix
diff --git a/modules/services/miniflux/default.nix b/modules/nixos/services/miniflux/default.nix
similarity index 100%
rename from modules/services/miniflux/default.nix
rename to modules/nixos/services/miniflux/default.nix
diff --git a/modules/services/monitoring/default.nix b/modules/nixos/services/monitoring/default.nix
similarity index 100%
rename from modules/services/monitoring/default.nix
rename to modules/nixos/services/monitoring/default.nix
diff --git a/modules/services/navidrome/default.nix b/modules/nixos/services/navidrome/default.nix
similarity index 100%
rename from modules/services/navidrome/default.nix
rename to modules/nixos/services/navidrome/default.nix
diff --git a/modules/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix
similarity index 100%
rename from modules/services/nextcloud/default.nix
rename to modules/nixos/services/nextcloud/default.nix
diff --git a/modules/services/nginx/default.nix b/modules/nixos/services/nginx/default.nix
similarity index 100%
rename from modules/services/nginx/default.nix
rename to modules/nixos/services/nginx/default.nix
diff --git a/modules/services/nginx/sso/default.nix b/modules/nixos/services/nginx/sso/default.nix
similarity index 100%
rename from modules/services/nginx/sso/default.nix
rename to modules/nixos/services/nginx/sso/default.nix
diff --git a/modules/services/nix-cache/default.nix b/modules/nixos/services/nix-cache/default.nix
similarity index 100%
rename from modules/services/nix-cache/default.nix
rename to modules/nixos/services/nix-cache/default.nix
diff --git a/modules/services/paperless/default.nix b/modules/nixos/services/paperless/default.nix
similarity index 100%
rename from modules/services/paperless/default.nix
rename to modules/nixos/services/paperless/default.nix
diff --git a/modules/services/pirate/default.nix b/modules/nixos/services/pirate/default.nix
similarity index 100%
rename from modules/services/pirate/default.nix
rename to modules/nixos/services/pirate/default.nix
diff --git a/modules/services/podgrab/default.nix b/modules/nixos/services/podgrab/default.nix
similarity index 100%
rename from modules/services/podgrab/default.nix
rename to modules/nixos/services/podgrab/default.nix
diff --git a/modules/services/postgresql-backup/default.nix b/modules/nixos/services/postgresql-backup/default.nix
similarity index 100%
rename from modules/services/postgresql-backup/default.nix
rename to modules/nixos/services/postgresql-backup/default.nix
diff --git a/modules/services/postgresql/default.nix b/modules/nixos/services/postgresql/default.nix
similarity index 100%
rename from modules/services/postgresql/default.nix
rename to modules/nixos/services/postgresql/default.nix
diff --git a/modules/services/quassel/default.nix b/modules/nixos/services/quassel/default.nix
similarity index 100%
rename from modules/services/quassel/default.nix
rename to modules/nixos/services/quassel/default.nix
diff --git a/modules/services/rss-bridge/default.nix b/modules/nixos/services/rss-bridge/default.nix
similarity index 100%
rename from modules/services/rss-bridge/default.nix
rename to modules/nixos/services/rss-bridge/default.nix
diff --git a/modules/services/sabnzbd/default.nix b/modules/nixos/services/sabnzbd/default.nix
similarity index 100%
rename from modules/services/sabnzbd/default.nix
rename to modules/nixos/services/sabnzbd/default.nix
diff --git a/modules/services/ssh-server/default.nix b/modules/nixos/services/ssh-server/default.nix
similarity index 100%
rename from modules/services/ssh-server/default.nix
rename to modules/nixos/services/ssh-server/default.nix
diff --git a/modules/services/tandoor-recipes/default.nix b/modules/nixos/services/tandoor-recipes/default.nix
similarity index 100%
rename from modules/services/tandoor-recipes/default.nix
rename to modules/nixos/services/tandoor-recipes/default.nix
diff --git a/modules/services/tlp/default.nix b/modules/nixos/services/tlp/default.nix
similarity index 100%
rename from modules/services/tlp/default.nix
rename to modules/nixos/services/tlp/default.nix
diff --git a/modules/services/transmission/default.nix b/modules/nixos/services/transmission/default.nix
similarity index 100%
rename from modules/services/transmission/default.nix
rename to modules/nixos/services/transmission/default.nix
diff --git a/modules/services/vikunja/default.nix b/modules/nixos/services/vikunja/default.nix
similarity index 100%
rename from modules/services/vikunja/default.nix
rename to modules/nixos/services/vikunja/default.nix
diff --git a/modules/services/wireguard/default.nix b/modules/nixos/services/wireguard/default.nix
similarity index 100%
rename from modules/services/wireguard/default.nix
rename to modules/nixos/services/wireguard/default.nix
diff --git a/modules/services/wireguard/keys/milady/private-key.age b/modules/nixos/services/wireguard/keys/milady/private-key.age
similarity index 100%
rename from modules/services/wireguard/keys/milady/private-key.age
rename to modules/nixos/services/wireguard/keys/milady/private-key.age
diff --git a/modules/services/wireguard/keys/richelieu/private-key.age b/modules/nixos/services/wireguard/keys/richelieu/private-key.age
similarity index 100%
rename from modules/services/wireguard/keys/richelieu/private-key.age
rename to modules/nixos/services/wireguard/keys/richelieu/private-key.age
diff --git a/modules/services/wireguard/keys/secrets.nix b/modules/nixos/services/wireguard/keys/secrets.nix
similarity index 100%
rename from modules/services/wireguard/keys/secrets.nix
rename to modules/nixos/services/wireguard/keys/secrets.nix
diff --git a/modules/services/woodpecker/agent-docker/default.nix b/modules/nixos/services/woodpecker/agent-docker/default.nix
similarity index 100%
rename from modules/services/woodpecker/agent-docker/default.nix
rename to modules/nixos/services/woodpecker/agent-docker/default.nix
diff --git a/modules/services/woodpecker/agent-exec/default.nix b/modules/nixos/services/woodpecker/agent-exec/default.nix
similarity index 100%
rename from modules/services/woodpecker/agent-exec/default.nix
rename to modules/nixos/services/woodpecker/agent-exec/default.nix
diff --git a/modules/services/woodpecker/default.nix b/modules/nixos/services/woodpecker/default.nix
similarity index 100%
rename from modules/services/woodpecker/default.nix
rename to modules/nixos/services/woodpecker/default.nix
diff --git a/modules/services/woodpecker/server/default.nix b/modules/nixos/services/woodpecker/server/default.nix
similarity index 100%
rename from modules/services/woodpecker/server/default.nix
rename to modules/nixos/services/woodpecker/server/default.nix
diff --git a/modules/system/boot/default.nix b/modules/nixos/system/boot/default.nix
similarity index 100%
rename from modules/system/boot/default.nix
rename to modules/nixos/system/boot/default.nix
diff --git a/modules/system/default.nix b/modules/nixos/system/default.nix
similarity index 100%
rename from modules/system/default.nix
rename to modules/nixos/system/default.nix
diff --git a/modules/system/docker/default.nix b/modules/nixos/system/docker/default.nix
similarity index 100%
rename from modules/system/docker/default.nix
rename to modules/nixos/system/docker/default.nix
diff --git a/modules/system/documentation/default.nix b/modules/nixos/system/documentation/default.nix
similarity index 100%
rename from modules/system/documentation/default.nix
rename to modules/nixos/system/documentation/default.nix
diff --git a/modules/system/language/default.nix b/modules/nixos/system/language/default.nix
similarity index 100%
rename from modules/system/language/default.nix
rename to modules/nixos/system/language/default.nix
diff --git a/modules/system/nix/default.nix b/modules/nixos/system/nix/default.nix
similarity index 100%
rename from modules/system/nix/default.nix
rename to modules/nixos/system/nix/default.nix
diff --git a/modules/system/packages/default.nix b/modules/nixos/system/packages/default.nix
similarity index 100%
rename from modules/system/packages/default.nix
rename to modules/nixos/system/packages/default.nix
diff --git a/modules/system/podman/default.nix b/modules/nixos/system/podman/default.nix
similarity index 100%
rename from modules/system/podman/default.nix
rename to modules/nixos/system/podman/default.nix
diff --git a/modules/system/printing/default.nix b/modules/nixos/system/printing/default.nix
similarity index 100%
rename from modules/system/printing/default.nix
rename to modules/nixos/system/printing/default.nix
diff --git a/modules/system/users/default.nix b/modules/nixos/system/users/default.nix
similarity index 100%
rename from modules/system/users/default.nix
rename to modules/nixos/system/users/default.nix
diff --git a/modules/system/users/ssh/aramis.pub b/modules/nixos/system/users/ssh/aramis.pub
similarity index 100%
rename from modules/system/users/ssh/aramis.pub
rename to modules/nixos/system/users/ssh/aramis.pub
diff --git a/modules/system/users/ssh/shared.pub b/modules/nixos/system/users/ssh/shared.pub
similarity index 100%
rename from modules/system/users/ssh/shared.pub
rename to modules/nixos/system/users/ssh/shared.pub