diff options
author | Tom Willemsen | 2012-07-09 19:16:54 +0000 |
---|---|---|
committer | Tom Willemsen | 2012-07-09 19:16:54 +0000 |
commit | 72d124100d3fc4fb7ee9ada43385867b0c171a4d (patch) | |
tree | 8df784474eb8519032eefcc4e8f92f2dd009ebcc /.config/fish | |
parent | 8b1b423d0ae8e3b899658b05ae4ecb1c430b618f (diff) | |
parent | 65dee41a9237a67db713b2bc1bdbcc8a2cec6f67 (diff) | |
download | dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.tar.gz dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.zip |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/fish/config.fish
.xinitrc
Diffstat (limited to '.config/fish')
-rw-r--r-- | .config/fish/.gitignore | 1 | ||||
-rwxr-xr-x | .config/fish/config.fish | 79 |
2 files changed, 0 insertions, 80 deletions
diff --git a/.config/fish/.gitignore b/.config/fish/.gitignore deleted file mode 100644 index 606b774..0000000 --- a/.config/fish/.gitignore +++ /dev/null @@ -1 +0,0 @@ -fishd.cloud diff --git a/.config/fish/config.fish b/.config/fish/config.fish deleted file mode 100755 index 7a127aa..0000000 --- a/.config/fish/config.fish +++ /dev/null @@ -1,79 +0,0 @@ -#! /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 cnormal (set_color white) - - echo -n $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 "$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 - - printf '>%s ' (set_color normal) -end - -function cower - /usr/bin/cower --color=always --target=$HOME/var/aur $argv -end - -function grep - /bin/grep --color=always $argv -end - -function less - /bin/less -FXRS $argv -end - -function ls - /bin/ls -F --color=always $argv -end - -function mysql - /usr/bin/mysql --pager $argv -end - -function slrn - set -x NNTPSERVER 'news.gmane.org' - /usr/bin/slrn $argv -end - -function shutdown - dbus-send --system --print-reply \ - --dest="org.freedesktop.ConsoleKit" \ - /org/freedesktop/ConsoleKit/Manager \ - org.freedesktop.ConsoleKit.Manager.Stop -end - -function reboot - dbus-send --system --print-reply \ - --dest="org.freedesktop.ConsoleKit" \ - /org/freedesktop/ConsoleKit/Manager \ - org.freedesktop.ConsoleKit.Manager.Restart -end - -function engage - play -n -c1 synth whitenoise band -n 100 20 band -n 50 20 gain +25 fade h 1 864000 1 -end - -function lscompmod -d "List kernel modules used by hardware" - lspci -mvk | awk '/^Module/ {print $2}' | sort -u -end - -set -x PAGER 'less -FXRS' -set -x BROWSER firefox -set -x EDITOR 'emacs -nw' |