trey/XMonad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: trey:080c5b71f6ad5fed2f75f931bcdf00646dfdd26b
Branches Tags
trey:master
trey:multiheaded-fixup
trey:apps-on-workspace
trey:remove-manageHook-desktopConfig
trey:remove-win+num
trey:remove-deprecations
trey:multiscreen-fix
trey:clipmenu
trey:bottom_dock
trey:dzenWithFlags
trey:dzen2_flicker
..
compare: trey:5ba5b728a44c94310fff8d740dd5ec25d7065611
Branches Tags
trey:master
trey:multiheaded-fixup
trey:apps-on-workspace
trey:remove-manageHook-desktopConfig
trey:remove-win+num
trey:remove-deprecations
trey:multiscreen-fix
trey:clipmenu
trey:bottom_dock
trey:dzenWithFlags
trey:dzen2_flicker

No commits in common. "080c5b71f6ad5fed2f75f931bcdf00646dfdd26b" and "5ba5b728a44c94310fff8d740dd5ec25d7065611" have entirely different histories.
080c5b71f6 ... 5ba5b728a4

1 changed files with 29 additions and 29 deletions
Show Stats Expand all files Collapse all files

18
xmonad.hs
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,11 +280,13 @@ makeLauncher yargs run exec close = concat
launcher = makeLauncher "-x" "eval" "\"exec " "\""
main = do sc <- IS.countScreens
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)
@ -293,7 +295,8 @@ main = do sc <- IS.countScreens
workspaces = ["shell","qb","pindrop","kofc","VM"]
, terminal = myTerminal
, focusFollowsMouse = True
, manageHook = manageDocks <+> myManageHook -- <+> manageHook desktopConfig
, 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)
@ -302,9 +305,7 @@ main = do sc <- IS.countScreens
, focusedBorderColor = "#ebdbb2"
, modMask = winKey
, startupHook = myStartup
}
`additionalKeys` myKeys
`removeKeys` remKeys
} `additionalKeys` myKeys
myStartup :: X ()
@ -511,8 +512,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"))
@ -612,7 +613,6 @@ 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 {