diff --git a/.aliases b/.aliases new file mode 100644 index 0000000..595ccd8 --- /dev/null +++ b/.aliases @@ -0,0 +1,32 @@ +alias rake='noglob bundled_rake' +alias weather='curl wttr.in/?0' +alias gdm='gd master' +alias ratslap="~/Downloads/ratslap/ratslap" +alias charmce="/usr/local/bin/charmce" +alias intel="sudo prime-select intel" +alias nvidia="sudo prime-select nvidia" +alias pls="sudo" +alias p="charm ." +alias cat="bat" +alias bd="batdiff" +alias man="batman" +alias cd.="cd .." +alias cd..="cd .." +alias xd="xdg-open &>/dev/null" +alias xd.="xdg-open &>/dev/null ." +alias suod="sudo" +alias sduo="sudo" +alias zz='z -c' # restrict matches to subdirs of $PWD +alias zi='z -I' # use fzf to select in multiple matches +alias t="todo.sh" +alias ta="todo.sh add" +alias tl="todo.sh list" +alias td="todo.sh do" +alias tp="todo.sh pri" +alias viz="vim ~/.zshrc" +alias vit="vim ~/.tmux.conf" +alias vip="vim ~/.p10k.zsh" +alias viv="vim ~/.vimrc" +alias viw="vim ~/.which-key.vim" +alias via="vim ~/.aliases" +alias dotfiles='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME' diff --git a/.zshrc b/.zshrc index 70d2a41..468acd6 100644 --- a/.zshrc +++ b/.zshrc @@ -72,48 +72,12 @@ source $ZSH/oh-my-zsh.sh ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=32' # User configuration -# export MANPATH="/usr/local/man:$MANPATH" +eval $(thefuck --alias) +unsetopt nomatch export LANG=en_US.UTF-8 -alias rake='noglob bundled_rake' -eval $(thefuck --alias) -unsetopt nomatch -alias weather='curl wttr.in/?0' -alias gdm='gd master' -alias ratslap="~/Downloads/ratslap/ratslap" -alias charmce="/usr/local/bin/charmce" -alias intel="sudo prime-select intel" -alias nvidia="sudo prime-select nvidia" -alias pls="sudo" -alias p="charm ." -alias cat="bat" -alias bd="batdiff" -alias man="batman" -alias cd.="cd .." -alias cd..="cd .." -alias xd="xdg-open &>/dev/null" -alias xd.="xdg-open &>/dev/null ." -alias suod="sudo" -alias sduo="sudo" -alias zz='z -c' # restrict matches to subdirs of $PWD -alias zi='z -I' # use fzf to select in multiple matches -alias t="todo.sh" -alias ta="todo.sh add" -alias tl="todo.sh list" -alias td="todo.sh do" -alias tp="todo.sh pri" -alias viz="vim ~/.zshrc" -alias vit="vim ~/.tmux.conf" -alias vip="vim ~/.p10k.zsh" -alias viv="vim ~/.vimrc" -alias viw="vim ~/.which-key.vim" -alias dotfiles='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME' - - -export PATH="/snap/bin:$PATH" - # If not in tmux session, add battery and time to prompt [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh diff --git a/install-packages.sh b/install-packages.sh index c7e91f9..bc93fb5 100755 --- a/install-packages.sh +++ b/install-packages.sh @@ -69,6 +69,7 @@ git clone --quiet https://github.com/jeffreytse/zsh-vi-mode ${ZSH_CUSTOM:-~/.oh- git clone --quiet https://github.com/skywind3000/z.lua ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/z.lua git clone --quiet --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k +ln -s ~/.aliases ~/.oh-my-zsh/custom/aliases.zsh sudo pip3 --quiet install thefuck