Merge branch 'master' of gitosis@majnematic.com:davesdots

This commit is contained in:
Adrian Kreher 2008-12-20 04:13:23 -06:00
commit 661b0c6e7a
2 changed files with 2 additions and 2 deletions

View file

@ -2,6 +2,7 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
, bgColor = "black" , bgColor = "black"
, fgColor = "grey" , fgColor = "grey"
, position = Top , position = Top
, lowerOnStart = True
, commands = [ Run Network "eth0" ["-L","0","-H","32","--normal","green","--high","red"] 10 , commands = [ Run Network "eth0" ["-L","0","-H","32","--normal","green","--high","red"] 10
, Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10 , Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10
, Run Memory ["-t","Mem: <usedratio>%"] 10 , Run Memory ["-t","Mem: <usedratio>%"] 10

View file

@ -40,6 +40,5 @@ main = do
} }
} `additionalKeys` } `additionalKeys`
[ [
((mod1Mask, xK_o), shellPrompt defaultXPConfig { position = Top }), ((mod1Mask, xK_o), shellPrompt defaultXPConfig { position = Top })
((mod1Mask, xK_s), sshPrompt defaultXPConfig { position = Top })
] ]