From 704e14251f81e953e432f1e7e01e8a82feb576d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?m=C3=BCde?= <git@darkest.space>
Date: Sun, 3 May 2026 13:45:51 +0200
Subject: [PATCH 1/3] rename options.muede to options.my

---
 homeModules/gnome-extensions.nix | 4 ++--
 nixosModules/gnome.nix           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeModules/gnome-extensions.nix b/homeModules/gnome-extensions.nix
index 0e6ca16..071fa15 100644
--- a/homeModules/gnome-extensions.nix
+++ b/homeModules/gnome-extensions.nix
@@ -6,7 +6,7 @@
   ...
 }:
 {
-  options.muede.gnome-extensions =
+  options.my.gnome-extensions =
     let
       mkDefaultEnabledOption =
         name:
@@ -40,7 +40,7 @@
 
   config =
     let
-      cfg = config.muede.gnome-extensions;
+      cfg = config.my.gnome-extensions;
     in
     lib.mkIf cfg.enable (
       lib.mkMerge [
diff --git a/nixosModules/gnome.nix b/nixosModules/gnome.nix
index b0bf406..8311373 100644
--- a/nixosModules/gnome.nix
+++ b/nixosModules/gnome.nix
@@ -7,7 +7,7 @@
 {
   options = {
     my.gnome.enable = lib.mkEnableOption "GNOME desktop environment";
-    muede.keep-gnome-default-apps = lib.mkEnableOption "keep gnome default apps";
+    my.gnome.keep-default-apps = lib.mkEnableOption "keep gnome default apps";
   };
 
   config = lib.mkIf config.my.gnome.enable (
@@ -39,7 +39,7 @@
           gpaste.enable = true;
         };
       }
-      (lib.mkIf (!config.muede.keep-gnome-default-apps) {
+      (lib.mkIf (!config.my.gnome.keep-default-apps) {
         environment.gnome.excludePackages = with pkgs; [
           cheese # photo booth
           epiphany # web browser

From e394a6e21e642666c4c8c0962bad09834efd02cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?m=C3=BCde?= <git@darkest.space>
Date: Sun, 3 May 2026 13:46:30 +0200
Subject: [PATCH 2/3] distributed builds: fix ssh only accepting build key for
 real

---
 nixosModules/distributed-builds.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixosModules/distributed-builds.nix b/nixosModules/distributed-builds.nix
index 7d5df6e..91341f5 100644
--- a/nixosModules/distributed-builds.nix
+++ b/nixosModules/distributed-builds.nix
@@ -102,11 +102,13 @@ in
       (lib.mkIf isClient {
         programs.ssh = {
           knownHosts = buildServerKnownHosts;
-          extraConfig = ''
-            Match Host ${lib.concatStringsSep " " (lib.attrNames buildServerDevices)} User ${buildUser}
-              IdentityFile ${clientSshKeyPath}
-              IdentitiesOnly yes
-          '';
+          extraConfig = lib.concatStringsSep "\n" (
+            lib.mapAttrsToList (name: _: ''
+              Match host ${name} user ${buildUser}
+                IdentityFile ${clientSshKeyPath}
+                IdentitiesOnly yes
+            '') buildServerDevices
+          );
         };
         nix = {
           distributedBuilds = buildMachines != [ ];

From 95eb2fa1cb95e4065f37888514414402a5adaa1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?m=C3=BCde?= <git@darkest.space>
Date: Sun, 3 May 2026 13:53:11 +0200
Subject: [PATCH 3/3] devices: flag desktps, install tailscale tray if dektop

---
 devices.nix                          | 3 +++
 homeConfigurations/muede/default.nix | 6 +-----
 homeModules/tailscale.nix            | 4 ++++
 nixosConfigurations.nix              | 4 +++-
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 homeModules/tailscale.nix

diff --git a/devices.nix b/devices.nix
index ea3c6f6..0eaa3b0 100644
--- a/devices.nix
+++ b/devices.nix
@@ -38,6 +38,7 @@ in
   };
   muede-lpt2 = {
     system = "x86_64-linux";
+    isDesktop = true;
     home-manager-users = {
       inherit (self.homeConfigurations) muede;
     };
@@ -50,6 +51,7 @@ in
   };
   muede-pc2 = {
     system = "x86_64-linux";
+    isDesktop = true;
     home-manager-users = {
       inherit (self.homeConfigurations) muede;
     };
@@ -63,6 +65,7 @@ in
   };
   ronja-pc = {
     system = "x86_64-linux";
+    isDesktop = true;
     home-manager-users = {
       inherit (self.homeConfigurations) ronja;
     };
diff --git a/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix
index 185476d..87db634 100644
--- a/homeConfigurations/muede/default.nix
+++ b/homeConfigurations/muede/default.nix
@@ -80,7 +80,6 @@
       onefetch
       servicepoint-cli
       servicepoint-simulator
-      tailscale
       telegram-desktop
       thunderbird
       vlc
@@ -93,9 +92,6 @@
       "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
     };
 
-    services = {
-      trayscale.enable = true;
-      poweralertd.enable = true;
-    };
+    services.poweralertd.enable = true;
   };
 }
diff --git a/homeModules/tailscale.nix b/homeModules/tailscale.nix
new file mode 100644
index 0000000..34d1c3d
--- /dev/null
+++ b/homeModules/tailscale.nix
@@ -0,0 +1,4 @@
+{ osConfig, thisDevice, ... }:
+{
+  services.tailscale-systray.enable = (thisDevice.isDesktop or false) && osConfig.my.tailscale.enable;
+}
diff --git a/nixosConfigurations.nix b/nixosConfigurations.nix
index 29e78c3..c0d3a80 100644
--- a/nixosConfigurations.nix
+++ b/nixosConfigurations.nix
@@ -21,6 +21,7 @@ forDevice (
   {
     device,
     system,
+    isDesktop ? false,
     home-manager-users ? { },
     nixosSystem ? inputs.nixpkgs.lib.nixosSystem,
     ...
@@ -87,7 +88,7 @@ forDevice (
         };
       }
     ]
-    ++ lib.optionals (home-manager-users != { }) [
+    ++ lib.optionals isDesktop [
       # Desktop config
       {
         home-manager = {
@@ -100,6 +101,7 @@ forDevice (
             # keep-sorted start
             self.homeModules.gnome-extensions
             self.homeModules.nano
+            self.homeModules.tailscale
             self.homeModules.templates
             self.homeModules.zsh-basics
             # keep-sorted end