diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
| commit | 0b0b0d65ee05583529df831985580e392713d29a (patch) | |
| tree | 7eb6799a996924d8e895c54633a47ea3d7a92a4c /tv/5pkgs/xmonad-tv/Main.hs | |
| parent | 3d30e9cc9014ec6189410944015d3cd7d5ca95a6 (diff) | |
| parent | b7a92f63884af00eb0243ec9328be689a6c9b845 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/5pkgs/xmonad-tv/Main.hs')
| -rw-r--r-- | tv/5pkgs/xmonad-tv/Main.hs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tv/5pkgs/xmonad-tv/Main.hs b/tv/5pkgs/xmonad-tv/Main.hs index 6482d9cc8..817d0092e 100644 --- a/tv/5pkgs/xmonad-tv/Main.hs +++ b/tv/5pkgs/xmonad-tv/Main.hs @@ -13,7 +13,6 @@ import XMonad import System.IO (hPutStrLn, stderr) import System.Environment (getArgs, withArgs, getEnv, getEnvironment) import System.Posix.Process (executeFile) -import XMonad.Prompt (defaultXPConfig) import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace , removeEmptyWorkspace) import XMonad.Actions.GridSelect @@ -64,7 +63,7 @@ mainNoArgs = do -- $ withUrgencyHook borderUrgencyHook "magenta" -- $ withUrgencyHookC BorderUrgencyHook { urgencyBorderColor = "magenta" } urgencyConfig { suppressWhen = Never } $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ") - $ defaultConfig + $ def { terminal = myTerm , modMask = mod4Mask , keys = myKeys @@ -179,8 +178,8 @@ myKeys conf = Map.fromList $ , ((_4 , xK_comma ), sendMessage $ IncMasterN 1) , ((_4 , xK_period ), sendMessage $ IncMasterN (-1)) - , ((_4 , xK_a ), addWorkspacePrompt defaultXPConfig) - , ((_4 , xK_r ), renameWorkspace defaultXPConfig) + , ((_4 , xK_a ), addWorkspacePrompt def) + , ((_4 , xK_r ), renameWorkspace def) , ((_4 , xK_Delete ), removeEmptyWorkspace) , ((_4 , xK_Return ), toggleWS) @@ -205,7 +204,7 @@ myKeys conf = Map.fromList $ pagerConfig :: PagerConfig -pagerConfig = defaultPagerConfig +pagerConfig = def { pc_font = myFont , pc_cellwidth = 64 --, pc_cellheight = 36 -- TODO automatically keep screen aspect @@ -218,13 +217,13 @@ pagerConfig = defaultPagerConfig where windowColors _ _ _ True _ = ("#ef4242","#ff2323") windowColors wsf m c u wf = do - let def = defaultWindowColors wsf m c u wf + let y = defaultWindowColors wsf m c u wf if m == False && wf == True - then ("#402020", snd def) - else def + then ("#402020", snd y) + else y horseConfig :: RhombusConfig -horseConfig = defaultRhombusConfig +horseConfig = def { rc_font = myFont , rc_cellwidth = 64 --, rc_cellheight = 36 -- TODO automatically keep screen aspect @@ -236,7 +235,7 @@ horseConfig = defaultRhombusConfig } wGSConfig :: GSConfig Window -wGSConfig = defaultGSConfig +wGSConfig = def { gs_cellheight = 20 , gs_cellwidth = 192 , gs_cellpadding = 5 @@ -244,7 +243,7 @@ wGSConfig = defaultGSConfig , gs_navigate = navNSearch } --- wsGSConfig = defaultGSConfig +-- wsGSConfig = def -- { gs_cellheight = 20 -- , gs_cellwidth = 64 -- , gs_cellpadding = 5 |