diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 7eeaf5b..879351a 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,3 +1,4 @@ +# Fisherman stuff set fisher_home ~/.local/share/fisherman set fisher_config ~/.config/fisherman source $fisher_home/config.fish @@ -8,14 +9,23 @@ eval (python -m virtualfish compat_aliases) # Theme options set -g theme_show_exit_status yes +# PATH +## If the private dotfiles repo is installed, we'd like to use its scripts too +if test -x ~/.dot/privdotfiles/bin + set PATH $PATH ~/.dot/privdotfiles/bin +end + +## Android-related binaries +set PATH $PATH /usr/local/bin/android-sdk-linux/platform-tools /usr/local/bin/android-sdk-linux/tools + # Aliases -# Listing +## Listing alias ll 'ls -alF' alias la 'ls -A' alias l 'ls -CF' alias lll 'ls --color=always -alF | less -R' -# Git +## Git alias gu "git pull --all" alias gp "git push --all; git push --tags" alias gc "git commit" @@ -26,7 +36,7 @@ alias gl "git log" alias gt 'git tag|less' #alias gad 'git log --pretty='"'"'%at'"'"' | while read d; do date -d "@$d"; done | awk '"'"'{print $1}'"'"' | sort | uniq -c' -# Grepping +## Grepping alias findfile 'find . | grep -v .svn | grep -v .hg | grep -v .git | grep' alias findphp 'find . -name "*.php" | xargs grep --color=auto' alias findjs 'find . -name "*.js" | xargs grep --color=auto' @@ -34,7 +44,7 @@ alias findcss 'find . -name "*.css" | xargs grep --color=auto' alias findpy 'find . -name "*.py" | xargs grep --color=auto' alias findyaml 'find . -name "*.yaml" -o -name "*.yml" -o -name "*.eyaml" -o -name "*.eyml" | xargs grep --color=auto' -# Various +## Various alias tmux 'tmux -2' alias tmux_reload "tmux source-file ~/.tmux.conf" alias tmux_takeover "tmux detach -a"