From d92abb87c06b83088d7693e025d8ad624e7deaea Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 13 May 2023 23:40:12 +0200
Subject: ...

---
 accounts/gkleen@sif/ssh-hosts.nix    | 4 ++++
 accounts/gkleen@sif/xmonad/xmonad.hs | 2 +-
 hosts/sif/default.nix                | 8 +++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index edfe46a0..bae0f5b8 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -499,6 +499,10 @@
         }
       ];
     };
+  "gitlab.uniworx.de" =
+    { user = "git";
+      identityFile = "~/.ssh/gkleen@gitlab.uniworx.de";
+    };
   "col-crpd01" =
     { hostname = "col-crpd01.mathinst.loc";
       proxyJump = "mgmt01";
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs
index befaeb23..d6e32aab 100644
--- a/accounts/gkleen@sif/xmonad/xmonad.hs
+++ b/accounts/gkleen@sif/xmonad/xmonad.hs
@@ -896,7 +896,7 @@ myKeys' conf host = Map.fromList $
           safeSpawn "loginctl" ["lock-session", sessId]
       )
     , ((modm .|. shiftMask, xK_s     ), safeSpawn "systemctl" ["suspend"])
-    , ((modm .|. shiftMask, xK_h     ), safeSpawn "systemctl" ["hibernate"])
+    , ((modm .|. shiftMask, xK_h     ), safeSpawn "systemctl" ["poweroff"])
     , ((modm, xK_v ), windows copyToAll) -- @@ Make focused window always visible
     , ((modm .|. shiftMask, xK_v ),  killAllOtherCopies) -- @@ Toggle window state back
     , ((modm .|. shiftMask, xK_g     ), windowPrompt xPConfig Goto wsWindows)
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 3417d53e..a03b79ec 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -179,7 +179,7 @@ in {
           };
           wireguardPeers = [
             { wireguardPeerConfig = {
-                AllowedIPs = [ "10.200.116.1/32" ] ++ mwnSubnetsPrivate ++ mwnSubnetsPublic;
+                AllowedIPs = [ "10.200.116.1/32" "10.163.88.40/32" ] ++ mwnSubnetsPrivate ++ mwnSubnetsPublic;
                 PublicKey = "YlRFLc+rD2k2KXl7pIJbOKbcPgdJCl8ZTsv0xlK4VEI=";
                 PersistentKeepalive = 25;
                 Endpoint = "wg.math.lmu.de:51820";
@@ -228,6 +228,12 @@ in {
                 Priority = 200;
               };
             }
+            { routingPolicyRuleConfig = {
+                Table = "wgrz";
+                To = "10.163.88.40";
+                Priority = 200;
+              };
+            }
           ] ++ map (To: { routingPolicyRuleConfig = {
                             Table = "wgrz";
                             inherit To;
-- 
cgit v1.2.3