ssh, calendars

home/calendars.nix

@@ -3,7 +3,7 @@
 let
 
   myRemote = slug: {
-    passwordCommand = [ "secret-tool" "lookup" "server" "kalender.ktiu.net" "account" "ktiu" ];
+    passwordCommand = [ "pass" "ktiu/radicale" ];
     userName = "ktiu";
     type = "caldav";
     url = "https://kalender.ktiu.net/ktiu/${slug}";
@@ -127,7 +127,7 @@ in
       remote = {
         type = "caldav";
         url  = "https://cloud.gridisnotajournal.de/remote.php/dav/calendars/till/grid/";
-        passwordCommand = [ "secret-tool" "lookup" "server" "cloud.gridisnotajournal.de" "account" "till" ];
+        passwordCommand = [ "pass" "grid/nextcloud" ];
         userName = "till";
       };
     };

home/ssh.nix

@@ -4,6 +4,7 @@
   programs.ssh = {
 
     enable = true;
+    enableDefaultConfig = false;
 
     matchBlocks = {
 

system/desktop.nix

@@ -9,7 +9,10 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.networkmanager.enable = true;
+  networking.networkmanager = {
+    enable = true;
+    plugins = with pkgs; [ networkmanager-openvpn ];
+  };
 
   i18n.extraLocaleSettings = {
     LC_TIME = "en_GB.UTF-8";