diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/network/default.nix | 3 | ||||
| -rw-r--r-- | modules/network/ssh.nix | 5 | ||||
| -rw-r--r-- | modules/network/wireless.nix | 10 |
3 files changed, 5 insertions, 13 deletions
diff --git a/modules/network/default.nix b/modules/network/default.nix index ee0e25a..8f706c0 100644 --- a/modules/network/default.nix +++ b/modules/network/default.nix @@ -1,6 +1,5 @@ -{ lib, ... }: +{ settings, ... }: let - settings = import ../../settings.nix { inherit lib; }; ports = settings.network.ports; host = settings.network.host; in diff --git a/modules/network/ssh.nix b/modules/network/ssh.nix index f5564bd..25f6f8f 100644 --- a/modules/network/ssh.nix +++ b/modules/network/ssh.nix @@ -1,7 +1,4 @@ -{ lib, ... }: -let - settings = import ../../settings.nix { inherit lib; }; -in +{ settings, ... }: { services.sshd.enable = true; diff --git a/modules/network/wireless.nix b/modules/network/wireless.nix index 7488d9a..aa80c5b 100644 --- a/modules/network/wireless.nix +++ b/modules/network/wireless.nix @@ -1,8 +1,4 @@ -{ lib, ... }: -let - settings = import ../../settings.nix { inherit lib; }; - wireless = settings.network.wireless; -in +{ settings, ... }: { networking.networkmanager = { enable = true; @@ -17,12 +13,12 @@ in }; wifi = { mode = "infrastructure"; - ssid = wireless.ssid; + ssid = settings.network.wireless.ssid; }; wifi-security = { auth-alg = "open"; key-mgmt = "wpa-psk"; - psk = wireless.password; + psk = settings.network.wireless.password; }; }; }; |
