diff options
author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-07-07 22:10:07 -0400 |
---|---|---|
committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-07-07 22:10:07 -0400 |
commit | fdb77ecac4ee431a9d06909add24a80dbaf426a2 (patch) | |
tree | fbf6dca362858e7bab3a12752b549fb51fac5c79 | |
parent | 3c5c091dc885ebca5554eb947bfee5ca5099ea44 (diff) | |
parent | ccc350ab2a80663af7e148364a05b29d92483d95 (diff) |
Merge branch 'master' of ssh://home.orbekk.com:/storage/projects/dotfiles
-rwxr-xr-x | bin/kj-setup.sh | 2 | ||||
-rw-r--r-- | xmonad/xmobar.hs | 17 | ||||
-rwxr-xr-x | xsession | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/bin/kj-setup.sh b/bin/kj-setup.sh index 1bce528..eb7d1a8 100755 --- a/bin/kj-setup.sh +++ b/bin/kj-setup.sh @@ -69,7 +69,7 @@ create_symlink ../dotfiles/ssh/config .ssh/config mkdir -p .xmonad create_symlink ../dotfiles/xmonad/xmonad.hs .xmonad/xmonad.hs -create_symlink ../dotfiles/xmonad/xmobar.hs .xmonad/xmobar.hs +create_symlink dotfiles/xmonad/xmobar.hs .xmobarrc create_symlink dotfiles/xsession .xsession mkdir -p .i3 diff --git a/xmonad/xmobar.hs b/xmonad/xmobar.hs index 503da09..a1a68d3 100644 --- a/xmonad/xmobar.hs +++ b/xmonad/xmobar.hs @@ -8,16 +8,17 @@ Config { font = "xft:Source Code Pro:size=8:bold:antialias=true" -- "-*-Fixed-Bo , commands = [ -- Run Weather "EGPF" ["-t","<skyCondition> <tempC>°C","-L","64","-H","77","--normal","green","--high","red","--low","lightblue"] 36000 Run Weather "KNYC" - ["-t", "NYC: <skyCondition> <tempC>°C <rh>%" + ["-t", "<fc=lightblue>NYC</fc> <tempC>°C <skyCondition> <rh>%" , "-L", "15", "-H", "25", "--normal", "green" , "--high", "red", "--low", "lightblue"] 36000 , Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10 - , Run Volume "default" "Master" [] 10 - , Run Brightness ["-t", "<fc=#ffffff><percent>%</fc>"] 10 - , Run Memory ["-t","Mem: <usedratio>%"] 600 + , Run Volume "default" "Master" [ + "-t", "♪ <volume> <status>"] 10 + , Run Brightness ["-t", "☼<percent>%"] 10 + -- , Run Memory ["-t","Mem: <usedratio>%"] 600 -- , Run Swap [] 10 - , Run Date "%a %b %_d %l:%M" "date" 10 - , Run DiskU [("/", "/: <used>/<size>")] + , Run Date "%a %b %_d <fc=darkorange>%H:%M:%S</fc>" "date" 10 + , Run DiskU [("/", "<fc=#eeeeee>/</fc> <used>/<size>")] ["-L", "20", "-H", "50", "-m", "1", "-p", "3"] 1000 , Run StdinReader -- , Run DynNetwork [ @@ -29,7 +30,7 @@ Config { font = "xft:Source Code Pro:size=8:bold:antialias=true" -- "-*-Fixed-Bo -- , "--high" , "red" -- ] 100 , Run BatteryP ["BAT0"] [ - "--template" , "Batt: <acstatus>" + "--template" , "⚡ <acstatus>" , "--Low" , "10" -- units: % , "--High" , "80" -- units: % , "--low" , "darkred" @@ -46,7 +47,7 @@ Config { font = "xft:Source Code Pro:size=8:bold:antialias=true" -- "-*-Fixed-Bo ] , sepChar = "%" , alignSep = "}{" - , template = "%StdinReader% }{ %default:Master% : %bright% : %battery% : %disku% %memory% : <fc=lightblue>%date%</fc> : %KNYC%" + , template = "%StdinReader% }{ %default:Master% %bright% %battery% %disku% %date% %KNYC%" } -- Config { @@ -1,7 +1,7 @@ #!/usr/bin/env bash -export TERMINAL=terminus -command -v terminus || TERMINAL=gnome-terminal +export TERMINAL=termite +command -v $TERMINAL || TERMINAL=gnome-terminal xrdb -merge $HOME/.Xresources setxkbmap us -variant dvorak -option compose:ralt -option caps:ctrl_modifier |