From 6808f4aab927dca13820c4d90a95c4c388d3f4ab Mon Sep 17 00:00:00 2001 From: Max Hohlfeld Date: Tue, 22 Nov 2022 08:46:58 +0100 Subject: [PATCH] minor xmonad fixes --- roles/xmonad/files/xmonad_qwerty.hs | 2 +- roles/xmonad/files/xmonad_t460p.hs | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/roles/xmonad/files/xmonad_qwerty.hs b/roles/xmonad/files/xmonad_qwerty.hs index 21494a3..dac7540 100644 --- a/roles/xmonad/files/xmonad_qwerty.hs +++ b/roles/xmonad/files/xmonad_qwerty.hs @@ -122,7 +122,7 @@ myAdditionalKeys = , ("M-S-j", windows W.swapDown) , ("M-S-k", windows W.swapUp) , ("M-h", sendMessage Shrink) - , ("M-j", sendMessage Expand) + , ("M-l", sendMessage Expand) , ("M-,", sendMessage (IncMasterN 1)) , ("M-S-,", sendMessage (IncMasterN (-1))) , ("M-.", sendMessage ToggleStruts) diff --git a/roles/xmonad/files/xmonad_t460p.hs b/roles/xmonad/files/xmonad_t460p.hs index b55fbc0..13f858d 100644 --- a/roles/xmonad/files/xmonad_t460p.hs +++ b/roles/xmonad/files/xmonad_t460p.hs @@ -63,6 +63,7 @@ myScratchpads = [ NS "keepassxc" "keepassxc ~/db.kdbx" (title =? "it factum Max Hohlfeld - KeePassXC" <||> title =? "db.kdbx [Gesperrt] - KeePassXC") defaultFloating , NS "nnn" "st -t nnn -e nnnwrapper" (title =? "nnn") (customFloating $ W.RationalRect (1/4) (1/6) (2/4) (4/6)) , NS "vimwiki" "st -t vimwiki -e vwwrapper" (title =? "vimwiki") (customFloating $ W.RationalRect (1/6) (1/6) (2/3) (2/3)) + , NS "pavucontrol" "pavucontrol" (title =? "Lautstärkeregler") (customFloating $ W.RationalRect (1/6) (1/6) (2/3) (2/3)) ] -- Topic Space @@ -74,7 +75,7 @@ topicItems = , noAction "4" "~/" , noAction "5" "~/" , TI "alkaa" "~/projekte/alkaa" (switchToLayout "Programming" *> spawnShell *> spawnEditor) - , TI "IHD_Backend" "~/projekte/IHD/Tractatio_Backend/" (switchToLayout "Programming" *> spawn "rider") + , TI "IHD_Backend" "~/projekte/IHD/Tractatio_Backend/" (switchToLayout "Programming" *> spawn "rider ~/projekte/IHD/Tractatio_Backend/IHD_Tractatio.sln") , TI "IHD_Frontend" "~/projekte/IHD/Demonstrare_Frontend/" (switchToLayout "Programming" *> spawnShellAndExecute "npm start" *> spawnShell *> spawnEditor) ] @@ -136,7 +137,7 @@ myAdditionalKeys = , ("M-S-j", windows W.swapDown) , ("M-S-k", windows W.swapUp) , ("M-h", sendMessage Shrink) - , ("M-j", sendMessage Expand) + , ("M-l", sendMessage Expand) , ("M-,", sendMessage (IncMasterN 1)) , ("M-S-,", sendMessage (IncMasterN (-1))) , ("M-.", sendMessage ToggleStruts) @@ -147,13 +148,14 @@ myAdditionalKeys = , ("M-p k", spawn "dm-kill") -- scratchpads - , ("M-n", namedScratchpadAction myScratchpads "nnn") - , ("M-S-a", namedScratchpadAction myScratchpads "keepassxc") - , ("M-v", namedScratchpadAction myScratchpads "vimwiki") + , ("M-n", namedScratchpadAction myScratchpads "nnn") + , ("M-S-a", namedScratchpadAction myScratchpads "keepassxc") + , ("M-s-v", namedScratchpadAction myScratchpads "vimwiki") + , ("M-s-a", namedScratchpadAction myScratchpads "pavucontrol") -- open terminal , ("M-S-", spawnShell) - , ("M-b", spawn "firefox") + , ("M-b", spawn "firefox") -- layout , ("M-t t", switchToLayout "Tall") @@ -163,13 +165,13 @@ myAdditionalKeys = , ("M-S-f", withFocused $ windows . W.sink) -- media keys - , ("", spawn "pamixer -t") - , ("", spawn "pamixer -d 5") - , ("", spawn "pamixer -i 5") - , ("", spawn "pamixer --default-source -t") + , ("", spawn "pamixer -t") + , ("", spawn "pamixer -d 5") + , ("", spawn "pamixer -i 5") + , ("", spawn "pamixer --default-source -t") -- lock screen - , ("M-S-l", spawn "slock") + , ("M-S-l", spawn "slock") -- workspace switching , ("M-", toggleTopic)