3 files changed, 19 insertions, 34 deletions
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 247daad..7a127aa 100755
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,36 +1,30 @@
 #! /usr/bin/fish
 
 function fish_prompt -d "Write out the prompt"
-    set last_status $status
-    set current_directory (prompt_pwd)
-    set git_branch (git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
-    set pac_cnt (cat /var/cache/pacman/updates.cnt)
-    set aur_cnt (cat /var/cache/pacman/aur.cnt)
-    set cnormal (set_color white)
+   set last_status $status
+   set current_directory (prompt_pwd)
+   set git_branch (git branch --contains HEAD 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
+   set cnormal (set_color white)
 
-    echo -n $cnormal
+   echo -n $cnormal
 
-    if test $pac_cnt -gt 0 -o $aur_cnt -gt 0
-        printf '%s%d%s/%s%d%s:' (set_color cyan) $pac_cnt $cnormal (set_color cyan) $aur_cnt $cnormal
-    end
+   printf '%s%s%s' (set_color magenta) (hostname|cut -d . -f 1) $cnormal
 
-    printf '%s%s%s' (set_color magenta) (hostname|cut -d . -f 1) $cnormal
+   if test -n "$current_directory"
+       printf ' %s%s%s' (set_color $fish_color_cwd) $current_directory $cnormal
+   end
 
-    if test -n "$current_directory"
-        printf ':%s%s%s' (set_color $fish_color_cwd) $current_directory $cnormal
-    end
+   if test -n "$git_branch"
+       printf '@%s%s%s' (set_color yellow) $git_branch $cnormal
+   end
 
-    if test -n "$git_branch"
-        printf '@%s%s%s' (set_color yellow) $git_branch $cnormal
-    end
+   if test $last_status -eq 0
+       printf '%s' (set_color --bold green)
+   else
+       printf '%s' (set_color --bold red)
+   end
 
-    if test $last_status -eq 0
-        printf '%s%s' (set_color --bold green)
-    else
-        printf '%s%s' (set_color --bold red)
-    end
-
-    printf '>%s ' (set_color normal)
+   printf '>%s ' (set_color normal)
 end
 
 function cower
diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index 04b6612..8b44366 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -20,15 +20,6 @@ hc set swap_monitors_to_get_tag 0
 hc set default_frame_layout 2
 hc set_layout max
 
-# Monitors
-hc add default2
-hc remove_monitor 1
-hc move_monitor 0 1920x1080+0+0
-hc add_monitor 1680x1050+1920+0 default2
-
-hc pad 0 -5 -5 -5 -5
-hc pad 1 -5 -5 -5 -5
-
 # Keys
 #hc keybind $modkey-t spawn ~/bin/hlwm/capture-todo
 #hc keybind $modkey-Shift-t spawn ~/bin/hlwm/show-todo
diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
index 22b46ae..ae5aedd 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/.config/herbstluftwm/panel.sh
@@ -84,7 +84,7 @@ function print_mailboxes() {
 }
 
 function print_services() {
-    services=(emacs httpd mysqld dunst xbindkeys mpdscribble sshd mpd)
+    services=(emacs dunst xbindkeys sshd)
     servicetxt=""
     for j in "${services[@]}"; do
         servicetxt="$servicetxt$separator$(status $j)"