Refactor config to settings.nix and settings.private.nix

2 files changed, 10 insertions, 8 deletions

diff --git a/modules/network/default.nix b/modules/network/default.nix
index 6a3ab69..5a18f37 100644
--- a/modules/network/default.nix
+++ b/modules/network/default.nix
@@ -1,7 +1,8 @@
-{ ... }:
+{ lib, ... }:
 let
-  private = import ../../config.private.nix;
-in {
+  settings = import ../../settings.nix { inherit lib; };
+in
+{
   imports = [ ./ssh.nix ];
 
   networking = {
@@ -21,12 +22,12 @@ in {
           };
           wifi = {
             mode = "infrastructure";
-            ssid = private.wireless.ssid;
+            ssid = settings.network.wireless.ssid;
           };
           wifi-security = {
             auth-alg = "open";
             key-mgmt = "wpa-psk";
-            psk = private.wireless.password;
+            psk = settings.network.wireless.password;
           };
         };
       };
diff --git a/modules/network/ssh.nix b/modules/network/ssh.nix
index 573bdf4..f5564bd 100644
--- a/modules/network/ssh.nix
+++ b/modules/network/ssh.nix
@@ -1,11 +1,12 @@
 { lib, ... }:
 let
-  private = import ../../config.private.nix;
-in {
+  settings = import ../../settings.nix { inherit lib; };
+in
+{
   services.sshd.enable = true;
 
   # Auth
-  users.users.bacchus.openssh.authorizedKeys.keys = private.ssh.authorizedKeys;
+  users.users.bacchus.openssh.authorizedKeys.keys = settings.ssh.authorizedKeys;
   services.openssh.settings = {
     PermitRootLogin = "no";
     PasswordAuthentication = false;