devices.nix

@@ -38,7 +38,6 @@ in
   };
   muede-lpt2 = {
     system = "x86_64-linux";
-    isDesktop = true;
     home-manager-users = {
       inherit (self.homeConfigurations) muede;
     };
@@ -51,7 +50,6 @@ in
   };
   muede-pc2 = {
     system = "x86_64-linux";
-    isDesktop = true;
     home-manager-users = {
       inherit (self.homeConfigurations) muede;
     };
@@ -65,7 +63,6 @@ in
   };
   ronja-pc = {
     system = "x86_64-linux";
-    isDesktop = true;
     home-manager-users = {
       inherit (self.homeConfigurations) ronja;
     };

homeConfigurations/muede/default.nix

@@ -80,6 +80,7 @@
       onefetch
       servicepoint-cli
       servicepoint-simulator
+      tailscale
       telegram-desktop
       thunderbird
       vlc
@@ -92,6 +93,9 @@
       "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
     };
 
-    services.poweralertd.enable = true;
+    services = {
+      trayscale.enable = true;
+      poweralertd.enable = true;
+    };
   };
 }

homeModules/gnome-extensions.nix

@@ -6,7 +6,7 @@
   ...
 }:
 {
-  options.my.gnome-extensions =
+  options.muede.gnome-extensions =
     let
       mkDefaultEnabledOption =
         name:
@@ -40,7 +40,7 @@
 
   config =
     let
-      cfg = config.my.gnome-extensions;
+      cfg = config.muede.gnome-extensions;
     in
     lib.mkIf cfg.enable (
       lib.mkMerge [

homeModules/tailscale.nix

@@ -1,4 +0,0 @@
-{ osConfig, thisDevice, ... }:
-{
-  services.tailscale-systray.enable = (thisDevice.isDesktop or false) && osConfig.my.tailscale.enable;
-}

nixosConfigurations.nix

@@ -21,7 +21,6 @@ forDevice (
   {
     device,
     system,
-    isDesktop ? false,
     home-manager-users ? { },
     nixosSystem ? inputs.nixpkgs.lib.nixosSystem,
     ...
@@ -88,7 +87,7 @@ forDevice (
         };
       }
     ]
-    ++ lib.optionals isDesktop [
+    ++ lib.optionals (home-manager-users != { }) [
       # Desktop config
       {
         home-manager = {
@@ -101,7 +100,6 @@ forDevice (
             # keep-sorted start
             self.homeModules.gnome-extensions
             self.homeModules.nano
-            self.homeModules.tailscale
             self.homeModules.templates
             self.homeModules.zsh-basics
             # keep-sorted end

nixosModules/distributed-builds.nix

@@ -102,13 +102,11 @@ in
       (lib.mkIf isClient {
         programs.ssh = {
           knownHosts = buildServerKnownHosts;
-          extraConfig = lib.concatStringsSep "\n" (
-            lib.mapAttrsToList (name: _: ''
-              Match host ${name} user ${buildUser}
+          extraConfig = ''
+            Match Host ${lib.concatStringsSep " " (lib.attrNames buildServerDevices)} User ${buildUser}
               IdentityFile ${clientSshKeyPath}
               IdentitiesOnly yes
-            '') buildServerDevices
-          );
+          '';
         };
         nix = {
           distributedBuilds = buildMachines != [ ];

nixosModules/gnome.nix

@@ -7,7 +7,7 @@
 {
   options = {
     my.gnome.enable = lib.mkEnableOption "GNOME desktop environment";
-    my.gnome.keep-default-apps = lib.mkEnableOption "keep gnome default apps";
+    muede.keep-gnome-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.my.gnome.keep-default-apps) {
+      (lib.mkIf (!config.muede.keep-gnome-default-apps) {
         environment.gnome.excludePackages = with pkgs; [
           cheese # photo booth
           epiphany # web browser