gkleen@sif: ...

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 {
           Match host *.ifi.lmu.de,*.math.lmu.de
             AddressFamily inet
 
+          Match host *.mgmt.yggdrasil
+            ProxyJump vidhar
+
           Host *
         '';
       };
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 @@
       extraOptions.KexAlgorithms = "+diffie-hellman-group1-sha1";
     };
   "switch01" =
-    { hostname = "10.141.1.2";
+    { hostname = "switch01.mgmt.yggdrasil";
       user = "admin";
-      proxyJump = "vidhar";
       identityFile = "~/.ssh/admin@switch01.yggdrasil";
       extraOptions = {
         KexAlgorithms = "+diffie-hellman-group1-sha1";
@@ -393,9 +392,8 @@
       };
     };
   "ap01" =
-    { hostname = "10.141.1.4";
+    { hostname = "ap01.mgmt.yggdrasil";
       user = "root";
-      proxyJump = "vidhar";
       identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil";
     };
   "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 $
     , ((0, xF86XK_AudioPlay), mediaMpvTogglePause)
     , ((modm .|. mod1Mask, xK_space), mediaMpvTogglePause)
 
-    , ((0, xF86XK_MonBrightnessDown), backlight . cycleThrough $ reverse brCycle)
-    , ((0, xF86XK_MonBrightnessUp), backlight $ cycleThrough brCycle)
+    -- , ((0, xF86XK_MonBrightnessDown), backlight . cycleThrough $ reverse brCycle)
+    -- , ((0, xF86XK_MonBrightnessUp  ), backlight $ cycleThrough brCycle)
+    , ((modm .|. shiftMask                , xK_b), backlight . cycleThrough $ reverse brCycle)
+    , ((modm .|. shiftMask .|. controlMask, xK_b), backlight $ cycleThrough brCycle)
 
     , ((modm                , xK_Escape), cycleKbLayout (hKbLayouts host))
     , ((modm .|. controlMask, xK_Escape), safeSpawn "setxkbmap" $ fst (head $ hKbLayouts host) : maybeToList (snd . head $ hKbLayouts host))
@@ -891,8 +893,6 @@ myKeys' conf host = Map.fromList $
       )
     , ((modm .|. shiftMask, xK_s     ), safeSpawn "systemctl" ["suspend"])
     , ((modm .|. shiftMask, xK_h     ), safeSpawn "systemctl" ["hibernate"])
-    -- , ((modm .|. shiftMask, xK_b     ), backlight . cycleThrough $ reverse brCycle)
-    -- , ((modm .|. shiftMask .|. controlMask, xK_b), backlight $ cycleThrough brCycle)
     , ((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)