move stuff out of /sys/profiles/*/default.nix

hosts/hopper/default.nix

@@ -42,7 +42,7 @@
       /hardware/steam-hardware.nix
       /hardware/bluetooth.nix
 
-      /nix/default.nix # TODO slim this down
+      /nix/nix.nix
       /nix/gc.nix
 
       /network/tailscale.nix

hosts/nixdesk/default.nix

@@ -37,7 +37,6 @@
       /core/users.nix
       /core/ssh.nix
       /core/locale.nix
-      /nix
       /programs/zsh.nix
       /programs/fish.nix
       /core/tools.nix
@@ -46,6 +45,7 @@
       # core.docs
       /core/gvfs.nix
 
+      /nix/nix.nix
       /nix/gc.nix
 
       /hardware/graphics.nix
@@ -70,7 +70,8 @@
       /programs/tools.nix
       /programs/thunar.nix
 
-      /services
+      /services/psd.nix
+      /services/dbus-broker.nix
       /services/pipewire.nix
       /services/podman.nix
       /services/flatpak.nix

sys/profiles/services/dbus-broker.nix

@@ -0,0 +1,3 @@
+{
+  services.dbus.implementation = "broker";
+}

sys/profiles/services/default.nix

@@ -1,10 +0,0 @@
-{
-  services = {
-    dbus.implementation = "broker";
-
-    psd = {
-      enable = true;
-      resyncTimer = "10m";
-    };
-  };
-}

sys/profiles/services/psd.nix

@@ -0,0 +1,3 @@
+{
+  services.psd.enable = true;
+}