From 29e225797dea3c1179b654849ebdce4fff0153b3 Mon Sep 17 00:00:00 2001
From: Ryan Kes <ryan@ryankes.eu>
Date: Sat, 16 May 2020 20:05:52 +0200
Subject: [PATCH] added fish aliases to zsh

---
 zsh/.zshenv | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 zsh/.zshrc  |  28 ++++++++-
 2 files changed, 201 insertions(+), 1 deletion(-)

diff --git a/zsh/.zshenv b/zsh/.zshenv
index c00a533..0e07109 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -11,6 +11,7 @@ TERM="xterm-256color"
 path_if_exists ~/.config/yarn/global/node_modules/.bin
 path_if_exists ~/.local/bin
 path_if_exists ~/.emacs.d/bin
+path_if_exists ~/go/bin
 
 # Set GPG TTY
 export GPG_TTY="$(tty)"
@@ -38,9 +39,182 @@ export EDITOR="nvim"
 # Enable password store extensions
 export PASSWORD_STORE_ENABLE_EXTENSIONS="true"
 
+# Make sure pass uses the proper directory
+export PASSWORD_STORE_DIR=~/.local/share/pass
+
+# Use alternative muhome
+export MU_HOME=~/.cache/mu
+
+# Load xinit from the proper directory
+export XINITRC=~/X11/xinitrc
+
 # This needs to be set for bspwm to see config
 export XDG_CONFIG_HOME="$HOME/.config"
 
+# Enable icons in lf
+export LF_ICONS="\
+tw=:\
+st=:\
+ow=:\
+dt=:\
+di=:\
+fi=:\
+ln=:\
+or=:\
+ex=:\
+*.c=:\
+*.cc=:\
+*.clj=:\
+*.coffee=:\
+*.cpp=:\
+*.css=:\
+*.d=:\
+*.dart=:\
+*.erl=:\
+*.exs=:\
+*.fs=:\
+*.go=:\
+*.h=:\
+*.hh=:\
+*.hpp=:\
+*.hs=:\
+*.html=:\
+*.java=:\
+*.jl=:\
+*.js=:\
+*.json=:\
+*.lua=:\
+*.md=:\
+*.php=:\
+*.pl=:\
+*.pro=:\
+*.py=:\
+*.rb=:\
+*.rs=:\
+*.scala=:\
+*.ts=:\
+*.vim=:\
+*.cmd=:\
+*.ps1=:\
+*.sh=:\
+*.bash=:\
+*.zsh=:\
+*.fish=:\
+*.tar=:\
+*.tgz=:\
+*.arc=:\
+*.arj=:\
+*.taz=:\
+*.lha=:\
+*.lz4=:\
+*.lzh=:\
+*.lzma=:\
+*.tlz=:\
+*.txz=:\
+*.tzo=:\
+*.t7z=:\
+*.zip=:\
+*.z=:\
+*.dz=:\
+*.gz=:\
+*.lrz=:\
+*.lz=:\
+*.lzo=:\
+*.xz=:\
+*.zst=:\
+*.tzst=:\
+*.bz2=:\
+*.bz=:\
+*.tbz=:\
+*.tbz2=:\
+*.tz=:\
+*.deb=:\
+*.rpm=:\
+*.jar=:\
+*.war=:\
+*.ear=:\
+*.sar=:\
+*.rar=:\
+*.alz=:\
+*.ace=:\
+*.zoo=:\
+*.cpio=:\
+*.7z=:\
+*.rz=:\
+*.cab=:\
+*.wim=:\
+*.swm=:\
+*.dwm=:\
+*.esd=:\
+*.jpg=:\
+*.jpeg=:\
+*.mjpg=:\
+*.mjpeg=:\
+*.gif=:\
+*.bmp=:\
+*.pbm=:\
+*.pgm=:\
+*.ppm=:\
+*.tga=:\
+*.xbm=:\
+*.xpm=:\
+*.tif=:\
+*.tiff=:\
+*.png=:\
+*.svg=:\
+*.svgz=:\
+*.mng=:\
+*.pcx=:\
+*.mov=:\
+*.mpg=:\
+*.mpeg=:\
+*.m2v=:\
+*.mkv=:\
+*.webm=:\
+*.ogm=:\
+*.mp4=:\
+*.m4v=:\
+*.mp4v=:\
+*.vob=:\
+*.qt=:\
+*.nuv=:\
+*.wmv=:\
+*.asf=:\
+*.rm=:\
+*.rmvb=:\
+*.flc=:\
+*.avi=:\
+*.fli=:\
+*.flv=:\
+*.gl=:\
+*.dl=:\
+*.xcf=:\
+*.xwd=:\
+*.yuv=:\
+*.cgm=:\
+*.emf=:\
+*.ogv=:\
+*.ogx=:\
+*.aac=:\
+*.au=:\
+*.flac=:\
+*.m4a=:\
+*.mid=:\
+*.midi=:\
+*.mka=:\
+*.mp3=:\
+*.mpc=:\
+*.ogg=:\
+*.ra=:\
+*.wav=:\
+*.oga=:\
+*.opus=:\
+*.spx=:\
+*.xspf=:\
+*.pdf=:\
+*.nix=:\
+"
+
 # Save history file in proper place
 HISTFILE=~/.cache/zsh/history
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5c0c295..0615063 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -45,7 +45,7 @@ fi
 
 zplug load
 
-# vim alias
+# nvim alias
 alias v="nvim"
 alias sv="sudo nvim"
 
@@ -56,6 +56,32 @@ alias l="exa -al"
 # vifm alias
 alias vifm="vifmrun"
 
+# wget alias
+alias wget='wget --hsts-file="~/.config/wget-hsts"'
+
+# weechat
+alias weechat="weechat -d ~/.config/weechat"
+
+# tmux
+alias tmux="tmux -f ~/.config/tmux/tmux.conf"
+
+# pass
+alias pass="PASSWORD_STORE_DIR=$PASSWORD_STORE_DIR /usr/bin/pass"
+
+# pacman aliases
+alias pacrmorphans="sudo pacman -Rs (pacman -Qtdq)"
+alias pacrem="sudo pacman -Rns"
+
+# git alaises
+alias gpoat="git push origin --all && git push origin --tags"
+alias gs="git status"
+alias gd="git diff"
+alias g="git"
+
+# Prevent mv & rm oopsies
+alias mv="mv -i"
+alias rm="rm -i"
+
 # Use lf to switch directories and bind it to ctrl-o
 lfcd() {
 	tmp="$(mktemp)"