Skip to content

Commit d269ad0

Browse files
committed
make disko-install work
Tested with `disko-install -f .#kobudai --disk main /dev/sda`.
1 parent 6748856 commit d269ad0

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

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

@@ -49,9 +50,10 @@ in
4950

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

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

modules/motd.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ 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}${builtins.concatStringsSep ", " config.deployment.tags or [ ]}${ansi-resetfg} at ${ansi-red}169.229.226.${builtins.toString config.ocf.network.lastOctet}${ansi-reset}.
3131
3232
${cfg.description}
3333
'';

profiles/desktop.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
...
99
}:
1010

11-
{
12-
11+
lib.optionalAttrs (options ? "deployment") {
1312
# Colmena tagging
1413
deployment.tags = [ "desktop" ];
14+
}
15+
// {
1516
system.nixos.variant_id = "ocf-desktop";
1617

1718
ocf = {

0 commit comments

Comments
 (0)