Compare commits

...

5 Commits

1 changed files with 29 additions and 29 deletions

View File

@ -1,6 +1,6 @@
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveDataTypeable #-}
--{-# OPTIONS_GHC -Wno-deprecations #-}
{-# OPTIONS_GHC -Wno-deprecations #-}
import XMonad
import XMonad.Config.Desktop
-- Actions
@ -280,32 +280,31 @@ makeLauncher yargs run exec close = concat
launcher = makeLauncher "-x" "eval" "\"exec " "\""
main = do
sc <- IS.countScreens
dzenTopBar <- spawnPipe (getTopBar sc)
dzenBarbicanBar <- spawnPipe (getBarbicanBar sc)
dzenDeltachunkBar <- spawnPipe (getDeltachunkBar sc)
dzenFerrumBar <- spawnPipe (getFerrumBar sc)
-- dzenGammachunkBar <- spawnPipe (getGammachunkBar sc)
dzenOsmiumBar <- spawnPipe (getOsmiumBar sc)
dzenSodiumBar <- spawnPipe (getSodiumBar sc)
dzenTennessineBar <- spawnPipe (getTennessineBar sc)
dzenBlancherBar <- spawnPipe (getBlancherBar sc)
xmonad $ docks $ ewmh $ desktopConfig {
workspaces = ["shell","qb","pindrop","kofc","VM"]
, terminal = myTerminal
, focusFollowsMouse = True
, manageHook = manageDocks <+> myManageHook <+> manageHook desktopConfig
--, handleEventHook = docksEventHook <+> handleEventHook desktopConfig
, handleEventHook = handleEventHook desktopConfig
, layoutHook = avoidStruts $ gaps [(D,108)] $ layoutH
, logHook = myLogHook dzenTopBar >> fadeHook >> updatePointer (0.5, 0.5) (0, 0)
, borderWidth = 1
, normalBorderColor = "#282828"
, focusedBorderColor = "#ebdbb2"
, modMask = winKey
, startupHook = myStartup
} `additionalKeys` myKeys
main = do sc <- IS.countScreens
dzenTopBar <- spawnPipe (getTopBar sc)
dzenBarbicanBar <- spawnPipe (getBarbicanBar sc)
dzenDeltachunkBar <- spawnPipe (getDeltachunkBar sc)
dzenFerrumBar <- spawnPipe (getFerrumBar sc)
dzenOsmiumBar <- spawnPipe (getOsmiumBar sc)
dzenSodiumBar <- spawnPipe (getSodiumBar sc)
dzenTennessineBar <- spawnPipe (getTennessineBar sc)
dzenBlancherBar <- spawnPipe (getBlancherBar sc)
xmonad $ docks $ ewmh $ desktopConfig {
workspaces = ["shell","qb","pindrop","kofc","VM"]
, terminal = myTerminal
, focusFollowsMouse = True
, manageHook = manageDocks <+> myManageHook -- <+> manageHook desktopConfig
, handleEventHook = handleEventHook desktopConfig
, layoutHook = avoidStruts $ gaps [(D,108)] $ layoutH
, logHook = myLogHook dzenTopBar >> fadeHook >> updatePointer (0.5, 0.5) (0, 0)
, borderWidth = 1
, normalBorderColor = "#282828"
, focusedBorderColor = "#ebdbb2"
, modMask = winKey
, startupHook = myStartup
}
`additionalKeys` myKeys
`removeKeys` remKeys
myStartup :: X ()
@ -512,8 +511,8 @@ myKeys = [
--ifWindows (className =? "Iceweasel") (mapM_ focus) (spawnHere "iceweasel"))
, ((winKey .|. controlMask, xK_l), sendMessage Expand)
--, ((winKey , xK_1), windows (viewOnScreen 0 "shell"))
, ((winKey , xK_1), ifWindows (className =? "Alacritty") (mapM_ focus) (spawnHere myTerminal))
, ((winKey , xK_2), windows (viewOnScreen 0 "chromium"))
--, ((winKey , xK_1), ifWindows (className =? "Alacritty") (mapM_ focus) (spawnHere myTerminal))
--, ((winKey , xK_2), windows (viewOnScreen 0 "chromium"))
, ((winKey , xK_a), do
windows (viewOnScreen 1 "pindrop")
--ifWindows (className =? "Pidgin") (mapM_ focus) (spawnHere "pidgin"))
@ -613,6 +612,7 @@ myKeys = [
-- | (key, sc) <- zip [xK_w, xK_r] [1,0] -- For w,r keys in backwards order
, (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
remKeys = [(winKey, n) | n <- [xK_0 .. xK_9]]
--dXPConfig = defaultXPConfig {
dXPConfig = def {