From 4046339f5bf8ef1fd1249a8ef52bacf339224fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Fri, 21 Mar 2025 09:07:43 +0100
Subject: [PATCH] get ready for VPNing to germany

---
 configs/admin-essentials.nix     | 1 +
 configs/ssh.nix                  | 5 +----
 configs/sshd.nix                 | 4 +++-
 systems/zaatar/configuration.nix | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configs/admin-essentials.nix b/configs/admin-essentials.nix
index 785f33d..ad1c0c3 100644
--- a/configs/admin-essentials.nix
+++ b/configs/admin-essentials.nix
@@ -15,6 +15,7 @@ in {
       pkgs.unzip
       pkgs.unrar
       pkgs.p7zip
+      pkgs.sshuttle
       pkgs.zip
       # MONITORS
       pkgs.iftop # interface bandwidth monitor
diff --git a/configs/ssh.nix b/configs/ssh.nix
index a5e87a0..566da63 100644
--- a/configs/ssh.nix
+++ b/configs/ssh.nix
@@ -2,10 +2,7 @@
   inherit (import ../lib) sshPort kieran;
   externalNetwork = import ../lib/external-network.nix;
 in {
-  users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys ++ [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPoiRIn1dBUtpApcUyGbZKN+m5KBSgKIDQjdnQ8vU0xU kfm@kibbeh" # travel laptop
-  ];
-
+  users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys;
   programs.ssh.startAgent = true;
 
   home-manager.users.me = {
diff --git a/configs/sshd.nix b/configs/sshd.nix
index 9021643..3f1900f 100644
--- a/configs/sshd.nix
+++ b/configs/sshd.nix
@@ -17,5 +17,7 @@ in {
     };
   };
 
-  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys;
+  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys ++ [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPoiRIn1dBUtpApcUyGbZKN+m5KBSgKIDQjdnQ8vU0xU kfm@kibbeh" # travel laptop
+  ];
 }
diff --git a/systems/zaatar/configuration.nix b/systems/zaatar/configuration.nix
index 3884191..46ffbf3 100644
--- a/systems/zaatar/configuration.nix
+++ b/systems/zaatar/configuration.nix
@@ -82,6 +82,7 @@ in {
     pkgs.vim
     pkgs.htop
     pkgs.ncmpcpp
+    pkgs.python3 # for sshuttle
   ];
 
   # since 22.05 timeout fails?