summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/eostre/default.nix (renamed from hosts/eos/default.nix)13
-rw-r--r--hosts/eostre/ruleset.nft (renamed from hosts/eos/ruleset.nft)0
-rw-r--r--hosts/vidhar/network/dhcp/default.nix22
-rw-r--r--hosts/vidhar/samba.nix8
4 files changed, 23 insertions, 20 deletions
diff --git a/hosts/eos/default.nix b/hosts/eostre/default.nix
index 1c5347e7..4aa6473e 100644
--- a/hosts/eos/default.nix
+++ b/hosts/eostre/default.nix
@@ -45,12 +45,12 @@ with lib;
45 networking = { 45 networking = {
46 hostId = "f457b213"; 46 hostId = "f457b213";
47 47
48 domain = "asgard.yggdrasil"; 48 domain = "lan.yggdrasil";
49 search = [ "asgard.yggdrasil" "yggdrasil" ]; 49 search = [ "lan.yggdrasil" "yggdrasil" ];
50 50
51 hosts = { 51 hosts = {
52 "127.0.0.1" = [ "eos.asgard.yggdrasil" "eos" ]; 52 "127.0.0.1" = [ "eostre.lan.yggdrasil" "eostre" ];
53 "::1" = [ "eos.asgard.yggdrasil" "eos" ]; 53 "::1" = [ "eostre.lan.yggdrasil" "eostre" ];
54 }; 54 };
55 55
56 firewall.enable = false; 56 firewall.enable = false;
@@ -67,6 +67,9 @@ with lib;
67 zramSwap.enable = true; 67 zramSwap.enable = true;
68 68
69 system.stateVersion = config.system.nixos.release; # No state 69 system.stateVersion = config.system.nixos.release; # No state
70 security.sudo.extraConfig = ''
71 Defaults lecture = never
72 '';
70 73
71 74
72 time.timeZone = "Europe/Berlin"; 75 time.timeZone = "Europe/Berlin";
@@ -79,7 +82,7 @@ with lib;
79 security.pam.mount = { 82 security.pam.mount = {
80 enable = true; 83 enable = true;
81 extraVolumes = [ 84 extraVolumes = [
82 "<volume sgrp=\"users\" fstype=\"cifs\" server=\"vidhar.lan.yggdrasil\" path=\"home-eos\" mountpoint=\"~\" />" 85 "<volume sgrp=\"users\" fstype=\"cifs\" server=\"vidhar.lan.yggdrasil\" path=\"home-eostre\" mountpoint=\"~\" />"
83 "<volume sgrp=\"users\" fstype=\"cifs\" server=\"vidhar.lan.yggdrasil\" path=\"%(USER)\" mountpoint=\"/run/media/%(USER)/vidhar\" />" 86 "<volume sgrp=\"users\" fstype=\"cifs\" server=\"vidhar.lan.yggdrasil\" path=\"%(USER)\" mountpoint=\"/run/media/%(USER)/vidhar\" />"
84 ]; 87 ];
85 }; 88 };
diff --git a/hosts/eos/ruleset.nft b/hosts/eostre/ruleset.nft
index 7b38a059..7b38a059 100644
--- a/hosts/eos/ruleset.nft
+++ b/hosts/eostre/ruleset.nft
diff --git a/hosts/vidhar/network/dhcp/default.nix b/hosts/vidhar/network/dhcp/default.nix
index d3407f1d..1c29dc6a 100644
--- a/hosts/vidhar/network/dhcp/default.nix
+++ b/hosts/vidhar/network/dhcp/default.nix
@@ -23,10 +23,10 @@ with lib;
23 }; 23 };
24 24
25 client-classes = [ 25 client-classes = [
26 { name = "eos-ipxe"; 26 { name = "eostre-ipxe";
27 test = "hexstring(pkt4.mac, ':') == '00:d8:61:79:c5:40' and option[77].hex == 'iPXE'"; 27 test = "hexstring(pkt4.mac, ':') == '00:d8:61:79:c5:40' and option[77].hex == 'iPXE'";
28 next-server = "10.141.0.1"; 28 next-server = "10.141.0.1";
29 boot-file-name = "http://nfsroot.vidhar.yggdrasil/eos/netboot.ipxe"; 29 boot-file-name = "http://nfsroot.vidhar.yggdrasil/eostre/netboot.ipxe";
30 only-if-required = true; 30 only-if-required = true;
31 } 31 }
32 { name = "ipxe"; 32 { name = "ipxe";
@@ -266,21 +266,21 @@ with lib;
266 ) ["x86_64-linux"] 266 ) ["x86_64-linux"]
267 ) ++ [ 267 ) ++ [
268 (let 268 (let
269 eosBuild = (flake.nixosConfigurations.eos.extendModules { 269 eostreBuild = (flake.nixosConfigurations.eostre.extendModules {
270 modules = [ 270 modules = [
271 ({ ... }: { 271 ({ ... }: {
272 config.nfsroot.storeDevice = "10.141.0.1:nix-store"; 272 config.nfsroot.storeDevice = "10.141.0.1:nix-store";
273 config.nfsroot.registrationUrl = "http://nfsroot.vidhar.yggdrasil/eos/registration"; 273 config.nfsroot.registrationUrl = "http://nfsroot.vidhar.yggdrasil/eostre/registration";
274 }) 274 })
275 ]; 275 ];
276 }).config.system.build; 276 }).config.system.build;
277 in builtins.toPath (pkgs.runCommandLocal "eos" {} '' 277 in builtins.toPath (pkgs.runCommandLocal "eostre" {} ''
278 mkdir -p $out/eos 278 mkdir -p $out/eostre
279 install -m 0444 -t $out/eos \ 279 install -m 0444 -t $out/eostre \
280 ${eosBuild.initialRamdisk}/initrd \ 280 ${eostreBuild.initialRamdisk}/initrd \
281 ${eosBuild.kernel}/bzImage \ 281 ${eostreBuild.kernel}/bzImage \
282 ${eosBuild.netbootIpxeScript}/netboot.ipxe \ 282 ${eostreBuild.netbootIpxeScript}/netboot.ipxe \
283 ${pkgs.closureInfo { rootPaths = eosBuild.storeContents; }}/registration 283 ${pkgs.closureInfo { rootPaths = eostreBuild.storeContents; }}/registration
284 '')) 284 ''))
285 ]; 285 ];
286 }; 286 };
diff --git a/hosts/vidhar/samba.nix b/hosts/vidhar/samba.nix
index ffca9c6d..506edaae 100644
--- a/hosts/vidhar/samba.nix
+++ b/hosts/vidhar/samba.nix
@@ -40,10 +40,10 @@
40 writeable = "true"; 40 writeable = "true";
41 path = "/srv/eos"; 41 path = "/srv/eos";
42 }; 42 };
43 home-eos = { 43 home-eostre = {
44 comment = "Home directoriy for %u on PXE booted EOS"; 44 comment = "Home directoriy for %u on PXE booted eostre";
45 path = "/srv/cifs/home-eos/%u"; 45 path = "/srv/cifs/home-eostre/%u";
46 volume = "%u@eos"; 46 volume = "%u@eostre";
47 browseable = true; 47 browseable = true;
48 "read only" = false; 48 "read only" = false;
49 "create mask" = "0700"; 49 "create mask" = "0700";