diff options
| author |  Tom Willemsen | 2012-06-17 21:28:28 +0000 |
|---|---|---|
| committer | Tom Willemsen | 2012-06-17 21:28:28 +0000 |
| commit | 69fd0e5aef2fd8d90449c6725f48b9b280be4cb5 (patch) | |
| tree | 74964497184a7bdc44bddc50f40931002f4fb2af /.config | |
| parent | f3982b8c335f1888cb14fd9578031fd9690626e6 (diff) | |
| parent | 243c6fe77a04457a16afff3dc3e000f989f7bcc1 (diff) | |
| download | dotfiles-69fd0e5aef2fd8d90449c6725f48b9b280be4cb5.tar.gz dotfiles-69fd0e5aef2fd8d90449c6725f48b9b280be4cb5.zip | |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.xinitrc
Diffstat (limited to '.config')
| -rwxr-xr-x | .config/fish/config.fish | 42 | ||||
| -rwxr-xr-x | .config/herbstluftwm/autostart | 1 | ||||
| -rw-r--r-- | .config/newsbeuter/urls | 1 |
3 files changed, 18 insertions, 26 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 02bf7bf..8b44366 100755 --- a/.config/herbstluftwm/autostart +++ b/.config/herbstluftwm/autostart @@ -15,7 +15,6 @@ hc set window_border_normal_color "#15abc3" hc set window_border_active_color "#e0c625" hc set focus_stealing_prevention 0 hc set swap_monitors_to_get_tag 0 -hc set focus_follows_mouse 1 # Layout hc set default_frame_layout 2 diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls index 54a9464..37bf399 100644 --- a/.config/newsbeuter/urls +++ b/.config/newsbeuter/urls @@ -42,7 +42,6 @@ http://feeds.feedburner.com/FalloutTutorials devel http://www.devarticles.com/rss.xml devel http://www.script-tutorials.com/feed/rss/ http://news.ycombinator.com/rss -http://stackoverflow.com/feeds/tag?tagnames=c&sort=newest #-----[ Linux and FLOSS ]--------------------------------------------- # http://www.reddit.com/r/commandline/.rss linux |