diff --git a/.gitignore b/.gitignore index 746a377..5f91b01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ prompt-history +build-x86_64-linux xmonad-x86_64-linux xmonad.errors xmonad.hi diff --git a/xmonad.hs b/xmonad.hs index 55ad14f..61c75e3 100755 --- a/xmonad.hs +++ b/xmonad.hs @@ -1,5 +1,6 @@ {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveDataTypeable #-} +{-# OPTIONS_GHC -Wno-deprecations #-} import XMonad import XMonad.Config.Desktop -- Actions @@ -263,7 +264,8 @@ layoutH = layoutHints --tiled2 = Tall 1 (3 % 100) (5 % 9) myTheme :: Theme -myTheme = defaultTheme { +--myTheme = defaultTheme { +myTheme = def { fontName = myFont } myFont = "xft:Terminus:style=Regular:Pixelsize=12" @@ -324,7 +326,8 @@ myBitmapsDir = "/home/trey/.xmonad/dzen2" -- rightBar = "dzen2 -w 3840 -h 24 -ta r -fg #555753 -bg #000000 -fn Terminus-10 -xs 2" myLogHook :: Handle -> X () -myLogHook h = dynamicLogWithPP $ defaultPP +--myLogHook h = dynamicLogWithPP $ defaultPP +myLogHook h = dynamicLogWithPP $ def { ppCurrent = dzenColor "#8AE234" "#282828" . pad , ppVisible = dzenColor "#555753" "#282828" . pad @@ -466,7 +469,8 @@ myKeys = [ , ((winKey , xK_k), windows W.focusUp) -- explicitly setting the default , ((winKey .|. controlMask, xK_k), windows W.swapUp) -- explicitly setting the default , ((lAlt , xK_Tab), windows W.focusDown) -- replicating MS Windows task switcher behavior - , ((winKey , xK_Tab), goToSelected defaultGSConfig) + --, ((winKey , xK_Tab), goToSelected defaultGSConfig) + , ((winKey , xK_Tab), goToSelected def) , ((lAlt .|. shiftMask, xK_Tab), windows W.focusUp) -- replicating MS Windows task switcher behavior , ((winKey .|. controlMask, xK_Return), windows W.swapMaster) , ((winKey, xK_space ), sendMessage NextLayout) @@ -608,14 +612,16 @@ myKeys = [ , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]] -dXPConfig = defaultXPConfig { +--dXPConfig = defaultXPConfig { +dXPConfig = def { bgColor = "yellow" , fgColor = "blue" , font = myFont } -myXPConfigSelect = defaultXPConfig { +--myXPConfigSelect = defaultXPConfig { +myXPConfigSelect = def { bgColor = "yellow" , fgColor = "blue" , autoComplete = Just 0 @@ -623,7 +629,8 @@ myXPConfigSelect = defaultXPConfig { , font = myFont } -myXPConfigNew = defaultXPConfig { +--myXPConfigNew = defaultXPConfig { +myXPConfigNew = def { bgColor = "yellow" , fgColor = "blue" , autoComplete = Nothing