From 346849560688466048d203c7772010a3c4257916 Mon Sep 17 00:00:00 2001 From: Haak Saxberg Date: Thu, 15 Sep 2022 22:33:54 -0700 Subject: [PATCH] use default config section for network config --- nix/deployments/nixops.nix | 46 ++++++++++++++------------------------ 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/nix/deployments/nixops.nix b/nix/deployments/nixops.nix index 06974d7..1bbed69 100644 --- a/nix/deployments/nixops.nix +++ b/nix/deployments/nixops.nix @@ -17,6 +17,23 @@ 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; + }; + + documentation.enable = false; # for nixops to log in and perform operations as haak (instead of root) @@ -59,22 +76,6 @@ in deployment.targetHost = "192.168.1.65"; imports = [ ../system/xps11/configuration.nix ]; - 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; - }; - fileSystems."/storage" = { device = "${nasIp}:/storage"; fsType = "nfs"; @@ -89,20 +90,7 @@ in ../system/svalbard/configuration.nix ../home/programs/flood ]; - 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; }; services.nfs.server.enable = true;