From 92fbbafc3e0ffa3a8ac5b47cb8f2b963a46a80bb Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@cock.li>
Date: Thu, 20 Jul 2023 13:41:31 +0200
Subject: [PATCH] ssh and mullvad changes

---
 homes/jacek/default.nix                         | 1 -
 hosts/niks/configuration.nix                    | 1 -
 hosts/niks/default.nix                          | 3 ++-
 hosts/niks/{mullvad.nix => mullvad/default.nix} | 8 ++++++++
 hosts/niks/ssh/default.nix                      | 2 ++
 5 files changed, 12 insertions(+), 3 deletions(-)
 rename hosts/niks/{mullvad.nix => mullvad/default.nix} (68%)

diff --git a/homes/jacek/default.nix b/homes/jacek/default.nix
index 8697a6f..73140a8 100644
--- a/homes/jacek/default.nix
+++ b/homes/jacek/default.nix
@@ -52,7 +52,6 @@
                 telegram-desktop
                 livecaptions
                 gimp
-                mullvad-vpn
                 helvum
                 ddccontrol
                 ddccontrol-db
diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix
index 2d35f3e..e68de94 100644
--- a/hosts/niks/configuration.nix
+++ b/hosts/niks/configuration.nix
@@ -123,7 +123,6 @@ in
             };
         };
         blueman.enable = true;
-        mullvad-vpn.enable = true;
     };
 
     hardware = {
diff --git a/hosts/niks/default.nix b/hosts/niks/default.nix
index e445b57..79af3df 100644
--- a/hosts/niks/default.nix
+++ b/hosts/niks/default.nix
@@ -2,6 +2,7 @@ _: {
     imports = [
         ./configuration.nix
         ./hardware-configuration.nix
-        ./mullvad.nix
+        ./mullvad
+        ./ssh
     ];
 }
diff --git a/hosts/niks/mullvad.nix b/hosts/niks/mullvad/default.nix
similarity index 68%
rename from hosts/niks/mullvad.nix
rename to hosts/niks/mullvad/default.nix
index aea1c79..175fbce 100644
--- a/hosts/niks/mullvad.nix
+++ b/hosts/niks/mullvad/default.nix
@@ -3,6 +3,14 @@
     pkgs,
     ...
 }: {
+    environment.systemPackages = with pkgs; [ mullvad-vpn mullvad ];
+
+    services.mullvad-vpn = {
+        enable = true;
+        package = pkgs.mullvad-vpn;
+        enableExcludeWrapper = false;
+    };
+
     systemd.services."mullvad-daemon".postStart = let
         mullvad = config.services.mullvad-vpn.package;
     in ''
diff --git a/hosts/niks/ssh/default.nix b/hosts/niks/ssh/default.nix
index 7dfd489..289439a 100644
--- a/hosts/niks/ssh/default.nix
+++ b/hosts/niks/ssh/default.nix
@@ -3,6 +3,8 @@
     pkgs,
     ...
 }: {
+    imports = [ ./ssh-agent.nix ];
+
     services.openssh = {
         enable = true;
         settings.PasswordAuthentication = false;