xmonad-stockholm: 1.0.0 -> 1.1.0

This commit is contained in:
tv 2016-02-12 14:20:51 +01:00
parent 17a80f2b4a
commit 386a2191a1
2 changed files with 14 additions and 15 deletions

View File

@ -3,11 +3,11 @@
}:
mkDerivation {
pname = "xmonad-stockholm";
version = "1.0.0";
version = "1.1.0";
src = fetchgit {
url = "http://cgit.cd.krebsco.de/xmonad-stockholm";
sha256 = "35dda5d16acc90af94ae2fae10ab5cc2d5b450c3f1ff2e7f515ac53877269abf";
rev = "2dbefe42fc5cfe9093465bf3e22ba8f82feeef6e";
url = http://cgit.cd.krebsco.de/xmonad-stockholm;
rev = "179d29fd4c765dee698058ef63295331ac603639";
sha256 = "0c6mj68xsxxr4j8adkzhjszi7bg6cpisrsmqn587a16sblpbrnkj";
};
libraryHaskellDepends = [
base containers X11 X11-xshape xmonad xmonad-contrib

View File

@ -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