From 32421372e4a5effc080e766efe209dd78400e6af Mon Sep 17 00:00:00 2001 From: Haak Saxberg Date: Sat, 28 Jan 2023 22:48:45 -0800 Subject: [PATCH] Specify wifi priorities for each machine based on location --- nix/deployments/nixops.nix | 19 +++++++++++++++---- .../framework/hardware-configuration.nix | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/nix/deployments/nixops.nix b/nix/deployments/nixops.nix index ed57dd0..f39ce00 100644 --- a/nix/deployments/nixops.nix +++ b/nix/deployments/nixops.nix @@ -20,17 +20,13 @@ in networking.wireless.networks."ShamblingHalfling 5Ghz-1" = { pskRaw = ( (import ../system/framework/keys.nix).wifi."ShamblingHalfling 5Ghz-1".pskRaw - ); - priority = 1; }; networking.wireless.networks.N904 = { pskRaw = ( (import ../system/framework/keys.nix).wifi.N904.pskRaw ); - - priority = 2; }; @@ -76,9 +72,17 @@ in deployment.targetHost = "192.168.1.65"; imports = [ ../system/xps11/configuration.nix ]; + networking.wireless.networks."ShamblingHalfling 5Ghz-1" = { + priority = 2; + }; + networking.wireless.networks.N904 = { + priority = 1; + }; + fileSystems."/storage" = { device = "${nasIp}:/storage"; fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" "_netdev" ]; }; }; @@ -91,6 +95,13 @@ in ../home/programs/flood ]; + networking.wireless.networks."ShamblingHalfling 5Ghz-1" = { + priority = 1; + }; + networking.wireless.networks.N904 = { + priority = 2; + }; + 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/framework/hardware-configuration.nix b/nix/system/framework/hardware-configuration.nix index d4e22a5..df3cf30 100644 --- a/nix/system/framework/hardware-configuration.nix +++ b/nix/system/framework/hardware-configuration.nix @@ -29,7 +29,7 @@ fileSystems."/storage" = { device = "192.168.1.168:/storage"; fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; + options = [ "x-systemd.automount" "noauto" "_netdev" ]; }; swapDevices =