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

Changed defaults to polymorphic def, added no-deprecations hint

This commit is contained in:
Trey Blancher 2022-07-12 14:34:44 -04:00
parent 345fa987a3
commit b9234b82e0
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
prompt-history prompt-history
build-x86_64-linux
xmonad-x86_64-linux xmonad-x86_64-linux
xmonad.errors xmonad.errors
xmonad.hi xmonad.hi

19
xmonad.hs
View File

@ -1,5 +1,6 @@
{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveDataTypeable #-}
{-# OPTIONS_GHC -Wno-deprecations #-}
import XMonad import XMonad
import XMonad.Config.Desktop import XMonad.Config.Desktop
-- Actions -- Actions
@ -263,7 +264,8 @@ layoutH = layoutHints
--tiled2 = Tall 1 (3 % 100) (5 % 9) --tiled2 = Tall 1 (3 % 100) (5 % 9)
myTheme :: Theme myTheme :: Theme
myTheme = defaultTheme { --myTheme = defaultTheme {
myTheme = def {
fontName = myFont fontName = myFont
} }
myFont = "xft:Terminus:style=Regular:Pixelsize=12" 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" -- rightBar = "dzen2 -w 3840 -h 24 -ta r -fg #555753 -bg #000000 -fn Terminus-10 -xs 2"
myLogHook :: Handle -> X () myLogHook :: Handle -> X ()
myLogHook h = dynamicLogWithPP $ defaultPP --myLogHook h = dynamicLogWithPP $ defaultPP
myLogHook h = dynamicLogWithPP $ def
{ {
ppCurrent = dzenColor "#8AE234" "#282828" . pad ppCurrent = dzenColor "#8AE234" "#282828" . pad
, ppVisible = dzenColor "#555753" "#282828" . pad , ppVisible = dzenColor "#555753" "#282828" . pad
@ -466,7 +469,8 @@ myKeys = [
, ((winKey , xK_k), windows W.focusUp) -- explicitly setting the default , ((winKey , xK_k), windows W.focusUp) -- explicitly setting the default
, ((winKey .|. controlMask, xK_k), windows W.swapUp) -- 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 , ((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 , ((lAlt .|. shiftMask, xK_Tab), windows W.focusUp) -- replicating MS Windows task switcher behavior
, ((winKey .|. controlMask, xK_Return), windows W.swapMaster) , ((winKey .|. controlMask, xK_Return), windows W.swapMaster)
, ((winKey, xK_space ), sendMessage NextLayout) , ((winKey, xK_space ), sendMessage NextLayout)
@ -608,14 +612,16 @@ myKeys = [
, (f, m) <- [(W.view, 0), (W.shift, shiftMask)]] , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
dXPConfig = defaultXPConfig { --dXPConfig = defaultXPConfig {
dXPConfig = def {
bgColor = "yellow" bgColor = "yellow"
, fgColor = "blue" , fgColor = "blue"
, font = myFont , font = myFont
} }
myXPConfigSelect = defaultXPConfig { --myXPConfigSelect = defaultXPConfig {
myXPConfigSelect = def {
bgColor = "yellow" bgColor = "yellow"
, fgColor = "blue" , fgColor = "blue"
, autoComplete = Just 0 , autoComplete = Just 0
@ -623,7 +629,8 @@ myXPConfigSelect = defaultXPConfig {
, font = myFont , font = myFont
} }
myXPConfigNew = defaultXPConfig { --myXPConfigNew = defaultXPConfig {
myXPConfigNew = def {
bgColor = "yellow" bgColor = "yellow"
, fgColor = "blue" , fgColor = "blue"
, autoComplete = Nothing , autoComplete = Nothing