Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: bryangarza/dotfiles
base: 0d4b2dfc6d
...
head fork: bryangarza/dotfiles
compare: 4583d73237
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 7 additions and 16 deletions.
  1. +1 −3 .xinitrc
  2. +6 −13 dwmstatus
View
4 .xinitrc
@@ -11,6 +11,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
fi
. ~/.bash_profile
+xrdb ~/.Xresources
xset +fp /usr/share/fonts/local,/usr/share/fonts/artwiz-fonts
xset fp rehash
@@ -18,12 +19,9 @@ xset fp rehash
xmodmap -e "clear lock"
xmodmap -e "keycode 0x42 = Escape"
xbindkeys
-
xset -dpms
xset s off
-xrdb ~/.Xresources
-
hsetroot -center ~/images/paletrees.jpg
unclutter -idle 10 -jitter 5 &
~/bin/dwmstatus &
View
19 dwmstatus
@@ -10,23 +10,17 @@ date_upd() {
sdate="$(date +"%B") $(date +"%d")"
}
-pb_stat() {
+mus_stat() {
if (($(pgrep -c pianobar) > 0)) || (($(pgrep -c pianobarfly) > 0)); then
if [[ -s "$file" ]]; then
- mus="$(cat $file)"
- else
- mus=''
+ mus=$(<$file)
fi
- else
- mus=''
- fi
-}
-
-cmus_stat() {
- if (($(pgrep -c cmus) > 0)); then
+ elif (($(pgrep -c cmus) > 0)); then
local pre_title="$(cmus-remote -Q | grep 'tag title')"
local pre_artist="$(cmus-remote -Q | grep 'tag artist')"
mus="${pre_artist:10} - ${pre_title:9} |"
+ else
+ mus=''
fi
}
@@ -47,8 +41,7 @@ if ((date_check == 23)) && ((minute >= 59)); then
date_upd
fi
-pb_stat
-cmus_stat
+mus_stat
vol="Vol $(amixer get Master | tail -1 | sed 's/.*\[\([0-9]*%\)\].*/\1/')"
volstat=$(amixer get Master | tail -n 1 | cut -d' ' -f 8-)

No commit comments for this range

Something went wrong with that request. Please try again.