diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2021-11-01 10:43:26 -0600 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2021-11-01 10:43:26 -0600 |
| commit | 4430386d66822feae4a9828b3dabf9114301adce (patch) | |
| tree | ddf53e8a72cb32a6d052aa1bd33aaf05460d4b26 | |
| parent | 70b1acbce0c873ec9643ccfb59352b73d2521bfb (diff) | |
| download | rde-4430386d66822feae4a9828b3dabf9114301adce.tar.gz rde-4430386d66822feae4a9828b3dabf9114301adce.tar.bz2 rde-4430386d66822feae4a9828b3dabf9114301adce.zip | |
Add passmenu integrations.
| -rw-r--r-- | src/Internal/DMenu.hs | 2 | ||||
| -rw-r--r-- | src/Internal/Keys.hs | 6 | ||||
| -rw-r--r-- | src/Main.hs | 2 | ||||
| -rw-r--r-- | stack.yaml | 14 | ||||
| -rwxr-xr-x | startup | 4 |
5 files changed, 17 insertions, 11 deletions
diff --git a/src/Internal/DMenu.hs b/src/Internal/DMenu.hs index 1ece347..c5cac49 100644 --- a/src/Internal/DMenu.hs +++ b/src/Internal/DMenu.hs @@ -5,6 +5,6 @@ import XMonad.Util.Run import Control.Monad runDMenu :: X () -runDMenu = void $ do +runDMenu = void $ safeSpawn "/usr/bin/dmenu_run" [ "-p", "Execute ", "-l", "12", "-dim", "0.4"] diff --git a/src/Internal/Keys.hs b/src/Internal/Keys.hs index ead1394..c385539 100644 --- a/src/Internal/Keys.hs +++ b/src/Internal/Keys.hs @@ -31,6 +31,7 @@ import qualified XMonad.StackSet as W import Internal.Lib import Internal.DMenu +import Internal.PassMenu type KeyMap l = XConfig l -> Map (KeyMask, KeySym) (X ()) @@ -72,12 +73,13 @@ newKeys markContext = , ((modm, xK_semicolon), scratchpadSpawnActionTerminal "scratchpad") , ((modm, xK_F10), (void $ spawn "spotify-control play")) , ((modm, xK_r), runDMenu) + , ((modm, xK_c), runPassMenu) , ((modm .|. shiftMask, xK_r), (void $ spawn "gmrun")) , ((modm .|. mod1Mask, xK_l), (void $ spawn "xsecurelock")) - , ((modm .|. mod1Mask, xK_s), (void $ spawn "sudo systemctl suspend")) + , ((modm .|. mod1Mask, xK_s), (void $ spawn "sudo systemctl suspend && xsecurelock")) , ((modm .|. shiftMask, xK_c), kill) , ((modm .|. shiftMask, xK_t), withFocused $ windows . W.sink) - , ((mod4Mask, xK_Escape), (void $ spawn (terminal config))) + , ((mod4Mask, xK_Escape), (void $ spawn "xterm")) , ((mod3Mask, xK_t), (void $ spawn (terminal config))) , ((modm, xK_m), (submap $ mapAlpha modm (markCurrentWindow markContext))) , ((modm, xK_w), runXPlus markContext config windowJump) diff --git a/src/Main.hs b/src/Main.hs index eab10dc..25c930e 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -71,4 +71,4 @@ main = do in icons ++ etc } toggleStructsKey - config { modMask = mod3Mask } + config @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-14.22 +resolver: lts-18.13 # User packages to be built. # Various formats can be used as shown in the example below. @@ -44,10 +44,10 @@ packages: # commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a # # extra-deps: [] -extra-deps: - - cairo-0.13.8.0@sha256:9b64a376ebaa4f153bba5866a32291fd4bed48147009cce9158ce6533928eba8,4075 - - gtk2hs-buildtools-0.13.8.0@sha256:132f38155fc677430a47ea750918973161c876fb6f281d342ac2f07eb99229ce,5238 - +# extra-deps: +# - cairo-0.13.8.0@sha256:9b64a376ebaa4f153bba5866a32291fd4bed48147009cce9158ce6533928eba8,4075 +# - gtk2hs-buildtools-0.13.8.0@sha256:132f38155fc677430a47ea750918973161c876fb6f281d342ac2f07eb99229ce,5238 +# # Override default flag values for local packages and extra-deps # flags: {} @@ -71,3 +71,7 @@ extra-deps: # # Allow a newer minor version of GHC than the snapshot specifies # compiler-check: newer-minor + +extra-deps: + - gtk2hs-buildtools-0.13.8.1@sha256:78e0dc8e3ae2d3ebe01d8d65e5f3f463102ea13a66be6bb1bff7a20a3d93486d,5238 + - cairo-0.13.8.1@sha256:1938aaeb5d3504678d995774dfe870f6b66cbd43d336b692fa8779b23b2b67a9,4075 @@ -1,7 +1,7 @@ #!/bin/bash # Switch the displays around because the default state is for them to be reversed. -xrandr --output DVI-I-1 --right-of DP-5 --mode 2560x1440 +xrandr --output DP-2 --left-of DVI-I-1 --mode 2560x1440 # Change the background image using 'feh' feh --bg-scale "$HOME/.xmonad/wallpaper.jpg" @@ -18,7 +18,7 @@ if [ ! -z "$(ps aux | grep compton | grep -v grep)" ] ; then killall compton fi -nohup compton --backend glx --paint-on-overlay & > /dev/null +nohup compton --backend glx & > /dev/null # Set the cursor to not be a big X xsetroot -cursor_name left_ptr |