some xmonad stuff

This commit is contained in:
elkowar 2021-10-21 13:24:42 +02:00
parent 59462125c8
commit 42e59d028c
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
2 changed files with 19 additions and 11 deletions

View file

@ -25,7 +25,7 @@
(use (use
:jbyuki/instant.nvim {:config #(set vim.g.instant_username "ElKowar")} :jbyuki/instant.nvim {:config #(set vim.g.instant_username "ElKowar")}
:lewis6991/impatient.nvim {} :lewis6991/impatient.nvim {}
:elkowar/yuck.vim {} :rhysd/conflict-marker.vim {}
:nvim-lua/plenary.nvim {} :nvim-lua/plenary.nvim {}
:elkowar/antifennel-nvim {:opt false :config #(set vim.g.antifennel_executable "/home/leon/tmp/antifennel/antifennel")} :elkowar/antifennel-nvim {:opt false :config #(set vim.g.antifennel_executable "/home/leon/tmp/antifennel/antifennel")}
:elkowar/kmonad.vim {} :elkowar/kmonad.vim {}
@ -202,6 +202,7 @@
:tommcdo/vim-exchange {} :tommcdo/vim-exchange {}
:eraserhd/parinfer-rust {:run "cargo build --release"} :eraserhd/parinfer-rust {:run "cargo build --release"}
:elkowar/yuck.vim {}
:cespare/vim-toml {} :cespare/vim-toml {}
:bduggan/vim-raku {:ft ["raku"]} :bduggan/vim-raku {:ft ["raku"]}
:LnL7/vim-nix {:ft ["nix"]} :LnL7/vim-nix {:ft ["nix"]}

View file

@ -518,11 +518,13 @@ main = do
, layoutHook = myLayout , layoutHook = myLayout
, logHook = mconcat [ polybarLogHook verticalMonitorIndex , logHook = mconcat [ polybarLogHook verticalMonitorIndex
, ewwLogHook , ewwLogHook
, Ewmh.ewmhDesktopsLogHook --, Ewmh.ewmhDesktopsLogHook
, logHook Desktop.desktopConfig , logHook Desktop.desktopConfig
--, fadeInactiveLogHook 0.95 --, fadeInactiveLogHook 0.95
, logHook def] , logHook def]
, startupHook = mconcat [ Ewmh.ewmhDesktopsStartup, myStartupHook, checkKeymap myConfig myKeys] , startupHook = mconcat [ --Ewmh.ewmhDesktopsStartup
--,
myStartupHook, checkKeymap myConfig myKeys]
, manageHook = mconcat [ manageSpawn, myManageHook, manageHook def] , manageHook = mconcat [ manageSpawn, myManageHook, manageHook def]
, focusedBorderColor = "#427b58" , focusedBorderColor = "#427b58"
, normalBorderColor = "#282828" , normalBorderColor = "#282828"
@ -530,7 +532,7 @@ main = do
, activateWindowEventHook , activateWindowEventHook
, handleEventHook Desktop.desktopConfig , handleEventHook Desktop.desktopConfig
, Hacks.windowedFullscreenFixEventHook , Hacks.windowedFullscreenFixEventHook
, Ewmh.ewmhDesktopsEventHook --, Ewmh.ewmhDesktopsEventHook
] ]
--, handleEventHook = minimizeEventHook <+> handleEventHook def <+> hintsEventHook -- <+> Ewmh.fullscreenEventHook --, handleEventHook = minimizeEventHook <+> handleEventHook def <+> hintsEventHook -- <+> Ewmh.fullscreenEventHook
, mouseBindings = myMouseBindings <+> mouseBindings def , mouseBindings = myMouseBindings <+> mouseBindings def
@ -538,12 +540,17 @@ main = do
xmonad xmonad
$ Nav2d.withNavigation2DConfig def { Nav2d.defaultTiledNavigation = Nav2d.sideNavigation } $ Nav2d.withNavigation2DConfig def { Nav2d.defaultTiledNavigation = Nav2d.sideNavigation }
$ Ewmh.setEwmhActivateHook myActivateManageHook
$ Ewmh.ewmh
$ docks $ docks
$ myConfig $ myConfig
-- }}} -- }}}
myActivateManageHook :: ManageHook
myActivateManageHook = pure mempty
mySwallowEventHook = WindowSwallowing.swallowEventHook mySwallowEventHook = WindowSwallowing.swallowEventHook
(className =? "Alacritty" <||> className =? "Termite" <||> className =? "NOPE Thunar") (className =? "Alacritty" <||> className =? "Termite" <||> className =? "NOPE Thunar")
@ -564,17 +571,17 @@ activateWindowEventHook (ClientMessageEvent { ev_message_type = messageType, ev_
shouldRaise <- runQuery (className =? "discord" <||> className =? "web.whatsapp.com") window shouldRaise <- runQuery (className =? "discord" <||> className =? "web.whatsapp.com") window
if shouldRaise if shouldRaise
then windows (W.shiftWin (W.currentTag ws) window) then windows (W.shiftWin (W.currentTag ws) window)
else windows (focusWindow' window) else windows (IS.focusWindow' window)
return $ All True return $ All True
activateWindowEventHook _ = return $ All True activateWindowEventHook _ = return $ All True
-- | Focus a window, switching workspace on the correct Xinerama screen if neccessary. -- | Focus a window, switching workspace on the correct Xinerama screen if neccessary.
focusWindow' :: Window -> WindowSet -> WindowSet -- focusWindow' :: Window -> WindowSet -> WindowSet
focusWindow' window ws -- focusWindow' window ws
| Just window == W.peek ws = ws -- | Just window == W.peek ws = ws
| otherwise = case W.findTag window ws of -- | otherwise = case W.findTag window ws of
Just tag -> IS.focusScreen (IS.unmarshallS tag) ws -- Just tag -> IS.focusScreen (IS.unmarshallS tag) ws
Nothing -> ws -- Nothing -> ws