common/base-server/default.nix

@@ -11,7 +11,6 @@ in
     time.timeZone = "Etc/UTC";
 
     # Allow remote deployment with colmena
-    deployment.targetUser = null;
     security.sudo.wheelNeedsPassword = false;
     nix.settings.trusted-users = [ "@wheel" ];
   };

flake.nix

@@ -64,35 +64,33 @@
         specialArgs = { inherit inputs; };
       };
 
-      defaults = { config, lib, pkgs, ... }: {
+      defaults.imports = [
-        # disable remote deployment by default
+        home-manager.nixosModules.home-manager
-        # (can stil build locally with nixos-rebuild)
+        nur.nixosModules.nur
-        deployment.targetHost = lib.mkDefault null;
+        { nixpkgs.overlays = [ nur.overlay ]; }
-
+        agenix.nixosModules.default
-        # TODO: set up some remote builders
+        birdsong.nixosModules.default
-        # until this is done, as we have multiple architectures, safer to build on target
+        ./common
-        deployment.buildOnTarget = true;
+        ./services
-
+      ];
-        imports = [
-          home-manager.nixosModules.home-manager
-          nur.nixosModules.nur
-          { nixpkgs.overlays = [ nur.overlay ]; }
-          agenix.nixosModules.default
-          birdsong.nixosModules.default
-          ./common
-          ./services
-        ];
-      };
-
-      yevaud.deployment.targetHost = "yevaud.birdsong.network";
-      orm.deployment.targetHost = "orm.birdsong.network";
-      kalessin.deployment.targetHost = "kalessin.birdsong.network";
 
       kilgharrah.imports = [ ./hosts/kilgharrah ];
       tohru.imports = [ ./hosts/tohru ];
       yevaud.imports = [ ./hosts/yevaud ];
       orm.imports = [ ./hosts/orm ];
       kalessin.imports = [ ./hosts/kalessin ];
+
+      defaults.deployment = {
+        allowLocalDeployment = true;
+        buildOnTarget = true;
+        targetUser = null;
+      };
+
+      kilgharrah.deployment.targetHost = null;
+      tohru.deployment.targetHost = null;
+      yevaud.deployment.targetHost = "yevaud.birdsong.network";
+      orm.deployment.targetHost = "orm.birdsong.network";
+      kalessin.deployment.targetHost = "kalessin.birdsong.network";
     };
 
     # TODO: have this work on other systems too

hosts/kilgharrah/default.nix

@@ -35,9 +35,6 @@
       tor-browser-bundle-bin
       zoom-us
     ];
-
-    # For the moment, this hosts some network-accessible services, so we want it on 24/7
-    programs.plasma.powerdevil.AC.autoSuspend.action = "nothing";
   };
 
   programs.steam.enable = true;