Merge branch 'disko-install-fix' into trenderhoof

Author: BNH440

.github/workflows/manual-deploy.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       hosts:
-        description: 'Comma separated hostnames or tags (ex: @desktop) to deploy'
+        description: 'Comma separated hostnames or tags (ex: @desktops) to deploy'
         required: true
         type: string
 

modules/managed-deployment.nix

@@ -2,6 +2,7 @@
   pkgs,
   lib,
   config,
+  options,
   ...
 }:
 
@@ -49,9 +50,10 @@ in
 
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
-      {
+      (lib.optionalAttrs (options ? "deployment") {
         deployment.allowLocalDeployment = true; # for debugging and deploying when github actions deployment breaks
-
+      })
+      {
         nix.settings.trusted-users = [ deploy-user ];
 
         users.groups.${deploy-user} = { };

modules/motd.nix

@@ -27,7 +27,9 @@ in
   # TODO: make this read from LDAP
   config = lib.mkIf cfg.enable {
     users.motd = ''
-      ${ansi-bold}Hi, I am ${ansi-red}${config.networking.hostName}${ansi-resetfg}, a ${ansi-red}${builtins.concatStringsSep ", " config.deployment.tags}${ansi-resetfg} at ${ansi-red}169.229.226.${builtins.toString config.ocf.network.lastOctet}${ansi-reset}.
+      ${ansi-bold}Hi, I am ${ansi-red}${config.networking.hostName}${ansi-resetfg}, a ${ansi-red}${
+        builtins.concatStringsSep ", " config.deployment.tags or [ ]
+      }${ansi-resetfg} at ${ansi-red}169.229.226.${builtins.toString config.ocf.network.lastOctet}${ansi-reset}.
 
       ${cfg.description}
     '';

profiles/desktop.nix

@@ -9,9 +9,6 @@
 }:
 
 {
-
-  # Colmena tagging
-  deployment.tags = [ "desktop" ];
   system.nixos.variant_id = "ocf-desktop";
 
   ocf = {