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;
     networking = {
       hostId = "f457b213";
 
-      domain = "asgard.yggdrasil";
-      search = [ "asgard.yggdrasil" "yggdrasil" ];
+      domain = "lan.yggdrasil";
+      search = [ "lan.yggdrasil" "yggdrasil" ];
 
       hosts = {
-        "127.0.0.1" = [ "eos.asgard.yggdrasil" "eos" ];
-        "::1" = [ "eos.asgard.yggdrasil" "eos" ];
+        "127.0.0.1" = [ "eostre.lan.yggdrasil" "eostre" ];
+        "::1" = [ "eostre.lan.yggdrasil" "eostre" ];
       };
 
       firewall.enable = false;
@@ -67,6 +67,9 @@ with lib;
     zramSwap.enable = true;
 
     system.stateVersion = config.system.nixos.release; # No state
+    security.sudo.extraConfig = ''
+      Defaults lecture = never
+    '';
 
 
     time.timeZone = "Europe/Berlin";
@@ -79,7 +82,7 @@ with lib;
     security.pam.mount = {
       enable = true;
       extraVolumes = [
-        "<volume sgrp=\"users\" fstype=\"cifs\" server=\"vidhar.lan.yggdrasil\" path=\"home-eos\" mountpoint=\"~\" />"
+        "<volume sgrp=\"users\" fstype=\"cifs\" server=\"vidhar.lan.yggdrasil\" path=\"home-eostre\" mountpoint=\"~\" />"
         "<volume sgrp=\"users\" fstype=\"cifs\" server=\"vidhar.lan.yggdrasil\" path=\"%(USER)\" mountpoint=\"/run/media/%(USER)/vidhar\" />"
       ];
     };
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;
           };
 
           client-classes = [
-            { name = "eos-ipxe";
+            { name = "eostre-ipxe";
               test = "hexstring(pkt4.mac, ':') == '00:d8:61:79:c5:40' and option[77].hex == 'iPXE'";
               next-server = "10.141.0.1";
-              boot-file-name = "http://nfsroot.vidhar.yggdrasil/eos/netboot.ipxe";
+              boot-file-name = "http://nfsroot.vidhar.yggdrasil/eostre/netboot.ipxe";
               only-if-required = true;
             }
             { name = "ipxe";
@@ -266,21 +266,21 @@ with lib;
               ) ["x86_64-linux"]
             ) ++ [
               (let
-                 eosBuild = (flake.nixosConfigurations.eos.extendModules {
+                 eostreBuild = (flake.nixosConfigurations.eostre.extendModules {
                    modules = [
                      ({ ... }: {
                        config.nfsroot.storeDevice = "10.141.0.1:nix-store";
-                       config.nfsroot.registrationUrl = "http://nfsroot.vidhar.yggdrasil/eos/registration";
+                       config.nfsroot.registrationUrl = "http://nfsroot.vidhar.yggdrasil/eostre/registration";
                      })
                    ];
                  }).config.system.build;
-               in builtins.toPath (pkgs.runCommandLocal "eos" {} ''
-                    mkdir -p $out/eos
-                    install -m 0444 -t $out/eos \
-                      ${eosBuild.initialRamdisk}/initrd \
-                      ${eosBuild.kernel}/bzImage \
-                      ${eosBuild.netbootIpxeScript}/netboot.ipxe \
-                      ${pkgs.closureInfo { rootPaths = eosBuild.storeContents; }}/registration
+               in builtins.toPath (pkgs.runCommandLocal "eostre" {} ''
+                    mkdir -p $out/eostre
+                    install -m 0444 -t $out/eostre \
+                      ${eostreBuild.initialRamdisk}/initrd \
+                      ${eostreBuild.kernel}/bzImage \
+                      ${eostreBuild.netbootIpxeScript}/netboot.ipxe \
+                      ${pkgs.closureInfo { rootPaths = eostreBuild.storeContents; }}/registration
                   ''))
             ];
         };
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 @@
           writeable = "true";
           path = "/srv/eos";
         };
-        home-eos = {
-          comment = "Home directoriy for %u on PXE booted EOS";
-          path = "/srv/cifs/home-eos/%u";
-          volume = "%u@eos";
+        home-eostre = {
+          comment = "Home directoriy for %u on PXE booted eostre";
+          path = "/srv/cifs/home-eostre/%u";
+          volume = "%u@eostre";
           browseable = true;
           "read only" = false;
           "create mask" = "0700";