Compare commits

..
Author SHA1 Message Date
ahtlon 63ed818794 [initssh] document new option
Hydra callback / on_push (pull_request) Skipped
Hydra callback / on_pr (pull_request) Successful in 4m26s
Check flake syntax / flake-check (push) Successful in 23m8s
2026-10-27 13:02:08 +01:00
ahtlon d01b140ae0 [initssh] set static ip 2026-10-27 13:02:08 +01:00
ahtlon ce09e8003e Merge pull request 'Upgrade nextcloud to v34' (#205) from nextcloud_upgrade_34 into master
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
Check flake syntax / flake-check (push) Successful in 24m58s
Reviewed-on: #205
2026-10-23 00:21:38 +02:00
5 changed files with 21 additions and 2 deletions
+11 -1
View File
@@ -26,4 +26,14 @@ Run ` lspci -k | grep -iA4 ethernet `
` [ ] `
*Example:*
`[ "r8169" ]`
`[ "r8169" ]`
## cfg.ip
I hate DHCP! Set static ip or ip = hosts.malobeo.hosts.${hostname}.network.address;
*Default:*
`Null` - Will error when not set
*Example:*
`hosts.malobeo.hosts.fanny.network.address;`
+1
View File
@@ -72,6 +72,7 @@ in
enable = true;
authorizedKeys = sshKeys.admins;
ethernetDrivers = ["e1000e"];
ip = hosts.malobeo.hosts.albert.network.address;
};
services.malobeo.vpn = {
+3
View File
@@ -2,6 +2,8 @@
let
sshKeys = import ../ssh_keys.nix;
hosts = import ../hosts.nix {};
in
{
imports =
@@ -35,6 +37,7 @@ in
enable = true;
authorizedKeys = sshKeys.admins;
ethernetDrivers = ["r8169"];
ip = hosts.malobeo.hosts.bakunin.network.address;
};
malobeo.users.malobeo = true;
+1
View File
@@ -90,6 +90,7 @@ in
authorizedKeys = sshKeys.admins;
ethernetDrivers = ["r8169"];
zfsExtraPools = [ "storage" ];
ip = hosts.malobeo.hosts.fanny.network.address;
};
boot.initrd = {
+5 -1
View File
@@ -27,6 +27,10 @@ in
default = [ ];
description = "Name or GUID of extra ZFS pools that you wish to import during boot.";
};
ip = lib.mkOption {
type = lib.types.str;
description = "The requested static ip for the machine";
};
};
config = lib.mkIf (cfg.enable && config.malobeo.disks.encryption) {
@@ -73,7 +77,7 @@ in
"/etc/ssh/initrd" = "/etc/ssh/initrd";
};
};
kernelParams = [ "ip=::::${hostName}-initrd::dhcp" ];
kernelParams = [ "ip=${cfg.ip}::::${hostName}::" ];
};
};
}