diff --git a/configuration.nix b/configuration.nix index 1904783..8de343f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -23,9 +23,18 @@ networking.hostName = "NxXPS"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + networking.networkmanager.enable = true; + environment.etc = { + # easyroam HSMW + "ssl/certs/easyroam_client_cert.pem".source = ./secrets/easyroam-hsmw/easyroam_client_cert.pem; + "ssl/certs/easyroam_root_ca.pem".source = ./secrets/easyroam-hsmw/easyroam_root_ca.pem; + "ssl/certs/easyroam_client_key.pem".source = ./secrets/easyroam-hsmw/easyroam_client_key.pem; + "NetworkManager/system-connections/eduroam.nmconnection" = { + text = secrets.easyroamHSMW.nmconfig; + mode = "0600"; + }; + }; # Set your time zone. time.timeZone = "Europe/Berlin"; diff --git a/home.nix b/home.nix index 95b2cf2..644278e 100644 --- a/home.nix +++ b/home.nix @@ -88,18 +88,6 @@ # }; - # NETWORKING - home.file = { - # easyroam HSMW - ".ssl/easyroam_client_cert.pem".source = ./secrets/easyroam-hsmw/easyroam_client_cert.pem; - ".ssl/easyroam_root_ca.pem".source = ./secrets/easyroam-hsmw/easyroam_root_ca.pem; - ".ssl/easyroam_client_key.pem".source = ./secrets/easyroam-hsmw/easyroam_client_key.pem; - }; - networking.networkmanager.extraConfig = concatStringsSep "\n" [ - secrets.eduroamHSMW.nmconfig - ]; - - home.file = { # ".config/libinput/gestures".text = '' diff --git a/secrets/passwords-and-certificates.nix b/secrets/passwords-and-certificates.nix index 97ddf2e..038fa55 100644 Binary files a/secrets/passwords-and-certificates.nix and b/secrets/passwords-and-certificates.nix differ