From b60c8514b70398515c346fb5de54c2974908bc32 Mon Sep 17 00:00:00 2001 From: Hektor Misplon Date: Sun, 4 Jun 2023 15:20:14 +0200 Subject: [PATCH] Update keybindings --- .xmonad/xmonad.hs | 133 ++++++++++++++++++++++++++++++---------------- 1 file changed, 87 insertions(+), 46 deletions(-) diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index e7826b6..c8781aa 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -158,65 +158,106 @@ myConfig = layoutHook = avoidStruts myLayoutHook, handleEventHook = dynamicPropertyChange "WM_NAME" myDynamicManageHook <> handleEventHook def <> Hacks.windowedFullscreenFixEventHook } - `removeKeysP` myRemoveKeysP - `additionalKeysP` myKeysP + `removeKeysP` myRemoveKeys + `additionalKeysP` myKeys + `additionalMouseBindings` myMouseBindings -- }}} -- Keybindings {{{ -- Keybindings to be added/overridden -myKeysP = - [ -- Fit floating windows back to layout - ("M-S-", withFocused $ windows . W.sink), - -- Launchers - ("M-S-p", spawn "alacritty --class Launcher,Launcher"), - ("", spawn "keepassxc"), - ("M-p", spawn "albert toggle"), - -- Map insert key to paste from clipboard +myKeys :: [(String, X ())] +myKeys = + [ ("M- s", unfloatFocusedW), + ("M- ", nextLayout), -- Cycle through layouts + ("M- S-", defaultLayout), -- + ("M- M-", nextLayout), -- ..fat finger + ("M- M-S-", defaultLayout), -- + ("M-S-p", spawnTermLauncher), + ("", spawnKeepassXC), + ("M-z", spawnZettelkasten), + ("M-p", spawnLauncher), ("", pasteSelection), - -- Map print screen to take a screenshot with flameshot - ("", spawn "flameshot gui"), - -- Map audio keys to control volume - ("", spawn "pactl set-sink-volume @DEFAULT_SINK@ +5%"), - ("", spawn "pactl set-sink-volume @DEFAULT_SINK@ -5%"), - ("", spawn "pactl set-sink-mute @DEFAULT_SINK@ toggle"), - -- Map brightness keys to control brightness with brightnessctl - ("", spawn "brightnessctl set 20+"), - ("", spawn "brightnessctl set 20-"), - -- Map brightness keys + shift to adjust redshift temperature - ("S-", spawn "echo $(($(cat /tmp/temperature) + 50)) > /tmp/temperature && redshift -O $(cat /tmp/temperature) -P && notify < /tmp/temperature -h string:x-canonical-private-synchronous:anything"), - ("S-", spawn "echo $(($(cat /tmp/temperature) - 50)) > /tmp/temperature && redshift -O $(cat /tmp/temperature) -P && notify < /tmp/temperature -h string:x-canonical-private-synchronous:anything"), - -- Reset redshift temperature - ("M-S-", spawn "echo 3000 > /tmp/temperature && redshift -x"), - ("M-S-", spawn "echo 3000 > /tmp/temperature && redshift -x"), - -- Use power down key to suspend - ("", spawn "systemctl suspend"), - -- FIXME: Spawn firefox in fullscreen, but not in kiosk mode - ("M-S-b", spawn "firefox --fullscreen"), - -- Magnify window using arrow keys - ("M-=", sendMessage MagnifyMore >> sendMessage Mag.ToggleOn), - ("M--", sendMessage MagnifyLess >> sendMessage Mag.ToggleOn), - -- Reset magnification - ("M-S-=", sendMessage Mag.ToggleOff), - ("", spawn "alacritty --class 'Calculator' -e ipython -i /home/h/.bin/calc.py"), - -- playerctl ncspot using arrow keys - ("M-", spawn "playerctl next"), - ("M-", spawn "playerctl previous"), - ("M-", spawn "playerctl play"), - ("M-", spawn "playerctl pause") - ] ++ [ - (m ++ k, windows $ f w) | - (m, f) <- zip ["M-", "M-S-"] - [W.greedyView, W.shift], - (k, w) <- zip myWorkspaceKeys (withScreen 0 myWorkspaces) ++ zip mySharedWorkspaceKeys (withScreen 1 mySharedWorkspaces) + ("", printScreen), + ("", raiseVol), -- Audio volume & playback + ("", lowerVol), -- + ("", mute), -- + ("M-", nextTrack), -- + ("M-", prevTrack), -- + ("M-", play), -- + ("M-", pause), -- + ("", brighten), -- Brightness & hue controls + ("", dim), -- + ("S-", warm), -- + ("S-", cool), -- + ("M-S-", resetTemp), -- + ("M-S-", resetTemp), -- + ("M-S-b", fullscreenBrowser), + ("", spawnCalculator), + ("", spawn "systemctl suspend") --TODO: Only enable this on laptop + ] ++ + [ (m ++ k, windows $ f w) | + (m, f) <- zip ["M-", "M-S-"] + [W.greedyView, W.shift], + (k, w) <- zip myWorkspaceKeys + (withScreen 0 myWorkspaces) + ++ zip mySharedWorkspaceKeys + (withScreen 1 mySharedWorkspaces) ] zipKeyPrefixes :: [String] -> [String] -> [String] zipKeyPrefixes prefixes keys = [prefix ++ key | prefix <- prefixes, key <- keys] -- Keybindings to be removed -myRemoveKeysP = "M-S-q" : zipKeyPrefixes ["M-", "M-S-"] (map show [ 1..5 ]) +myRemoveKeys :: [String] +myRemoveKeys = "M-S-q" : zipKeyPrefixes ["M-", "M-S-"] (map show [ 1..5 ]) + +myMouseBindings = [] + +unfloatFocusedW :: X () +unfloatFocusedW = withFocused $ windows . W.sink + +myStartupHook :: X () +nextLayout = sendMessage NextLayout + +defaultLayout :: X () +defaultLayout = setLayout $ Layout myLayoutHook + +spawnZettelkasten :: X () +spawnZettelkasten = spawn "alacritty --class Zettelkasten,Zettelkasten -e nvim $(cat ~/.zk/current-zettel.txt)" + +spawnKeepassXC :: X () +spawnKeepassXC = spawn "keepassxc" + +fullscreenBrowser :: X () +fullscreenBrowser = spawn "firefox --fullscreen" + +spawnLauncher, spawnTermLauncher :: X () +spawnLauncher = spawn "albert toggle" +spawnTermLauncher = spawn "alacritty --class Launcher,Launcher" +spawnCalculator = spawn "alacritty --class 'Calculator' -e ipython -i /home/h/.bin/calc.py" + +printScreen :: X () +printScreen = spawn "flameshot gui" + +raiseVol, lowerVol, mute :: X () +raiseVol = spawn "pactl set-sink-volume @DEFAULT_SINK@ +5%" +lowerVol = spawn "pactl set-sink-volume @DEFAULT_SINK@ -5%" +mute = spawn "pactl set-sink-mute @DEFAULT_SINK@ toggle" + +nextTrack, prevTrack, play, pause :: X () +nextTrack = spawn "playerctl next" +prevTrack = spawn "playerctl previous" +play = spawn "playerctl play" +pause = spawn "playerctl pause" + +brighten, dim, warm, cool, resetTemp :: X () +brighten = spawn "brightnessctl set 20+" +dim = spawn "brightnessctl set 20-" +warm = spawn "echo $(($(cat /tmp/temperature) + 50)) > /tmp/temperature && redshift -O $(cat /tmp/temperature) -P && notify < /tmp/temperature -h string:x-canonical-private-synchronous:anything" +cool = spawn "echo $(($(cat /tmp/temperature) - 50)) > /tmp/temperature && redshift -O $(cat /tmp/temperature) -P && notify < /tmp/temperature -h string:x-canonical-private-synchronous:anything" +resetTemp = spawn "echo 3000 > /tmp/temperature && redshift -x" -- }}}