From 8e45ad0537ba6877a751502dd46e5966fd7ef574 Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Fri, 6 Jun 2025 11:43:27 +0200
Subject: [PATCH] move stuff out of /sys/profiles/*/default.nix

---
 hosts/hopper/default.nix                  |  2 +-
 hosts/nixdesk/default.nix                 |  5 +++--
 sys/profiles/nix/{default.nix => nix.nix} |  0
 sys/profiles/services/dbus-broker.nix     |  3 +++
 sys/profiles/services/default.nix         | 10 ----------
 sys/profiles/services/psd.nix             |  3 +++
 6 files changed, 10 insertions(+), 13 deletions(-)
 rename sys/profiles/nix/{default.nix => nix.nix} (100%)
 create mode 100644 sys/profiles/services/dbus-broker.nix
 delete mode 100644 sys/profiles/services/default.nix
 create mode 100644 sys/profiles/services/psd.nix

diff --git a/hosts/hopper/default.nix b/hosts/hopper/default.nix
index 5828c18..c5d7f0b 100644
--- a/hosts/hopper/default.nix
+++ b/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
diff --git a/hosts/nixdesk/default.nix b/hosts/nixdesk/default.nix
index b2607c5..7d0c12b 100644
--- a/hosts/nixdesk/default.nix
+++ b/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
diff --git a/sys/profiles/nix/default.nix b/sys/profiles/nix/nix.nix
similarity index 100%
rename from sys/profiles/nix/default.nix
rename to sys/profiles/nix/nix.nix
diff --git a/sys/profiles/services/dbus-broker.nix b/sys/profiles/services/dbus-broker.nix
new file mode 100644
index 0000000..7d270b2
--- /dev/null
+++ b/sys/profiles/services/dbus-broker.nix
@@ -0,0 +1,3 @@
+{
+  services.dbus.implementation = "broker";
+}
diff --git a/sys/profiles/services/default.nix b/sys/profiles/services/default.nix
deleted file mode 100644
index 32cccdb..0000000
--- a/sys/profiles/services/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  services = {
-    dbus.implementation = "broker";
-
-    psd = {
-      enable = true;
-      resyncTimer = "10m";
-    };
-  };
-}
diff --git a/sys/profiles/services/psd.nix b/sys/profiles/services/psd.nix
new file mode 100644
index 0000000..b14edc1
--- /dev/null
+++ b/sys/profiles/services/psd.nix
@@ -0,0 +1,3 @@
+{
+  services.psd.enable = true;
+}