Skip to content

Commit 81b2892

Browse files
dotlambdaBNH440
authored andcommitted
make disko-install work
Tested with `disko-install -f .#kobudai --disk main /dev/sda`.
1 parent 081bfbc commit 81b2892

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

.github/workflows/manual-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
inputs:
66
hosts:
7-
description: 'Comma separated hostnames or tags (ex: @desktop) to deploy'
7+
description: 'Comma separated hostnames or tags (ex: @desktops) to deploy'
88
required: true
99
type: string
1010

modules/managed-deployment.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
pkgs,
33
lib,
44
config,
5+
options,
56
...
67
}:
78

@@ -48,9 +49,10 @@ in
4849

4950
config = lib.mkIf cfg.enable (
5051
lib.mkMerge [
51-
{
52+
(lib.optionalAttrs (options ? "deployment") {
5253
deployment.allowLocalDeployment = true; # for debugging and deploying when github actions deployment breaks
53-
54+
})
55+
{
5456
nix.settings.trusted-users = [ deploy-user ];
5557

5658
users.groups.${deploy-user} = { };

modules/motd.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ in
2727
# TODO: make this read from LDAP
2828
config = lib.mkIf cfg.enable {
2929
users.motd = ''
30-
${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}.
30+
${ansi-bold}Hi, I am ${ansi-red}${config.networking.hostName}${ansi-resetfg}, a ${ansi-red}${
31+
builtins.concatStringsSep ", " config.deployment.tags or [ ]
32+
}${ansi-resetfg} at ${ansi-red}169.229.226.${builtins.toString config.ocf.network.lastOctet}${ansi-reset}.
3133
3234
${cfg.description}
3335
'';

profiles/desktop.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
}:
1010

1111
{
12-
13-
# Colmena tagging
14-
deployment.tags = [ "desktop" ];
1512
system.nixos.variant_id = "ocf-desktop";
1613

1714
ocf = {

0 commit comments

Comments
 (0)