kellya/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated to fix local conflicts in repo

Browse source
This commit is contained in:
Alex Kelly 2018-12-11 15:18:24 -05:00
commit fe39fd68dc
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zsh/zshrc
View file

@ -46,7 +46,7 @@ COMPLETION_WAITING_DOTS="true"
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # Add wisely, as too many plugins slow down shell startup.
# plugins=(git) # plugins=(git)
plugins=(sudo taskwarrior common-aliases git-flow keybase geeknote vi-mode battery web-search) plugins=(sudo taskwarrior common-aliases git-flow keybase vi-mode battery web-search)
# User configuration # User configuration
@ -100,6 +100,7 @@ rand () {
} }
alias dum='du -sh *|egrep ".*\.?[0-9]M"' alias dum='du -sh *|egrep ".*\.?[0-9]M"'
alias keploy='echo -e "\e[101;97mKeploy was removed, its functionality is already built in ssh-copy-id, just use that\e[49m"; ssh-copy-id' alias keploy='echo -e "\e[101;97mKeploy was removed, its functionality is already built in ssh-copy-id, just use that\e[49m"; ssh-copy-id'
<<<<<<< HEAD
alias shrug='curl shrug.io|xclip' alias shrug='curl shrug.io|xclip'
cat /home/kellya/.local/share/franklinlogo.txt cat /home/kellya/.local/share/franklinlogo.txt
export PATH="$PATH:/home/kellya/go/bin" export PATH="$PATH:/home/kellya/go/bin"
@ -108,3 +109,6 @@ export WORKON_HOME=/mnt/vdisks/projects/python_virtualenvs
export AGNOSTER_PROMPT_SEGMENTS=("prompt_status" "prompt_context" "prompt_virtualenv" "prompt_dir" "prompt_end") export AGNOSTER_PROMPT_SEGMENTS=("prompt_status" "prompt_context" "prompt_virtualenv" "prompt_dir" "prompt_end")
prompt_git() { prompt_git() {
} }
=======
cat /home/kellya/.local/share/franklinlogo.txt
export PATH="$PATH:/home/kellya/go/bin"