3 files changed, 67 insertions, 17 deletions
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 7145cb3..b879c3c 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,10 +1,22 @@
-export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border'
+# .zshrc
+# ========================
+# =====    ===============
+# ======  ================
+# ======  ================
+# ======  ====   ====   ==
+# ======  ===     ==  =  =
+# ======  ===  =  ==     =
+# =  ===  ===  =  ==  ====
+# =  ===  ===  =  ==  =  =
+# ==     =====   ====   ==
+# ========================
 
 autoload -U colors && colors
 
 HISTSIZE=5000
 SAVEHIST=5000
 HISTFILE=$XDG_CONFIG_HOME/zsh/history
+
 autoload -U history-search-end
 zle -N history-beginning-search-backward-end history-search-end
 zle -N history-beginning-search-forward-end history-search-end
@@ -28,8 +40,6 @@ bindkey -M menuselect 'l' vi-forward-char
 bindkey -v "^?" backward-delete-char
 bindkey -v "^[[A" history-beginning-search-backward
 bindkey -v "^[[B" history-beginning-search-forward
-# bindkey -v "^K" history-beginning-search-backward
-# bindkey -v "^J" history-beginning-search-forward
 bindkey -M vicmd "k" history-beginning-search-backward
 bindkey -M vicmd "j" history-beginning-search-forward
 
@@ -38,8 +48,8 @@ bindkey "^e" edit-command-line
 
 [ -f "$ZDOTDIR/alias.zsh" ]		&& source $ZDOTDIR/alias.zsh
 [ -f "$ZDOTDIR/plugins.zsh" ]	&& source $ZDOTDIR/plugins.zsh
-[ -f "$HOME/Packages/fzf/shell/completion.zsh" ]	&& source $HOME/Packages/fzf/shell/completion.zsh
-[ -f "$HOME/Packages/fzf/shell/key-bindings.zsh" ]	&& source $HOME/Packages/fzf/shell/key-bindings.zsh
+[ -f "$HOME/.local/packs/fzf/shell/completion.zsh" ]	&& source $HOME/.local/packs/fzf/shell/completion.zsh
+[ -f "$HOME/.local/packs/fzf/shell/key-bindings.zsh" ]	&& source $HOME/.local/packs/fzf/shell/key-bindings.zsh
 
 globalias() {
 	if [[ $LBUFFER =~ '^[a-z0-9]+$' ]]; then
@@ -56,4 +66,4 @@ bindkey -v "^ " magic-space
 bindkey -M isearch " " magic-space
 
 PROMPT="%B%{$fg[red]%}%M %{$fg[blue]%}%c%{$fg[red]%}%%%{$reset_color%} "
-RPROMPT="${RPROMPT}"'%{$fg_bold[red]%}%(?..%?)%{$reset_color%} $(gitprompt)'
+RPROMPT="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh
index 783a780..25f8fb2 100644
--- a/.config/zsh/alias.zsh
+++ b/.config/zsh/alias.zsh
@@ -1,16 +1,31 @@
+# alias.zsh
+# ========================
+# =====    ===============
+# ======  ================
+# ======  ================
+# ======  ====   ====   ==
+# ======  ===     ==  =  =
+# ======  ===  =  ==     =
+# =  ===  ===  =  ==  ====
+# =  ===  ===  =  ==  =  =
+# ==     =====   ====   ==
+# ========================
+
 alias ls='exa -l'
 alias c='clear'
 alias less='less --tabs 4'
 alias bc='clear; bc -l'
-alias emacs='emacs -nw'
 alias mkf='gmake fclean'
 alias mkc='gmake clean'
 alias mk='gmake -j5'
 alias web='w3m https://duckduckgo.com/'
+alias mpv='mpv --audio-channels=stereo'
 alias cp='cp -iv'
 alias mv='mv -iv'
 alias rm='rm -v'
 alias ln='ln -v'
+alias df='df -h'
+alias du='du -h'
 alias mkdir='mkdir -v'
 alias rmdir='rmdir -v'
 alias chmod='chmod -v'
@@ -20,26 +35,39 @@ alias diff='colordiff'
 alias tree='tree -C'
 alias yt='straw-viewer --api=auto'
 alias gyt='gtk-straw-viewer'
-alias dgit='git --git-dir=$HOME/Documents/dotfiles-bsd --work-tree=$HOME'
+alias dgit='git --git-dir=$HOME/docs/dotfiles-bsd --work-tree=$HOME'
 alias vim='nvim'
 alias gst='git status'
 alias ga='git add'
 alias gco='git commit -m'
 alias gpp='git push'
 alias gpo='git push origin'
-alias startdocker='doas service vboxnet restart && docker-machine start docker-home'
+alias startdocker='sudo service vboxnet restart && docker-machine start docker-home'
 alias stopdocker='docker-machine stop docker-home'
 alias envdocker='eval `docker-machine env docker-home`'
-alias cat='bat'
 alias vimz='nvim $(fzf)'
 alias v='nvim $(fzf)'
-alias twi='mpv https://twitch.tv/'
+alias pa='cd $HOME/.local/packs && ls'
+alias co='cd $XDG_CONFIG_HOME/ && ls'
+alias bi='cd $HOME/.local/bin && ls'
+twi() {
+	mpview https://twitch.tv/$1;
+}
 alias nb='newsboat'
 alias mutt='neomutt'
 alias nmt='neomutt'
 alias sxiv='sxiv -b'
-alias infox='pkg info -x'
-alias search='make -C /usr/ports search name='
+alias pinfo='pkg info -x'
+search() {
+	make -C /usr/ports search name=$1 | grep 'Path:';
+}
 alias watch='cmdwatch'
+alias tsd='transmission-daemon'
 alias tsm='transmission-remote'
-alias df='df -h'
+alias rsox='sox -t oss default'
+alias calcurse='calcurse -C $XDG_CONFIG_HOME/calcurse -D $XDG_DATA_HOME/calcurse'
+alias abook='abook -C $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook'
+alias dosbox='dosbox -conf $XDG_CONFIG_HOME/dosbox/dosbox.conf'
+alias svn='svn --config-dir $XDG_CONFIG_HOME/subversion'
+alias gpg2='gpg2 --homedir $XDG_DATA_HOME/gnupg'
+alias yarn='yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config'
diff --git a/.config/zsh/plugins.zsh b/.config/zsh/plugins.zsh
index fec3908..abf7f8b 100644
--- a/.config/zsh/plugins.zsh
+++ b/.config/zsh/plugins.zsh
@@ -1,3 +1,15 @@
-source $HOME/Packages/git-prompt.zsh/git-prompt.zsh
-# source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh >/dev/null
-source $HOME/Packages/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh >/dev/null
+# plugins.zsh
+# ========================
+# =====    ===============
+# ======  ================
+# ======  ================
+# ======  ====   ====   ==
+# ======  ===     ==  =  =
+# ======  ===  =  ==     =
+# =  ===  ===  =  ==  ====
+# =  ===  ===  =  ==  =  =
+# ==     =====   ====   ==
+# ========================
+
+# source $HOME/Packages/git-prompt.zsh/git-prompt.zsh
+source $HOME/.local/packs/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh >/dev/null