summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-03-16 15:11:35 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2022-03-16 15:11:35 +0100
commitfe5fab0acbf21de21dbba158d4158058740566b3 (patch)
tree07e46e849ce8f0ced5037228176d5094fa40d8b6
parentf898815efab578d847993b3f297cff0e1f1e5698 (diff)
downloadnixos-fe5fab0acbf21de21dbba158d4158058740566b3.tar
nixos-fe5fab0acbf21de21dbba158d4158058740566b3.tar.gz
nixos-fe5fab0acbf21de21dbba158d4158058740566b3.tar.bz2
nixos-fe5fab0acbf21de21dbba158d4158058740566b3.tar.xz
nixos-fe5fab0acbf21de21dbba158d4158058740566b3.zip
gkleen@sif: ...
-rw-r--r--accounts/gkleen@sif/default.nix3
-rw-r--r--accounts/gkleen@sif/ssh-hosts.nix6
-rw-r--r--accounts/gkleen@sif/xmonad/xmonad.hs8
3 files changed, 9 insertions, 8 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index a30b8201..abea9e6f 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -75,6 +75,9 @@ in {
75 Match host *.ifi.lmu.de,*.math.lmu.de 75 Match host *.ifi.lmu.de,*.math.lmu.de
76 AddressFamily inet 76 AddressFamily inet
77 77
78 Match host *.mgmt.yggdrasil
79 ProxyJump vidhar
80
78 Host * 81 Host *
79 ''; 82 '';
80 }; 83 };
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 6deb06cf..4c95af1a 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -381,9 +381,8 @@
381 extraOptions.KexAlgorithms = "+diffie-hellman-group1-sha1"; 381 extraOptions.KexAlgorithms = "+diffie-hellman-group1-sha1";
382 }; 382 };
383 "switch01" = 383 "switch01" =
384 { hostname = "10.141.1.2"; 384 { hostname = "switch01.mgmt.yggdrasil";
385 user = "admin"; 385 user = "admin";
386 proxyJump = "vidhar";
387 identityFile = "~/.ssh/admin@switch01.yggdrasil"; 386 identityFile = "~/.ssh/admin@switch01.yggdrasil";
388 extraOptions = { 387 extraOptions = {
389 KexAlgorithms = "+diffie-hellman-group1-sha1"; 388 KexAlgorithms = "+diffie-hellman-group1-sha1";
@@ -393,9 +392,8 @@
393 }; 392 };
394 }; 393 };
395 "ap01" = 394 "ap01" =
396 { hostname = "10.141.1.4"; 395 { hostname = "ap01.mgmt.yggdrasil";
397 user = "root"; 396 user = "root";
398 proxyJump = "vidhar";
399 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil"; 397 identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil";
400 }; 398 };
401 "yggdrasil.borgbase" = 399 "yggdrasil.borgbase" =
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs
index ac6a4aba..5dc09f66 100644
--- a/accounts/gkleen@sif/xmonad/xmonad.hs
+++ b/accounts/gkleen@sif/xmonad/xmonad.hs
@@ -865,8 +865,10 @@ myKeys' conf host = Map.fromList $
865 , ((0, xF86XK_AudioPlay), mediaMpvTogglePause) 865 , ((0, xF86XK_AudioPlay), mediaMpvTogglePause)
866 , ((modm .|. mod1Mask, xK_space), mediaMpvTogglePause) 866 , ((modm .|. mod1Mask, xK_space), mediaMpvTogglePause)
867 867
868 , ((0, xF86XK_MonBrightnessDown), backlight . cycleThrough $ reverse brCycle) 868 -- , ((0, xF86XK_MonBrightnessDown), backlight . cycleThrough $ reverse brCycle)
869 , ((0, xF86XK_MonBrightnessUp), backlight $ cycleThrough brCycle) 869 -- , ((0, xF86XK_MonBrightnessUp ), backlight $ cycleThrough brCycle)
870 , ((modm .|. shiftMask , xK_b), backlight . cycleThrough $ reverse brCycle)
871 , ((modm .|. shiftMask .|. controlMask, xK_b), backlight $ cycleThrough brCycle)
870 872
871 , ((modm , xK_Escape), cycleKbLayout (hKbLayouts host)) 873 , ((modm , xK_Escape), cycleKbLayout (hKbLayouts host))
872 , ((modm .|. controlMask, xK_Escape), safeSpawn "setxkbmap" $ fst (head $ hKbLayouts host) : maybeToList (snd . head $ hKbLayouts host)) 874 , ((modm .|. controlMask, xK_Escape), safeSpawn "setxkbmap" $ fst (head $ hKbLayouts host) : maybeToList (snd . head $ hKbLayouts host))
@@ -891,8 +893,6 @@ myKeys' conf host = Map.fromList $
891 ) 893 )
892 , ((modm .|. shiftMask, xK_s ), safeSpawn "systemctl" ["suspend"]) 894 , ((modm .|. shiftMask, xK_s ), safeSpawn "systemctl" ["suspend"])
893 , ((modm .|. shiftMask, xK_h ), safeSpawn "systemctl" ["hibernate"]) 895 , ((modm .|. shiftMask, xK_h ), safeSpawn "systemctl" ["hibernate"])
894 -- , ((modm .|. shiftMask, xK_b ), backlight . cycleThrough $ reverse brCycle)
895 -- , ((modm .|. shiftMask .|. controlMask, xK_b), backlight $ cycleThrough brCycle)
896 , ((modm, xK_v ), windows copyToAll) -- @@ Make focused window always visible 896 , ((modm, xK_v ), windows copyToAll) -- @@ Make focused window always visible
897 , ((modm .|. shiftMask, xK_v ), killAllOtherCopies) -- @@ Toggle window state back 897 , ((modm .|. shiftMask, xK_v ), killAllOtherCopies) -- @@ Toggle window state back
898 , ((modm .|. shiftMask, xK_g ), windowPrompt xPConfig Goto wsWindows) 898 , ((modm .|. shiftMask, xK_g ), windowPrompt xPConfig Goto wsWindows)