diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2023-05-13 23:40:12 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2023-05-13 23:40:12 +0200 |
| commit | d92abb87c06b83088d7693e025d8ad624e7deaea (patch) | |
| tree | d91f2f8d23ca3d9568dc2ac62301b94daf71541e | |
| parent | 82ab04745075cc7ca4d1abef55c4c88163709c99 (diff) | |
| download | nixos-d92abb87c06b83088d7693e025d8ad624e7deaea.tar nixos-d92abb87c06b83088d7693e025d8ad624e7deaea.tar.gz nixos-d92abb87c06b83088d7693e025d8ad624e7deaea.tar.bz2 nixos-d92abb87c06b83088d7693e025d8ad624e7deaea.tar.xz nixos-d92abb87c06b83088d7693e025d8ad624e7deaea.zip | |
...
| -rw-r--r-- | accounts/gkleen@sif/ssh-hosts.nix | 4 | ||||
| -rw-r--r-- | accounts/gkleen@sif/xmonad/xmonad.hs | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 499 | } | 499 | } |
| 500 | ]; | 500 | ]; |
| 501 | }; | 501 | }; |
| 502 | "gitlab.uniworx.de" = | ||
| 503 | { user = "git"; | ||
| 504 | identityFile = "~/.ssh/gkleen@gitlab.uniworx.de"; | ||
| 505 | }; | ||
| 502 | "col-crpd01" = | 506 | "col-crpd01" = |
| 503 | { hostname = "col-crpd01.mathinst.loc"; | 507 | { hostname = "col-crpd01.mathinst.loc"; |
| 504 | proxyJump = "mgmt01"; | 508 | 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 $ | |||
| 896 | safeSpawn "loginctl" ["lock-session", sessId] | 896 | safeSpawn "loginctl" ["lock-session", sessId] |
| 897 | ) | 897 | ) |
| 898 | , ((modm .|. shiftMask, xK_s ), safeSpawn "systemctl" ["suspend"]) | 898 | , ((modm .|. shiftMask, xK_s ), safeSpawn "systemctl" ["suspend"]) |
| 899 | , ((modm .|. shiftMask, xK_h ), safeSpawn "systemctl" ["hibernate"]) | 899 | , ((modm .|. shiftMask, xK_h ), safeSpawn "systemctl" ["poweroff"]) |
| 900 | , ((modm, xK_v ), windows copyToAll) -- @@ Make focused window always visible | 900 | , ((modm, xK_v ), windows copyToAll) -- @@ Make focused window always visible |
| 901 | , ((modm .|. shiftMask, xK_v ), killAllOtherCopies) -- @@ Toggle window state back | 901 | , ((modm .|. shiftMask, xK_v ), killAllOtherCopies) -- @@ Toggle window state back |
| 902 | , ((modm .|. shiftMask, xK_g ), windowPrompt xPConfig Goto wsWindows) | 902 | , ((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 { | |||
| 179 | }; | 179 | }; |
| 180 | wireguardPeers = [ | 180 | wireguardPeers = [ |
| 181 | { wireguardPeerConfig = { | 181 | { wireguardPeerConfig = { |
| 182 | AllowedIPs = [ "10.200.116.1/32" ] ++ mwnSubnetsPrivate ++ mwnSubnetsPublic; | 182 | AllowedIPs = [ "10.200.116.1/32" "10.163.88.40/32" ] ++ mwnSubnetsPrivate ++ mwnSubnetsPublic; |
| 183 | PublicKey = "YlRFLc+rD2k2KXl7pIJbOKbcPgdJCl8ZTsv0xlK4VEI="; | 183 | PublicKey = "YlRFLc+rD2k2KXl7pIJbOKbcPgdJCl8ZTsv0xlK4VEI="; |
| 184 | PersistentKeepalive = 25; | 184 | PersistentKeepalive = 25; |
| 185 | Endpoint = "wg.math.lmu.de:51820"; | 185 | Endpoint = "wg.math.lmu.de:51820"; |
| @@ -228,6 +228,12 @@ in { | |||
| 228 | Priority = 200; | 228 | Priority = 200; |
| 229 | }; | 229 | }; |
| 230 | } | 230 | } |
| 231 | { routingPolicyRuleConfig = { | ||
| 232 | Table = "wgrz"; | ||
| 233 | To = "10.163.88.40"; | ||
| 234 | Priority = 200; | ||
| 235 | }; | ||
| 236 | } | ||
| 231 | ] ++ map (To: { routingPolicyRuleConfig = { | 237 | ] ++ map (To: { routingPolicyRuleConfig = { |
| 232 | Table = "wgrz"; | 238 | Table = "wgrz"; |
| 233 | inherit To; | 239 | inherit To; |
