aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxero <x@xero.nu>2015-06-28 14:43:41 -0400
committerxero <x@xero.nu>2015-06-28 14:43:41 -0400
commite795dc1d30ed1be71997d2421fc0a9b7b6cc49a9 (patch)
treefa2179298095afd2ba1ae329cc985e92c717e20c
parenta3fa5416fadc93277bd06902fdfc6fb1ce4b57ca (diff)
downloaddotfiles_ascii-e795dc1d30ed1be71997d2421fc0a9b7b6cc49a9.tar.xz
dotfiles_ascii-e795dc1d30ed1be71997d2421fc0a9b7b6cc49a9.zip
new coils and hash wallpaper. matching herbstluftwm updates
Diffstat (limited to '')
-rw-r--r--README.md8
-rwxr-xr-xherbstluftwm/.config/herbstluftwm/autostart17
-rwxr-xr-xherbstluftwm/.config/herbstluftwm/panel.sh41
-rw-r--r--previews/coils.pngbin0 -> 127285 bytes
-rw-r--r--wallpaper/coil0.pngbin0 -> 9102 bytes
-rw-r--r--wallpaper/coil1.pngbin0 -> 8787 bytes
-rw-r--r--wallpaper/coil2.pngbin0 -> 9856 bytes
-rw-r--r--wallpaper/coil3.pngbin0 -> 9393 bytes
-rw-r--r--wallpaper/hash.pngbin1375 -> 0 bytes
-rw-r--r--wallpaper/hash0.pngbin0 -> 966 bytes
-rw-r--r--wallpaper/hash1.pngbin0 -> 981 bytes
-rw-r--r--wallpaper/hash2.pngbin0 -> 982 bytes
-rw-r--r--wallpaper/hash3.pngbin0 -> 963 bytes
-rw-r--r--wallpaper/hash4.pngbin0 -> 964 bytes
14 files changed, 37 insertions, 29 deletions
diff --git a/README.md b/README.md
index 91014c4..4dfdb76 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ when you learn vim it's best to use a more vanilla config. if helps you focus on
- [fugitive](https://github.com/tpope/vim-fugitive) - fast git integration
#previews
-![](https://raw.githubusercontent.com/xero/dotfiles/master/previews/scrot_converge.png)
+![](https://raw.githubusercontent.com/xero/dotfiles/master/previews/coils.png)
- [herbstluftwm](http://git.io/.herbstluftwm)
- [urxvt](http://git.io/.urxvt)
- [zsh](http://git.io/.zsh)
@@ -160,13 +160,13 @@ when you learn vim it's best to use a more vanilla config. if helps you focus on
- [vim](http://git.io/.vim)
- [ncmpcpp](http://git.io/.ncmpcpp)
+![](https://raw.githubusercontent.com/xero/dotfiles/master/previews/scrot_converge.png)
+
![](https://raw.githubusercontent.com/xero/dotfiles/master/previews/scrot_nightcity-1.png)
- [sysinfo](http://git.io/.sysinfo)
-- [urxvt](http://git.io/.urxvt)
![](https://raw.githubusercontent.com/xero/dotfiles/master/previews/scrot_nightcity-2.png)
- [sublime greybeard theme](http://git.io/sublimegreybeard)
-- [ncmpcpp](http://git.io/.ncmpcpp)
![](https://raw.githubusercontent.com/xero/dotfiles/master/previews/scrot_nightcity-3.png)
- [chroimum with cathexis gtk](http://git.io/cathexis) & [greybeard devtools](http://git.io/greybeard-devtools)
@@ -174,8 +174,6 @@ when you learn vim it's best to use a more vanilla config. if helps you focus on
![](https://raw.githubusercontent.com/xero/dotfiles/master/previews/scrot_nightcity-4.png)
- [irssi](http://git.io/.irssi)
-- [tmux](http://git.io/.tmux)
![](https://raw.githubusercontent.com/xero/dotfiles/master/previews/scrot_nightcity-5.png)
-- [vim](http://git.io/.vim)
- [color scripts](http://git.io/.fun)
diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 44aecd8..f122503 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -15,15 +15,11 @@ hc() {
hc emit_hook reload
-# solid background
-#xsetroot -solid '#5A8E3A'
-
# remove all existing keybindings
hc keyunbind --all
# close tray if reloading
killall stalonetray
-killall conky
# gap counter
echo 35 > /tmp/herbstluftwm-gap
@@ -35,12 +31,15 @@ Alt=Mod1
# run menu
hc keybind $Mod-w spawn interrobang
hc keybind $Mod-r spawn interrobang
+
# toggle touchpad
hc keybind $Mod-m spawn bash /home/xero/code/sys/toggle-touchpad
+
# dynamic window gap
hc keybind $Mod-9 spawn bash /home/xero/code/sys/herbstluftwm-remove-gap
hc keybind $Mod-0 spawn bash /home/xero/code/sys/herbstluftwm-add-gap
+# generic actions
hc keybind $Mod-Shift-q quit
hc keybind $Mod-Shift-r reload
hc keybind $Mod-Shift-c close
@@ -87,8 +86,8 @@ hc keybind $Mod-Control-Right resize right +$resizestep
# tags
-tag_names=( 0000 0001 0010 0011 0100 0101 0110 0111 1000 1001 )
-#tag_names=( {0..9} )
+#tag_names=( 0000 0001 0010 0011 0100 0101 0110 0111 1000 1001 )
+tag_names=( {0..3} )
# set up normal tags
hc rename default "${tag_names[0]}" || true
@@ -124,8 +123,8 @@ hc keybind $Mod-i jumpto urgent
# theme
hc attr theme.tiling.reset 1
hc attr theme.floating.reset 1
-hc set frame_border_active_color '#272822'
-hc set frame_border_normal_color '#272822'
+hc set frame_border_active_color '#222222'
+hc set frame_border_normal_color '#222222'
hc set frame_bg_normal_color '#222222'
hc set frame_bg_active_color '#000000'
hc set frame_border_width 0
@@ -143,7 +142,7 @@ hc attr theme.border_width 3
hc attr theme.floating.border_width 3
hc attr theme.floating.outer_width 1
hc attr theme.floating.outer_color black
-hc attr theme.active.inner_color '#272822'
+hc attr theme.active.inner_color '#222222'
hc attr theme.active.outer_color '#000000'
hc attr theme.background_color '#141414'
diff --git a/herbstluftwm/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/panel.sh
index 4395b5b..34b7bb9 100755
--- a/herbstluftwm/.config/herbstluftwm/panel.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel.sh
@@ -11,14 +11,15 @@
hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
monitor=${1:-0}
geometry=( $(herbstclient monitor_rect "$monitor") )
-if [ -z "$geometry" ] ;then
+if [ -z "$geometry" ]
+then
echo "Invalid monitor $monitor"
exit 1
fi
# geometry has the format W H X Y
x=${geometry[0]}
y=${geometry[1]}
-panel_width=548
+panel_width=268
panel_height=16
#font="-*-fixed-medium-*-*-*-12-*-*-*-*-*-*-*"
font="-Gohu-GohuFont-Medium-R-Normal--11-80-100-100-C-60-ISO10646-1"
@@ -39,13 +40,15 @@ else
fi
# detect version
-if dzen2 -v 2>&1 | head -n 1 | grep -q '^dzen-\([^,]*-svn\|\),'; then
+if dzen2 -v 2>&1 | head -n 1 | grep -q '^dzen-\([^,]*-svn\|\),'
+then
dzen2_svn="true"
else
dzen2_svn=""
fi
-if awk -Wv 2>/dev/null | head -1 | grep -q '^mawk'; then
+if awk -Wv 2>/dev/null | head -1 | grep -q '^mawk'
+then
# mawk needs "-W interactive" to line-buffer stdout correctly
uniq_linebuffered() {
awk -W interactive '$0 != l { print ; l=$0 ; fflush(); }' "$@"
@@ -68,7 +71,8 @@ hc pad $monitor $panel_height
# date ^fg(#efefef)18:33^fg(#909090), 2013-10-^fg(#efefef)29
#mpc idleloop player &
- while true ; do
+ while true
+ do
# "date" output is checked once a second, but an event is only
# generated if the output changed compared to the previous run.
date +$'date\t ^ca(1,~/code/sys/calendar)^fg(#d9d9d9)^i(/usr/share/icons/stlarch_icons/clock1.xbm) ^fg(#efefef)%H:%M^fg(#bcbcbc) %Y-%m-^fg(#efefef)%d^ca()'
@@ -82,7 +86,8 @@ hc pad $monitor $panel_height
visible=true
date=""
windowtitle=""
- while true ; do
+ while true
+ do
### output ###
# this part prints dzen data based on the _previous_ data handling run,
@@ -90,10 +95,11 @@ hc pad $monitor $panel_height
echo -n "^bg($bgcolor)$date ^bg(#111111) "
# draw tags
- for i in "${tags[@]}" ; do
+ for i in "${tags[@]}"
+ do
case ${i:0:1} in
'#')
- echo -n "^bg(#5F8787)^fg(#101010)"
+ echo -n "^bg(#5F8787)^fg(#222222)"
;;
'+')
echo -n "^bg(#666666)^fg(#141414)"
@@ -108,16 +114,19 @@ hc pad $monitor $panel_height
echo -n "^bg(#222222)^fg(#bcbcbc)"
;;
esac
- if [ ! -z "$dzen2_svn" ] ; then
+ if [ ! -z "$dzen2_svn" ]
+ then
# clickable tags if using SVN dzen
echo -n "^ca(1,\"${herbstclient_command[@]:-herbstclient}\" "
echo -n "focus_monitor \"$monitor\" && "
echo -n "\"${herbstclient_command[@]:-herbstclient}\" "
- #echo -n "use \"${i:1}\") ^i(/usr/share/icons/stlarch_icons/diamond1.xbm) ^ca()"
- echo -n "use \"${i:1}\") ${i:1} ^ca()"
+ echo -n " "
+ fi
+ if [ ${i:0:1 } == "#" ]
+ then
+ echo -n "use \"${i:1}\") ^i(/usr/share/icons/stlarch_icons/monocle2.xbm) ^ca()"
else
- # non-clickable tags if using older dzen
- echo -n " ${i:1} "
+ echo -n "use \"${i:1}\") ^i(/usr/share/icons/stlarch_icons/monocle.xbm) ^ca()"
fi
done
echo
@@ -150,11 +159,13 @@ hc pad $monitor $panel_height
if [ "${cmd[1]}" -ne "$monitor" ] ; then
continue
fi
- if [ "${cmd[1]}" = "current" ] && [ "$currentmonidx" -ne "$monitor" ] ; then
+ if [ "${cmd[1]}" = "current" ] && [ "$currentmonidx" -ne "$monitor" ]
+ then
continue
fi
echo "^togglehide()"
- if $visible ; then
+ if $visible
+ then
visible=false
hc pad $monitor 0
else
diff --git a/previews/coils.png b/previews/coils.png
new file mode 100644
index 0000000..4a422c4
--- /dev/null
+++ b/previews/coils.png
Binary files differ
diff --git a/wallpaper/coil0.png b/wallpaper/coil0.png
new file mode 100644
index 0000000..678e3c2
--- /dev/null
+++ b/wallpaper/coil0.png
Binary files differ
diff --git a/wallpaper/coil1.png b/wallpaper/coil1.png
new file mode 100644
index 0000000..f6d193f
--- /dev/null
+++ b/wallpaper/coil1.png
Binary files differ
diff --git a/wallpaper/coil2.png b/wallpaper/coil2.png
new file mode 100644
index 0000000..73bbeb1
--- /dev/null
+++ b/wallpaper/coil2.png
Binary files differ
diff --git a/wallpaper/coil3.png b/wallpaper/coil3.png
new file mode 100644
index 0000000..d68742c
--- /dev/null
+++ b/wallpaper/coil3.png
Binary files differ
diff --git a/wallpaper/hash.png b/wallpaper/hash.png
deleted file mode 100644
index 59399c6..0000000
--- a/wallpaper/hash.png
+++ /dev/null
Binary files differ
diff --git a/wallpaper/hash0.png b/wallpaper/hash0.png
new file mode 100644
index 0000000..c28ec25
--- /dev/null
+++ b/wallpaper/hash0.png
Binary files differ
diff --git a/wallpaper/hash1.png b/wallpaper/hash1.png
new file mode 100644
index 0000000..ed5efca
--- /dev/null
+++ b/wallpaper/hash1.png
Binary files differ
diff --git a/wallpaper/hash2.png b/wallpaper/hash2.png
new file mode 100644
index 0000000..b25c28d
--- /dev/null
+++ b/wallpaper/hash2.png
Binary files differ
diff --git a/wallpaper/hash3.png b/wallpaper/hash3.png
new file mode 100644
index 0000000..0ebef47
--- /dev/null
+++ b/wallpaper/hash3.png
Binary files differ
diff --git a/wallpaper/hash4.png b/wallpaper/hash4.png
new file mode 100644
index 0000000..cd750b6
--- /dev/null
+++ b/wallpaper/hash4.png
Binary files differ