diff --git a/clan/flake-module.nix b/clan/flake-module.nix
index c15a957..44cdbb5 100644
--- a/clan/flake-module.nix
+++ b/clan/flake-module.nix
@@ -93,7 +93,7 @@
     module.input = "clan-core";
     module.name = "importer";
     roles.default.tags.garage = { };
-    roles.default.extraModules = [ ../modules/garage.nix ];
+    roles.default.extraModules = [ self.nixosModules.garage ];
   };
 
   clan.inventory.instances."trusted-nix-caches" = {
@@ -123,7 +123,7 @@
       }
     );
     roles.client.extraModules = [
-      ../modules/storagebox.nix
+      self.nixosModules.storagebox
     ];
     roles.server.machines = { };
   };
diff --git a/flake.nix b/flake.nix
index 044ab3c..a0b1791 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
         ./devShells/flake-module.nix
         ./homeModules/flake-module.nix
         ./infra/flake-module.nix
-        ./modules/flake-module.nix
+        ./nixosModules/flake-module.nix
         ./packages/flake-module.nix
         ./flakeModules/flake-module.nix
       ];
diff --git a/machines/crocus/configuration.nix b/machines/crocus/configuration.nix
index 50ca761..eebb568 100644
--- a/machines/crocus/configuration.nix
+++ b/machines/crocus/configuration.nix
@@ -6,7 +6,7 @@
   imports = [
     self.nixosModules.radicle
     self.nixosModules.nix-defaults
-    ../../modules/remote-builder.nix
+    self.nixosModules.remote-builder
     self.inputs.srvos.nixosModules.server
     self.inputs.srvos.nixosModules.hardware-hetzner-cloud
   ];
diff --git a/machines/genepi/builder.nix b/machines/genepi/builder.nix
index 5e4a7e3..87aaf61 100644
--- a/machines/genepi/builder.nix
+++ b/machines/genepi/builder.nix
@@ -1,6 +1,7 @@
+{ self, ... }:
 {
   imports = [
-    ../../modules/remote-builder.nix
+    self.nixosModules.remote-builder
   ];
 
   roles.remote-builder = {
diff --git a/machines/genepi/configuration.nix b/machines/genepi/configuration.nix
index 1e48016..90f1be9 100644
--- a/machines/genepi/configuration.nix
+++ b/machines/genepi/configuration.nix
@@ -17,8 +17,7 @@
     ./pinchflat.nix
     ./syncthing.nix
 
-    ../../modules/acme-home.nix
-    ../../modules/lounge.nix
+    self.nixosModules.lounge
     self.nixosModules.nix-defaults
 
     self.nixosModules.user-rpqt
diff --git a/modules/acme-home.nix b/nixosModules/acme-home.nix
similarity index 100%
rename from modules/acme-home.nix
rename to nixosModules/acme-home.nix
diff --git a/modules/borgbackup.nix b/nixosModules/borgbackup.nix
similarity index 93%
rename from modules/borgbackup.nix
rename to nixosModules/borgbackup.nix
index 172e76e..ec5cdf9 100644
--- a/modules/borgbackup.nix
+++ b/nixosModules/borgbackup.nix
@@ -6,7 +6,7 @@ let
 in
 {
   imports = [
-    ./storagebox.nix
+    self.nixosModules.storagebox
     self.inputs.clan-core.clanModules.borgbackup
   ];
 
diff --git a/modules/desktop.nix b/nixosModules/desktop.nix
similarity index 69%
rename from modules/desktop.nix
rename to nixosModules/desktop.nix
index de98e67..8ab690a 100644
--- a/modules/desktop.nix
+++ b/nixosModules/desktop.nix
@@ -25,8 +25,21 @@
     terminal = "ghostty";
   };
 
+  # services.yubikey-agent.enable = true;
+  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
+
   services.pcscd.enable = true;
 
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  hardware.bluetooth.enable = true;
+
   services.displayManager = {
     sddm.enable = true;
     sddm.wayland.enable = true;
diff --git a/modules/flake-module.nix b/nixosModules/flake-module.nix
similarity index 100%
rename from modules/flake-module.nix
rename to nixosModules/flake-module.nix
diff --git a/modules/forgejo.nix b/nixosModules/forgejo.nix
similarity index 100%
rename from modules/forgejo.nix
rename to nixosModules/forgejo.nix
diff --git a/modules/garage.nix b/nixosModules/garage.nix
similarity index 100%
rename from modules/garage.nix
rename to nixosModules/garage.nix
diff --git a/modules/gitea.nix b/nixosModules/gitea.nix
similarity index 100%
rename from modules/gitea.nix
rename to nixosModules/gitea.nix
diff --git a/modules/hardened-ssh-server.nix b/nixosModules/hardened-ssh-server.nix
similarity index 100%
rename from modules/hardened-ssh-server.nix
rename to nixosModules/hardened-ssh-server.nix
diff --git a/modules/lanzaboote.nix b/nixosModules/lanzaboote.nix
similarity index 100%
rename from modules/lanzaboote.nix
rename to nixosModules/lanzaboote.nix
diff --git a/modules/lounge.nix b/nixosModules/lounge.nix
similarity index 100%
rename from modules/lounge.nix
rename to nixosModules/lounge.nix
diff --git a/modules/motd.nix b/nixosModules/motd.nix
similarity index 100%
rename from modules/motd.nix
rename to nixosModules/motd.nix
diff --git a/modules/nextcloud.nix b/nixosModules/nextcloud.nix
similarity index 100%
rename from modules/nextcloud.nix
rename to nixosModules/nextcloud.nix
diff --git a/modules/nix-defaults.nix b/nixosModules/nix-defaults.nix
similarity index 100%
rename from modules/nix-defaults.nix
rename to nixosModules/nix-defaults.nix
diff --git a/modules/radicle.nix b/nixosModules/radicle.nix
similarity index 100%
rename from modules/radicle.nix
rename to nixosModules/radicle.nix
diff --git a/modules/remote-builder.nix b/nixosModules/remote-builder.nix
similarity index 100%
rename from modules/remote-builder.nix
rename to nixosModules/remote-builder.nix
diff --git a/modules/storagebox.nix b/nixosModules/storagebox.nix
similarity index 100%
rename from modules/storagebox.nix
rename to nixosModules/storagebox.nix
diff --git a/modules/tailscale.nix b/nixosModules/tailscale.nix
similarity index 100%
rename from modules/tailscale.nix
rename to nixosModules/tailscale.nix
diff --git a/modules/user-rpqt.nix b/nixosModules/user-rpqt.nix
similarity index 100%
rename from modules/user-rpqt.nix
rename to nixosModules/user-rpqt.nix
diff --git a/modules/vaultwarden.nix b/nixosModules/vaultwarden.nix
similarity index 100%
rename from modules/vaultwarden.nix
rename to nixosModules/vaultwarden.nix