diff --git a/nix/deployments/nixops.nix b/nix/deployments/nixops.nix index 2ef5bdb..1adfb4d 100644 --- a/nix/deployments/nixops.nix +++ b/nix/deployments/nixops.nix @@ -83,6 +83,11 @@ in ../home/programs/beets ]; + fileSystems."/export/storage" = + { + device = "/storage"; + options = [ "bind" ]; + }; services.nfs.server.enable = true; services.nfs.server.exports = '' /export 192.168.1.0/24(insecure,rw,sync,crossmnt,no_subtree_check,fsid=0) diff --git a/nix/system/svalbard/configuration.nix b/nix/system/svalbard/configuration.nix index 4c9eed1..323bc50 100644 --- a/nix/system/svalbard/configuration.nix +++ b/nix/system/svalbard/configuration.nix @@ -38,6 +38,17 @@ # Set your time zone. time.timeZone = "America/Los_Angeles"; + services.udev.packages = [ + (pkgs.writeTextFile { + name = "dev-device-no-auto-name"; + text = '' + SUBSYSTEM=="net", ACTION=="add", DEVTYPE!=="?*", ATTR{address}=="04:7c:16:10:27:5e", NAME="eth0" + ''; + + destination = "/etc/udev/rules.d/70-persistent-net.rules"; + }) + ]; + # Select internationalisation properties. i18n.defaultLocale = "en_US.utf8"; diff --git a/nix/system/svalbard/hardware-configuration.nix b/nix/system/svalbard/hardware-configuration.nix index 726fd80..3a6ba77 100644 --- a/nix/system/svalbard/hardware-configuration.nix +++ b/nix/system/svalbard/hardware-configuration.nix @@ -22,16 +22,10 @@ fileSystems."/storage" = { - device = "storage-pool/main"; + device = "rpool/storage"; fsType = "zfs"; }; - fileSystems."/export/storage" = - { - device = "/storage"; - options = [ "bind" ]; - }; - fileSystems."/boot/efi" = { device = "/dev/disk/by-uuid/5099-A753";