Merge pull request #453 from slotThe/default->def

Remove last occurences of non Data.Default defaults
This commit is contained in:
Tomáš Janoušek
2021-01-28 21:48:25 +01:00
committed by GitHub
6 changed files with 38 additions and 37 deletions

View File

@@ -94,12 +94,12 @@ grab" and let the C-c C-u be sent to the application.
The simplest way to enable this is to use 'useDefaultPrefixArgument' The simplest way to enable this is to use 'useDefaultPrefixArgument'
> xmonad $ useDefaultPrefixArgument $ defaultConfig { .. } > xmonad $ useDefaultPrefixArgument $ def { .. }
The default prefix argument is C-u. If you want to customize the The default prefix argument is C-u. If you want to customize the
prefix argument, use the following: prefix argument, use the following:
> xmonad $ usePrefixArgument prefixKey $ defaultConfig { .. } > xmonad $ usePrefixArgument prefixKey $ def { .. }
where 'prefixKey' is a function which takes 'XConfig' as an argument where 'prefixKey' is a function which takes 'XConfig' as an argument
in case you wish to extract the 'modMask'. An example in case you wish to extract the 'modMask'. An example

View File

@@ -40,6 +40,7 @@ module XMonad.Actions.TreeSelect
, TSConfig(..) , TSConfig(..)
, tsDefaultConfig , tsDefaultConfig
, def
-- * Navigation -- * Navigation
-- $navigation -- $navigation
@@ -113,7 +114,7 @@ import Graphics.X11.Xrender
-- --
-- Optionally, if you add 'workspaceHistoryHook' to your 'logHook' you can use the \'o\' and \'i\' keys to select from previously-visited workspaces -- Optionally, if you add 'workspaceHistoryHook' to your 'logHook' you can use the \'o\' and \'i\' keys to select from previously-visited workspaces
-- --
-- > xmonad $ defaultConfig { ... -- > xmonad $ def { ...
-- > , workspaces = toWorkspaces myWorkspaces -- > , workspaces = toWorkspaces myWorkspaces
-- > , logHook = workspaceHistoryHook -- > , logHook = workspaceHistoryHook
-- > } -- > }
@@ -131,9 +132,9 @@ import Graphics.X11.Xrender
-- $config -- $config
-- The selection menu is very configurable, you can change the font, all colors and the sizes of the boxes. -- The selection menu is very configurable, you can change the font, all colors and the sizes of the boxes.
-- --
-- The default config defined as 'tsDefaultConfig' -- The default config defined as 'def'
-- --
-- > tsDefaultConfig = TSConfig { ts_hidechildren = True -- > def = TSConfig { ts_hidechildren = True
-- > , ts_background = 0xc0c0c0c0 -- > , ts_background = 0xc0c0c0c0
-- > , ts_font = "xft:Sans-16" -- > , ts_font = "xft:Sans-16"
-- > , ts_node = (0xff000000, 0xff50d0db) -- > , ts_node = (0xff000000, 0xff50d0db)
@@ -258,6 +259,7 @@ defaultNavigation = M.fromList
-- Using nice alternating blue nodes -- Using nice alternating blue nodes
tsDefaultConfig :: TSConfig a tsDefaultConfig :: TSConfig a
tsDefaultConfig = def tsDefaultConfig = def
{-# DEPRECATED tsDefaultConfig "Use def (from Data.Default, and re-exported by XMonad.Actions.TreeSelect) instead." #-}
-- | Tree Node With a name and extra text -- | Tree Node With a name and extra text
data TSNode a = TSNode { tsn_name :: String data TSNode a = TSNode { tsn_name :: String

View File

@@ -533,7 +533,7 @@ instance UrgencyHook StdoutUrgencyHook where
-- --
-- Useful for scratchpad workspaces perhaps: -- Useful for scratchpad workspaces perhaps:
-- --
-- > main = xmonad (withUrgencyHook (filterUrgencyHook ["NSP", "SP"]) defaultConfig) -- > main = xmonad (withUrgencyHook (filterUrgencyHook ["NSP", "SP"]) def)
filterUrgencyHook :: [WorkspaceId] -> Window -> X () filterUrgencyHook :: [WorkspaceId] -> Window -> X ()
filterUrgencyHook skips w = do filterUrgencyHook skips w = do
ws <- gets windowset ws <- gets windowset

View File

@@ -53,7 +53,7 @@ import Data.Maybe
-- --
-- > myWorkspaces = ["1:main","2:misc","3","4"] -- > myWorkspaces = ["1:main","2:misc","3","4"]
-- > ... -- > ...
-- > main = xmonad $ defaultConfig { -- > main = xmonad $ def {
-- > logHook = wallpaperSetter defWallpaperConf { -- > logHook = wallpaperSetter defWallpaperConf {
-- > wallpapers = defWPNames myWorkspaces -- > wallpapers = defWPNames myWorkspaces
-- > <> WallpaperList [("1:main",WallpaperDir "1")] -- > <> WallpaperList [("1:main",WallpaperDir "1")]

View File

@@ -72,7 +72,7 @@ import Control.Arrow (second)
-- --
-- > main = xmonad -- > main = xmonad
-- > $ fullscreenSupport -- > $ fullscreenSupport
-- > $ defaultConfig { ... } -- > $ def { ... }
fullscreenSupport :: LayoutClass l Window => fullscreenSupport :: LayoutClass l Window =>
XConfig l -> XConfig (ModifiedLayout FullscreenFull l) XConfig l -> XConfig (ModifiedLayout FullscreenFull l)
fullscreenSupport c = c { fullscreenSupport c = c {

View File

@@ -46,8 +46,7 @@ import qualified Data.Map as Map
-- > ppOutput = maybe (\s -> return ()) (hPutStrLn) mh} -- > ppOutput = maybe (\s -> return ()) (hPutStrLn) mh}
-- > -- >
-- > -- Main -- > -- Main
-- > main = xmonad $ defaultConfig { -- > main = xmonad $ def { startupHook = startupHook'
-- > startupHook = startupHook'
-- > , logHook = logHook'} -- > , logHook = logHook'}
-- --