From 78eab61a03edcdd48b7a3c91ba39ef4ecd724e6d Mon Sep 17 00:00:00 2001
From: z3rOR0ne <z3rOR0ne@protonmail.com>
Date: Tue, 26 Apr 2022 03:38:01 -0700
Subject: [PATCH] separated out aliases into separate file for organization
 purposes, sourced into both bashrc and zshrc

---
 aliases    | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++
 bashrc.txt | 218 +-------------------------------------------------
 zshrc.txt  | 230 +----------------------------------------------------
 3 files changed, 230 insertions(+), 443 deletions(-)
 create mode 100644 aliases

diff --git a/aliases b/aliases
new file mode 100644
index 00000000..2379c6fb
--- /dev/null
+++ b/aliases
@@ -0,0 +1,225 @@
+#Custom Aliases
+alias ls='ls --color=auto'
+alias grep='grep --colour=auto'
+alias egrep='egrep --colour=auto'
+alias fgrep='fgrep --colour=auto'
+alias cp="cp -i"
+alias df='df -h'
+alias free='free -m'
+alias dmesg="doas dmesg -H"
+alias kernel="uname -r"
+alias .="cd"
+alias home="xclear && cd /home/brian && clear && erase_history && hash -r"
+alias docs="cd ~/Documents"
+alias down="cd ~/Downloads"
+alias pics="cd ~/Pictures"
+alias music="cd ~/Music"
+alias vids="cd ~/Videos"
+alias games="cd ~/.local/share/Steam/steamapps/common"
+alias notes="cd ~/Documents/notes"
+alias scripts="cd ~/scripts"
+alias config="cd ~/.config"
+alias cache="cd ~/.cache"
+alias svs="cd /etc/runit/sv"
+alias Code="cd ~/Documents/Code"
+alias cplus="cd ~/Documents/Code/cpp"
+alias js="cd ~/Documents/Code/javascript"
+alias py="cd ~/Documents/Code/python"
+alias wtuts="cd ~/Documents/Code/web_tutorials"
+alias btuts="cd ~/Documents/Code/book_tutorials"
+alias fonts="fc-list"
+alias locate="locate -i"
+alias bat="bat --theme Nord"
+alias batman="man bat"
+alias li="ls -l --color=auto"
+alias ll="ls -liasSh --color=auto"
+alias {lsdir,lsd}="ls -t -1" # list only the directories
+alias lshw="doas lshw -short" # list hardware
+alias of="onefetch -o yaml"
+alias mkdir='mkdir -pv'
+alias {ex,esc}="exit"
+alias {his,hist}="history"
+alias mnt="doas mount /dev/sda1 /mnt/media/usb-drive"
+alias umnt="doas umount /mnt/media/usb-drive"
+alias imnt="ifuse /home/brian/iphone"
+alias iumnt="doas umount /home/brian/iphone"
+alias kmnt="doas mount /dev/sda /mnt/media/kobo"
+alias kumnt="doas umount /dev/sda /mnt/media/kobo"
+alias rm="newrm -vi"
+alias {rcrm,rrm}="doas xargs -d\\n rm -r -v" # when piped after locate or find command, recursively removes outputted files
+alias mv="mv -v"
+alias ln="ln -i"
+alias {doasedit,sudoedit}="doas rnano"
+alias clean_cache="doas paccache -r && doas rm -r /home/brian/.cache/*"
+alias shred="doas shred -uzv" # shreds the file and overwrites it with 1s and 0s, shows progress
+alias indelible="doas chattr +i" # makes a file impossible to delete (except with sudo)
+alias kfonts="kitty +list-fonts"
+alias {kdiff,kitten,kd}="kitty +kitten diff"
+alias rg="rg -i --colors 'match:fg:blue' --colors 'line:fg:blue'"
+alias fzfi="rg --files --hidden --follow --no-ignore-vcs -g '!{node_modules,.git}' | fzf"
+alias bluepill="neo-matrix --bold=2 -D --color=cyan --density=0.75 --charset=katakana --speed=12 --fullwidth --screensaver"
+alias btop="kitty -o font_size=12 -o background_opacity=0.40 -e btop; fullscreen enable"
+alias {librewolf,firefox}="librewolf"
+alias tor-browser="tor-browser &"
+alias chromium="chromium --disable-search-engine-collection --fingerprinting-canvas-image-data-noise --fingerpriting-canvas-measuretext-noise --fingerprinting-client-rects-noise --popups-to-tabs &"
+alias gimp="gimp --no-splash"
+alias krita="krita --nosplash"
+alias {sq,sql,sqlite}="sqlcipher"
+alias view="kitty +kitten icat"
+alias viewer="feh -F -Z -x"
+alias mupdf='mupdf -r 204'
+alias dkpdf='mupdf -I -r 204'
+alias {json,jscrl,jsoncurl,jcrl}="jscurl"
+alias amd="article_md"
+alias word="wordgrinder"
+alias spreadsheet="sc"
+alias pvctrl="pavucontrol"
+alias open="xdg-open"
+alias nc="nc -v"
+alias dump="doas tcpdump"
+alias {mydump,medump,mdump,bdump}="doas tcpdump -v -i wlan0"
+alias route="traceroute"
+alias listen="ss -a -t -p"
+alias {pdf2,pdf2txt}="pdftotext"
+alias tree="tree -ad -L 3 --prune -C"
+alias {nv,nvi}="nvim"
+alias {cproj,mproj,myproj}="cd '$cproj'"
+alias mon="nodemon"
+alias localhost="librewolf localhost:3000"
+alias {mi,mic}="micro"
+alias {mysql,maria,mdb}="mariadb"
+alias rsm="doas rsm"
+alias updatedb="doas updatedb"
+alias iftop-w="doas iftop -i wlan0 -P"
+# usage p0f -i wlan0
+alias p0f="doas p0f"
+alias vnstat-w="vnstat -i wlan0 --json | jq"
+alias {wi,ssid}="doas iw wlan0 scan | grep SSID"
+alias wifi-list="connmanctl services"
+alias wifi-scan="connmanctl scan wifi"
+alias wifi-connect="connmanctl connect wifi_34cff6c9b922_44495a5a_managed_psk"
+alias wifi-disconnect="connmanctl disconnect wifi_34cff6c9b922_44495a5a_managed_psk"
+alias wifi-up="doas ifconfig wlan0 up"
+alias wifi-down="doas ifconfig wlan0 down"
+alias letitsnow="doas docker start snowflake-proxy"
+alias snowfall="doas docker stop snowflake-proxy"
+alias snowlogs="doas docker logs -f snowflake-proxy"
+alias git-a="git add"
+alias git-c="git commit -m"
+alias git-p="git push"
+alias git-l="git log"
+alias git-s="git stash"
+alias {lsc,lscommits}="tig"
+alias lxapp="lxappearance"
+alias hd="ncdu"
+alias xsel="xclip -sel clip"
+alias catx="cat | xclip -sel clip"
+alias kitx="cat | kitty +kitten clipboard" # not as good as catx
+alias mouse="mousepad"
+alias xclear="echo '' | xclip && xclip -selection clipboard /dev/null"
+alias diff="diff -wy"
+alias exifread="exiftool"
+alias exifrm="exiftool -all="
+alias {html,html_pp}="hxnormalize -e"
+alias {mop,market,stonks,stocks}="cd ~/aur_packages/mop && go run ./cmd/mop/main.go && cd"
+alias {reddit,rd}="torsocks tuir"
+alias {sub,subreddit,subrd}="torsocks tuir -s"
+alias hn="hackernews_tui"
+alias qwiki="torsocks wik -i"
+alias tldr="torsocks tldr"
+alias {trans,translate}="gtktranslate"
+alias mpl="mplayer -fs"
+alias {mloop,mploop}="mplayer -fs -loop 0"
+alias mpv='mpv --fs'
+alias {muse,musik,cmu}="cmus"
+alias {hp,headphones}="pactl set-default-sink alsa_output.usb-FIIO_FiiO_USB_DAC-E10-01.analog-stereo"
+alias {sp,speakers}="pactl set-default-sink alsa_output.pci-0000_0a_00.4.analog-stereo"
+alias dspeakers="pactl set-default-sink alsa_output.pci-0000_08_00.1.hdmi-stereo-extra1"
+alias pulse="pamixer --set-volume"
+alias {mu,mt,mute}="pamixer -t"
+# laptop only currently, records video/audio, simply name filename .mp4 after command:
+alias r_vid="ffmpeg -f v4l2 -framerate 24 -video_size 640x480 -i /dev/video0 -itsoffset 00:00:01.0 -f alsa -i default -c:v libx264 -preset ultrafast -c:a aac"
+alias ytube="ytfzf -l --features=subtitles"
+alias {yti,ytinfo}="ytfzf -I L"
+alias {ytd,ytdownload}="ytfzf -d"
+alias {odysee,lbry}="ytfzf -c O --features=subtitles"
+alias {ptube,peertube}="ytfzf -c P --features=subtitles"
+alias ytdl="torsocks yt-dlp -f mp4"
+alias ytdl-a="torsocks yt-dlp -x --audio-format mp3"
+alias thinkorswim="~/thinkorswim/thinkorswim &"
+alias {cl,cls}="clear"
+alias shutdown="shutdown.sh"
+alias reboot="reboot.sh"
+alias curltime="curl -w \"@$HOME/Documents/notes/curl-format.txt\" -o /dev/null -s"
+alias inxi-w="inxi --weather-location 90004"
+alias forecast="curl -s 'http://wttr.in/losangeles'"
+alias ipaddr="curl ifconfig.me ; echo ''"
+alias hwclock="doas hwclock"
+alias killport="fuser -k"
+alias npm_upgrade="doas npm install -g npm@latest"
+alias npm_list="npm list -g --depth=0"
+alias pip_upgrade="python -m pip install --upgrade pip"
+# pip list and pip freeze command list pip packages
+
+# get top process eating memory
+alias psmem="ps auxf | sort -nr -k 4 | head -5"
+# get top process eating cpu
+alias pscpu="ps auxf | sort -nr -k 3 | head -5"
+
+# game shortcuts
+alias {cbpunk,cyberpunk}="steam steam://rungameid/1091500 &"
+alias {twd,thewalkingdead}="steam steam://rungameid/1449690 &"
+alias veloren="veloren-voxygen"
+alias {cbmods,cybermods}="cd ~/.local/share/Steam/steamapps/common/Cyberpunk\ 2077/archive/pc/mod"
+
+# bookmarks
+alias forums="librewolf https://forum.artixlinux.org/ &"
+alias smarden="links http://smarden.org/runit/"
+alias codeberg="librewolf https://codeberg.org/ &"
+alias sqlsc="links https://sqlservercentral.com"
+alias {frogfind,frog,ff}="links https://frogfind.com"
+alias {gp,gopherpedia}="lynx gopher://gopherpedia.com:70"
+alias gopher="lynx https://gopher.floodgap.com/gopher/gw.lite"
+alias {ddg,duckduckgo}="links https://duckduckgo.com/lite"
+alias bangs="links https://duckduckgo.com/bang_lite.html"
+alias {cdread,cafedread}="links https://cafedread.com"
+alias torch="links xmh57jrknzkhv6y3ls3ubitzfqnkrwxhopf5aygthi7d6rplyvk3noyd.onion/cgi-bin/omega/omega"
+alias wikipedia="links https://wikipedia.org"
+alias hackernews="links https://news.ycombinator.com/"
+alias apnews="links https://apnews.com"
+alias {ddgt,duckducktor}="links https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/"
+alias searx="links http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion/"
+alias {hwiki,hiddenwiki}="links http://zqktlwiuavvvqqt4ybvgvi7tyo4hjl5xgfuvpdf6otjiycgwqbym2qad.onion/wiki/"
+alias {darknet,darknetlive}="links http://darkzzx4avcsuofgfez5zq75cqc4mprjvfqywo45dfcaxrwqg6qrlfid.onion/"
+alias ttaxi="links http://tortaxi7axhn2fv4j475a6blv7vwjtpieokolfnojwvkhsnj7sgctkqd.onion/"
+alias library="links http://libraryfyuybp7oyidyya3ah5xvwgyx6weauoini7zyz555litmmumad.onion/"
+alias ahmia="links http://juhanurmihxlp77nkq76byazcldy2hlmovfu2epvl5ankdibsot4csyd.onion/"
+alias darkside="links http://darksid3f3ggicny772rvdmrcgfbtixsyjpdgm6unh5qci6r24ukg4qd.onion/"
+alias breakbad="links http://bbzzzsvqcrqtki6umym6itiixfhni37ybtt7mkbjyxn2pgllzxf2qgyd.onion/"
+alias comix="links http://nv3x2jozywh63fkohn5mwp2d73vasusjixn3im3ueof52fmbjsigw6ad.onion"
+
+# ddgr shebang bookmarks
+alias ddgr="ddgr -x -n 25 --unsafe --proxy 127.0.0.1:8118"
+alias ducky="ddgr -jx -n 25 --unsafe --proxy 127.0.0.1:8118"
+alias aur='ddgr \!aur "${1}"'
+alias archwiki='ddgr \!archwiki "${1}"'
+alias wiki='ddgr \!w "${1}"'
+alias gh='ddgr --gb \!gh "${1}"'
+# must have account to use gitlab bang
+alias glab='ddgr --gb \!glab "${1}"'
+alias red='ddgr \!r "${1}"'
+alias yt='ddgr --gb \!yt "${1}"'
+
+# run the following two aliases every time you update the kernels and nvidiadkms
+alias {grub_update,update_grub}="doas grub-mkconfig -o /boot/grub/grub.cfg"
+alias regen_initramfs="doas mkinitcpio -P"
+
+# DEPRECATED aliases (noted here for posterity):
+
+# pjson is now easily replaced by package jq
+# alias pjson="json_pp | pygmentize -l json" # pipe expected json output through pjson to prettify it
+# alias {bmux,mymux,memux,mmux}="tmux new-session \; send-keys 'nvim' C-m\; split-window -v -p 3\; split-window -h -p 50\; select-pane -t 0\;"
+# alias tls="tmux ls"
+# alias ta="tmux a -t"
+# alias tkill="tmux kill-ses -t"
+
diff --git a/bashrc.txt b/bashrc.txt
index 408b6912..0bfea3be 100644
--- a/bashrc.txt
+++ b/bashrc.txt
@@ -165,214 +165,6 @@ HISTTIMEFORMAT="%d/%m/%y %T "
 # Displays current git branch if there is any and also styles bash prompt
 export PS1='\[\033[01;36m\][\u@\h\[\033[01;37m\] \W\[\033[01;36m\]]\$\033[01;37m\] $(git branch 2>/dev/null | grep '^*' | colrm 1 2)\n\033[01;36m└─▶\033[37m '
 
-# Custom Bash Commands
-alias dmesg="doas dmesg -H"
-alias kernel="uname -r"
-alias .="cd"
-alias home="xclear && cd /home/brian && clear && history -c && history -w && hash -r"
-alias docs="cd ~/Documents"
-alias down="cd ~/Downloads"
-alias pics="cd ~/Pictures"
-alias music="cd ~/Music"
-alias vids="cd ~/Videos"
-alias games="cd ~/.local/share/Steam/steamapps/common"
-alias notes="cd ~/Documents/notes"
-alias scripts="cd ~/scripts"
-alias config="cd ~/.config"
-alias cache="cd ~/.cache"
-alias svs="cd /etc/runit/sv"
-alias Code="cd ~/Documents/Code"
-alias cplus="cd ~/Documents/Code/cpp"
-alias js="cd ~/Documents/Code/javascript"
-alias py="cd ~/Documents/Code/python"
-alias wtuts="cd ~/Documents/Code/web_tutorials"
-alias btuts="cd ~/Documents/Code/book_tutorials"
-alias locate="locate -i"
-alias bat="bat --theme Nord"
-alias batman="man bat"
-alias li="ls -l --color=auto"
-alias ll="ls -liasSh --color=auto"
-alias {lsdir,lsd}="ls -t -1" # list only the directories
-alias lshw="doas lshw -short" # list hardware
-alias of="onefetch -o yaml"
-alias mkdir='mkdir -pv'
-alias {ex,esc}="exit"
-alias {his,hist}="history"
-alias mnt="doas mount /dev/sda1 /mnt/media/usb-drive"
-alias umnt="doas umount /mnt/media/usb-drive"
-alias imnt="ifuse /home/brian/iphone"
-alias iumnt="doas umount /home/brian/iphone"
-alias kmnt="doas mount /dev/sda /mnt/media/kobo"
-alias kumnt="doas umount /dev/sda /mnt/media/kobo"
-alias rm="newrm -vi"
-alias {rcrm,rrm}="doas xargs -d\\n rm -r -v" # when piped after locate or find command, recursively removes outputted files
-alias mv="mv -v"
-alias ln="ln -i"
-alias {doasedit,sudoedit}="doas rnano"
-alias clean_cache="doas paccache -r && doas rm -r /home/brian/.cache/*"
-alias shred="doas shred -uzv" # shreds the file and overwrites it with 1s and 0s, shows progress
-alias indelible="doas chattr +i" # makes a file impossible to delete (except with sudo)
-alias kfonts="kitty +list-fonts"
-alias {kdiff,kitten,kd}="kitty +kitten diff"
-alias rg="rg -i --colors 'match:fg:blue' --colors 'line:fg:blue'"
-alias fzfi="rg --files --hidden --follow --no-ignore-vcs -g '!{node_modules,.git}' | fzf"
-alias bluepill="neo-matrix --bold=2 -D --color=cyan --density=0.75 --charset=katakana --speed=12 --fullwidth --screensaver"
-alias btop="kitty -o font_size=12 -o background_opacity=0.40 -e btop; fullscreen enable"
-alias {librewolf,firefox}="librewolf"
-alias tor-browser="tor-browser &"
-alias chromium="chromium --disable-search-engine-collection --fingerprinting-canvas-image-data-noise --fingerpriting-canvas-measuretext-noise --fingerprinting-client-rects-noise --popups-to-tabs &"
-alias gimp="gimp --no-splash"
-alias krita="krita --nosplash"
-alias {sq,sql,sqlite}="sqlcipher"
-alias view="kitty +kitten icat"
-alias viewer="feh -F -Z -x"
-alias mupdf='mupdf -r 204'
-alias dkpdf='mupdf -I -r 204'
-alias {json,jscrl,jsoncurl,jcrl}="jscurl"
-alias amd="article_md"
-alias word="wordgrinder"
-alias spreadsheet="sc"
-alias pvctrl="pavucontrol"
-alias open="xdg-open"
-alias nc="nc -v"
-alias dump="doas tcpdump"
-alias {mydump,medump,mdump,bdump}="doas tcpdump -v -i wlan0"
-alias route="traceroute"
-alias listen="ss -a -t -p"
-alias {pdf2,pdf2txt}="pdftotext"
-alias tree="tree -ad -L 3 --prune -C"
-alias {nv,nvi}="nvim"
-alias {cproj,mproj,myproj}="cd '$cproj'"
-alias mon="nodemon"
-alias localhost="librewolf localhost:3000"
-alias {mi,mic}="micro"
-alias {mysql,maria,mdb}="mariadb"
-alias rsm="doas rsm"
-alias updatedb="doas updatedb"
-alias iftop-w="doas iftop -i wlan0 -P"
-# usage p0f -i wlan0
-alias p0f="doas p0f"
-alias vnstat-w="vnstat -i wlan0 --json | jq"
-alias {wi,ssid}="doas iw wlan0 scan | grep SSID"
-alias wifi-list="connmanctl services"
-alias wifi-scan="connmanctl scan wifi"
-alias wifi-connect="connmanctl connect wifi_34cff6c9b922_44495a5a_managed_psk"
-alias wifi-disconnect="connmanctl disconnect wifi_34cff6c9b922_44495a5a_managed_psk"
-alias wifi-up="doas ifconfig wlan0 up"
-alias wifi-down="doas ifconfig wlan0 down"
-alias letitsnow="doas docker start snowflake-proxy"
-alias snowfall="doas docker stop snowflake-proxy"
-alias snowlogs="doas docker logs -f snowflake-proxy"
-alias git-a="git add"
-alias git-c="git commit -m"
-alias git-p="git push"
-alias git-l="git log"
-alias git-s="git stash"
-alias {lsc,lscommits}="tig"
-alias lxapp="lxappearance"
-alias hd="ncdu"
-alias xsel="xclip -sel clip"
-alias catx="cat | xclip -sel clip"
-alias kitx="cat | kitty +kitten clipboard" # not as good as catx
-alias mouse="mousepad"
-alias xclear="echo '' | xclip && xclip -selection clipboard /dev/null"
-alias diff="diff -wy"
-alias exifread="exiftool"
-alias exifrm="exiftool -all="
-alias {html,html_pp}="hxnormalize -e"
-alias {mop,market,stonks,stocks}="cd ~/aur_packages/mop && go run ./cmd/mop/main.go && cd"
-alias {reddit,rd}="torsocks tuir"
-alias {sub,subreddit,subrd}="torsocks tuir -s"
-alias hn="hackernews_tui"
-alias qwiki="torsocks wik -i"
-alias tldr="torsocks tldr"
-alias {trans,translate}="gtktranslate"
-alias mpl="mplayer -fs"
-alias {mloop,mploop}="mplayer -fs -loop 0"
-alias mpv='mpv --fs'
-alias {muse,musik,cmu}="cmus"
-alias {hp,headphones}="pactl set-default-sink alsa_output.usb-FIIO_FiiO_USB_DAC-E10-01.analog-stereo"
-alias {sp,speakers}="pactl set-default-sink alsa_output.pci-0000_0a_00.4.analog-stereo"
-alias dspeakers="pactl set-default-sink alsa_output.pci-0000_08_00.1.hdmi-stereo-extra1"
-alias pulse="pamixer --set-volume"
-alias {mu,mt,mute}="pamixer -t"
-# laptop only currently, records video/audio, simply name filename .mp4 after command:
-alias r_vid="ffmpeg -f v4l2 -framerate 24 -video_size 640x480 -i /dev/video0 -itsoffset 00:00:01.0 -f alsa -i default -c:v libx264 -preset ultrafast -c:a aac"
-alias ytube="ytfzf -l --features=subtitles"
-alias {yti,ytinfo}="ytfzf -I L"
-alias {ytd,ytdownload}="ytfzf -d"
-alias {odysee,lbry}="ytfzf -c O --features=subtitles"
-alias {ptube,peertube}="ytfzf -c P --features=subtitles"
-alias ytdl="torsocks yt-dlp -f mp4"
-alias ytdl-a="torsocks yt-dlp -x --audio-format mp3"
-alias thinkorswim="~/thinkorswim/thinkorswim &"
-alias {cl,cls}="clear"
-alias shutdown="shutdown.sh"
-alias reboot="reboot.sh"
-alias curltime="curl -w \"@$HOME/Documents/notes/curl-format.txt\" -o /dev/null -s"
-alias inxi-w="inxi --weather-location 90004"
-alias forecast="curl -s 'http://wttr.in/losangeles'"
-alias ipaddr="curl ifconfig.me ; echo ''"
-alias hwclock="doas hwclock"
-alias killport="fuser -k"
-alias npm_upgrade="doas npm install -g npm@latest"
-alias npm_list="npm list -g --depth=0"
-alias pip_upgrade="python -m pip install --upgrade pip"
-# pip list and pip freeze command list pip packages
-
-# get top process eating memory
-alias psmem="ps auxf | sort -nr -k 4 | head -5"
-# get top process eating cpu
-alias pscpu="ps auxf | sort -nr -k 3 | head -5"
-
-# game shortcuts
-alias {cbpunk,cyberpunk}="steam steam://rungameid/1091500 &"
-alias {twd,thewalkingdead}="steam steam://rungameid/1449690 &"
-alias veloren="veloren-voxygen"
-alias {cbmods,cybermods}="cd ~/.local/share/Steam/steamapps/common/Cyberpunk\ 2077/archive/pc/mod"
-
-# bookmarks
-alias forums="librewolf https://forum.artixlinux.org/ &"
-alias smarden="links http://smarden.org/runit/"
-alias codeberg="librewolf https://codeberg.org/ &"
-alias sqlsc="links https://sqlservercentral.com"
-alias {frogfind,frog,ff}="links https://frogfind.com"
-alias {gp,gopherpedia}="lynx gopher://gopherpedia.com:70"
-alias gopher="lynx https://gopher.floodgap.com/gopher/gw.lite"
-alias {ddg,duckduckgo}="links https://duckduckgo.com/lite"
-alias bangs="links https://duckduckgo.com/bang_lite.html"
-alias {cdread,cafedread}="links https://cafedread.com"
-alias torch="links xmh57jrknzkhv6y3ls3ubitzfqnkrwxhopf5aygthi7d6rplyvk3noyd.onion/cgi-bin/omega/omega"
-alias wikipedia="links https://wikipedia.org"
-alias hackernews="links https://news.ycombinator.com/"
-alias apnews="links https://apnews.com"
-alias {ddgt,duckducktor}="links https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/"
-alias searx="links http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion/"
-alias {hwiki,hiddenwiki}="links http://zqktlwiuavvvqqt4ybvgvi7tyo4hjl5xgfuvpdf6otjiycgwqbym2qad.onion/wiki/"
-alias {darknet,darknetlive}="links http://darkzzx4avcsuofgfez5zq75cqc4mprjvfqywo45dfcaxrwqg6qrlfid.onion/"
-alias ttaxi="links http://tortaxi7axhn2fv4j475a6blv7vwjtpieokolfnojwvkhsnj7sgctkqd.onion/"
-alias library="links http://libraryfyuybp7oyidyya3ah5xvwgyx6weauoini7zyz555litmmumad.onion/"
-alias ahmia="links http://juhanurmihxlp77nkq76byazcldy2hlmovfu2epvl5ankdibsot4csyd.onion/"
-alias darkside="links http://darksid3f3ggicny772rvdmrcgfbtixsyjpdgm6unh5qci6r24ukg4qd.onion/"
-alias breakbad="links http://bbzzzsvqcrqtki6umym6itiixfhni37ybtt7mkbjyxn2pgllzxf2qgyd.onion/"
-alias comix="links http://nv3x2jozywh63fkohn5mwp2d73vasusjixn3im3ueof52fmbjsigw6ad.onion"
-
-# ddgr shebang bookmarks
-alias ddgr="ddgr -x -n 25 --unsafe --proxy 127.0.0.1:8118"
-alias ducky="ddgr -jx -n 25 --unsafe --proxy 127.0.0.1:8118"
-alias aur='ddgr \!aur "${1}"'
-alias archwiki='ddgr \!archwiki "${1}"'
-alias wiki='ddgr \!w "${1}"'
-alias gh='ddgr --gb \!gh "${1}"'
-# must have account to use gitlab bang
-alias glab='ddgr --gb \!glab "${1}"'
-alias red='ddgr \!r "${1}"'
-alias yt='ddgr --gb \!yt "${1}"'
-
-# run the following two aliases every time you update the kernels and nvidiadkms
-alias {grub_update,update_grub}="doas grub-mkconfig -o /boot/grub/grub.cfg"
-alias regen_initramfs="doas mkinitcpio -P"
-
 # Configure thefuck
 eval "$(thefuck --alias)"
 export PATH="$PATH:$GOPATH/bin:/home/brian/scripts:/home/brian/.local/bin:/home/brian/.local/share/nvim/lsp_servers"
@@ -383,13 +175,5 @@ export GREP_COLORS='ms=01;36'
 if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
 # END_KITTY_SHELL_INTEGRATION
 
-# DEPRECATED aliases (noted here for posterity):
-
-# pjson is now easily replaced by package jq
-# alias pjson="json_pp | pygmentize -l json" # pipe expected json output through pjson to prettify it
-# alias {bmux,mymux,memux,mmux}="tmux new-session \; send-keys 'nvim' C-m\; split-window -v -p 3\; split-window -h -p 50\; select-pane -t 0\;"
-# alias tls="tmux ls"
-# alias ta="tmux a -t"
-# alias tkill="tmux kill-ses -t"
-
+source ~/.aliases
 source /home/brian/.bash_completions/typer.sh
diff --git a/zshrc.txt b/zshrc.txt
index b1e63844..22ca1739 100644
--- a/zshrc.txt
+++ b/zshrc.txt
@@ -9,6 +9,9 @@ export BROWSER=links
 export TUIR_BROWSER=librewolf
 export EDITOR=nvim
 
+# Formats history command with dates/times
+export HISTTIMEFORMAT="%d/%m/%y %T "
+
 # Configure thefuck
 eval "$(thefuck --alias)"
 # Change with care:
@@ -64,231 +67,6 @@ erase_history && hash -r
 # Set up vim mode
 bindkey -v
 
-#Custom Aliases
-alias ls='ls --color=auto'
-alias grep='grep --colour=auto'
-alias egrep='egrep --colour=auto'
-alias fgrep='fgrep --colour=auto'
-alias cp="cp -i"
-alias df='df -h'
-alias free='free -m'
-alias dmesg="doas dmesg -H"
-alias kernel="uname -r"
-alias .="cd"
-alias home="xclear && cd /home/brian && clear && erase_history && hash -r"
-alias docs="cd ~/Documents"
-alias down="cd ~/Downloads"
-alias pics="cd ~/Pictures"
-alias music="cd ~/Music"
-alias vids="cd ~/Videos"
-alias games="cd ~/.local/share/Steam/steamapps/common"
-alias notes="cd ~/Documents/notes"
-alias scripts="cd ~/scripts"
-alias config="cd ~/.config"
-alias cache="cd ~/.cache"
-alias svs="cd /etc/runit/sv"
-alias Code="cd ~/Documents/Code"
-alias cplus="cd ~/Documents/Code/cpp"
-alias js="cd ~/Documents/Code/javascript"
-alias py="cd ~/Documents/Code/python"
-alias wtuts="cd ~/Documents/Code/web_tutorials"
-alias btuts="cd ~/Documents/Code/book_tutorials"
-alias fonts="fc-list"
-alias locate="locate -i"
-alias bat="bat --theme Nord"
-alias batman="man bat"
-alias li="ls -l --color=auto"
-alias ll="ls -liasSh --color=auto"
-alias {lsdir,lsd}="ls -t -1" # list only the directories
-alias lshw="doas lshw -short" # list hardware
-alias of="onefetch -o yaml"
-alias mkdir='mkdir -pv'
-alias {ex,esc}="exit"
-alias {his,hist}="history"
-alias mnt="doas mount /dev/sda1 /mnt/media/usb-drive"
-alias umnt="doas umount /mnt/media/usb-drive"
-alias imnt="ifuse /home/brian/iphone"
-alias iumnt="doas umount /home/brian/iphone"
-alias kmnt="doas mount /dev/sda /mnt/media/kobo"
-alias kumnt="doas umount /dev/sda /mnt/media/kobo"
-alias rm="newrm -vi"
-alias {rcrm,rrm}="doas xargs -d\\n rm -r -v" # when piped after locate or find command, recursively removes outputted files
-alias mv="mv -v"
-alias ln="ln -i"
-alias {doasedit,sudoedit}="doas rnano"
-alias clean_cache="doas paccache -r && doas rm -r /home/brian/.cache/*"
-alias shred="doas shred -uzv" # shreds the file and overwrites it with 1s and 0s, shows progress
-alias indelible="doas chattr +i" # makes a file impossible to delete (except with sudo)
-alias kfonts="kitty +list-fonts"
-alias {kdiff,kitten,kd}="kitty +kitten diff"
-alias rg="rg -i --colors 'match:fg:blue' --colors 'line:fg:blue'"
-alias fzfi="rg --files --hidden --follow --no-ignore-vcs -g '!{node_modules,.git}' | fzf"
-alias bluepill="neo-matrix --bold=2 -D --color=cyan --density=0.75 --charset=katakana --speed=12 --fullwidth --screensaver"
-alias btop="kitty -o font_size=12 -o background_opacity=0.40 -e btop; fullscreen enable"
-alias {librewolf,firefox}="librewolf"
-alias tor-browser="tor-browser &"
-alias chromium="chromium --disable-search-engine-collection --fingerprinting-canvas-image-data-noise --fingerpriting-canvas-measuretext-noise --fingerprinting-client-rects-noise --popups-to-tabs &"
-alias gimp="gimp --no-splash"
-alias krita="krita --nosplash"
-alias {sq,sql,sqlite}="sqlcipher"
-alias view="kitty +kitten icat"
-alias viewer="feh -F -Z -x"
-alias mupdf='mupdf -r 204'
-alias dkpdf='mupdf -I -r 204'
-alias {json,jscrl,jsoncurl,jcrl}="jscurl"
-alias amd="article_md"
-alias word="wordgrinder"
-alias spreadsheet="sc"
-alias pvctrl="pavucontrol"
-alias open="xdg-open"
-alias nc="nc -v"
-alias dump="doas tcpdump"
-alias {mydump,medump,mdump,bdump}="doas tcpdump -v -i wlan0"
-alias route="traceroute"
-alias listen="ss -a -t -p"
-alias {pdf2,pdf2txt}="pdftotext"
-alias tree="tree -ad -L 3 --prune -C"
-alias {nv,nvi}="nvim"
-alias {cproj,mproj,myproj}="cd '$cproj'"
-alias mon="nodemon"
-alias localhost="librewolf localhost:3000"
-alias {mi,mic}="micro"
-alias {mysql,maria,mdb}="mariadb"
-alias rsm="doas rsm"
-alias updatedb="doas updatedb"
-alias iftop-w="doas iftop -i wlan0 -P"
-# usage p0f -i wlan0
-alias p0f="doas p0f"
-alias vnstat-w="vnstat -i wlan0 --json | jq"
-alias {wi,ssid}="doas iw wlan0 scan | grep SSID"
-alias wifi-list="connmanctl services"
-alias wifi-scan="connmanctl scan wifi"
-alias wifi-connect="connmanctl connect wifi_34cff6c9b922_44495a5a_managed_psk"
-alias wifi-disconnect="connmanctl disconnect wifi_34cff6c9b922_44495a5a_managed_psk"
-alias wifi-up="doas ifconfig wlan0 up"
-alias wifi-down="doas ifconfig wlan0 down"
-alias letitsnow="doas docker start snowflake-proxy"
-alias snowfall="doas docker stop snowflake-proxy"
-alias snowlogs="doas docker logs -f snowflake-proxy"
-alias git-a="git add"
-alias git-c="git commit -m"
-alias git-p="git push"
-alias git-l="git log"
-alias git-s="git stash"
-alias {lsc,lscommits}="tig"
-alias lxapp="lxappearance"
-alias hd="ncdu"
-alias xsel="xclip -sel clip"
-alias catx="cat | xclip -sel clip"
-alias kitx="cat | kitty +kitten clipboard" # not as good as catx
-alias mouse="mousepad"
-alias xclear="echo '' | xclip && xclip -selection clipboard /dev/null"
-alias diff="diff -wy"
-alias exifread="exiftool"
-alias exifrm="exiftool -all="
-alias {html,html_pp}="hxnormalize -e"
-alias {mop,market,stonks,stocks}="cd ~/aur_packages/mop && go run ./cmd/mop/main.go && cd"
-alias {reddit,rd}="torsocks tuir"
-alias {sub,subreddit,subrd}="torsocks tuir -s"
-alias hn="hackernews_tui"
-alias qwiki="torsocks wik -i"
-alias tldr="torsocks tldr"
-alias {trans,translate}="gtktranslate"
-alias mpl="mplayer -fs"
-alias {mloop,mploop}="mplayer -fs -loop 0"
-alias mpv='mpv --fs'
-alias {muse,musik,cmu}="cmus"
-alias {hp,headphones}="pactl set-default-sink alsa_output.usb-FIIO_FiiO_USB_DAC-E10-01.analog-stereo"
-alias {sp,speakers}="pactl set-default-sink alsa_output.pci-0000_0a_00.4.analog-stereo"
-alias dspeakers="pactl set-default-sink alsa_output.pci-0000_08_00.1.hdmi-stereo-extra1"
-alias pulse="pamixer --set-volume"
-alias {mu,mt,mute}="pamixer -t"
-# laptop only currently, records video/audio, simply name filename .mp4 after command:
-alias r_vid="ffmpeg -f v4l2 -framerate 24 -video_size 640x480 -i /dev/video0 -itsoffset 00:00:01.0 -f alsa -i default -c:v libx264 -preset ultrafast -c:a aac"
-alias ytube="ytfzf -l --features=subtitles"
-alias {yti,ytinfo}="ytfzf -I L"
-alias {ytd,ytdownload}="ytfzf -d"
-alias {odysee,lbry}="ytfzf -c O --features=subtitles"
-alias {ptube,peertube}="ytfzf -c P --features=subtitles"
-alias ytdl="torsocks yt-dlp -f mp4"
-alias ytdl-a="torsocks yt-dlp -x --audio-format mp3"
-alias thinkorswim="~/thinkorswim/thinkorswim &"
-alias {cl,cls}="clear"
-alias shutdown="shutdown.sh"
-alias reboot="reboot.sh"
-alias curltime="curl -w \"@$HOME/Documents/notes/curl-format.txt\" -o /dev/null -s"
-alias inxi-w="inxi --weather-location 90004"
-alias forecast="curl -s 'http://wttr.in/losangeles'"
-alias ipaddr="curl ifconfig.me ; echo ''"
-alias hwclock="doas hwclock"
-alias killport="fuser -k"
-alias npm_upgrade="doas npm install -g npm@latest"
-alias npm_list="npm list -g --depth=0"
-alias pip_upgrade="python -m pip install --upgrade pip"
-# pip list and pip freeze command list pip packages
-
-# get top process eating memory
-alias psmem="ps auxf | sort -nr -k 4 | head -5"
-# get top process eating cpu
-alias pscpu="ps auxf | sort -nr -k 3 | head -5"
-
-# game shortcuts
-alias {cbpunk,cyberpunk}="steam steam://rungameid/1091500 &"
-alias {twd,thewalkingdead}="steam steam://rungameid/1449690 &"
-alias veloren="veloren-voxygen"
-alias {cbmods,cybermods}="cd ~/.local/share/Steam/steamapps/common/Cyberpunk\ 2077/archive/pc/mod"
-
-# bookmarks
-alias forums="librewolf https://forum.artixlinux.org/ &"
-alias smarden="links http://smarden.org/runit/"
-alias codeberg="librewolf https://codeberg.org/ &"
-alias sqlsc="links https://sqlservercentral.com"
-alias {frogfind,frog,ff}="links https://frogfind.com"
-alias {gp,gopherpedia}="lynx gopher://gopherpedia.com:70"
-alias gopher="lynx https://gopher.floodgap.com/gopher/gw.lite"
-alias {ddg,duckduckgo}="links https://duckduckgo.com/lite"
-alias bangs="links https://duckduckgo.com/bang_lite.html"
-alias {cdread,cafedread}="links https://cafedread.com"
-alias torch="links xmh57jrknzkhv6y3ls3ubitzfqnkrwxhopf5aygthi7d6rplyvk3noyd.onion/cgi-bin/omega/omega"
-alias wikipedia="links https://wikipedia.org"
-alias hackernews="links https://news.ycombinator.com/"
-alias apnews="links https://apnews.com"
-alias {ddgt,duckducktor}="links https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/"
-alias searx="links http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion/"
-alias {hwiki,hiddenwiki}="links http://zqktlwiuavvvqqt4ybvgvi7tyo4hjl5xgfuvpdf6otjiycgwqbym2qad.onion/wiki/"
-alias {darknet,darknetlive}="links http://darkzzx4avcsuofgfez5zq75cqc4mprjvfqywo45dfcaxrwqg6qrlfid.onion/"
-alias ttaxi="links http://tortaxi7axhn2fv4j475a6blv7vwjtpieokolfnojwvkhsnj7sgctkqd.onion/"
-alias library="links http://libraryfyuybp7oyidyya3ah5xvwgyx6weauoini7zyz555litmmumad.onion/"
-alias ahmia="links http://juhanurmihxlp77nkq76byazcldy2hlmovfu2epvl5ankdibsot4csyd.onion/"
-alias darkside="links http://darksid3f3ggicny772rvdmrcgfbtixsyjpdgm6unh5qci6r24ukg4qd.onion/"
-alias breakbad="links http://bbzzzsvqcrqtki6umym6itiixfhni37ybtt7mkbjyxn2pgllzxf2qgyd.onion/"
-alias comix="links http://nv3x2jozywh63fkohn5mwp2d73vasusjixn3im3ueof52fmbjsigw6ad.onion"
-
-# ddgr shebang bookmarks
-alias ddgr="ddgr -x -n 25 --unsafe --proxy 127.0.0.1:8118"
-alias ducky="ddgr -jx -n 25 --unsafe --proxy 127.0.0.1:8118"
-alias aur='ddgr \!aur "${1}"'
-alias archwiki='ddgr \!archwiki "${1}"'
-alias wiki='ddgr \!w "${1}"'
-alias gh='ddgr --gb \!gh "${1}"'
-# must have account to use gitlab bang
-alias glab='ddgr --gb \!glab "${1}"'
-alias red='ddgr \!r "${1}"'
-alias yt='ddgr --gb \!yt "${1}"'
-
-# run the following two aliases every time you update the kernels and nvidiadkms
-alias {grub_update,update_grub}="doas grub-mkconfig -o /boot/grub/grub.cfg"
-alias regen_initramfs="doas mkinitcpio -P"
-
-# DEPRECATED aliases (noted here for posterity):
-
-# pjson is now easily replaced by package jq
-# alias pjson="json_pp | pygmentize -l json" # pipe expected json output through pjson to prettify it
-# alias {bmux,mymux,memux,mmux}="tmux new-session \; send-keys 'nvim' C-m\; split-window -v -p 3\; split-window -h -p 50\; select-pane -t 0\;"
-# alias tls="tmux ls"
-# alias ta="tmux a -t"
-# alias tkill="tmux kill-ses -t"
-
 # Kitty Shell Integration
 # if test -n "$KITTY_INSTALLATION_DIR"; then
     # export KITTY_SHELL_INTEGRATION="enabled"
@@ -296,6 +74,6 @@ alias regen_initramfs="doas mkinitcpio -P"
     # kitty-integration
     # unfunction kitty-integration
 # fi
-
+source ~/.aliases
 # Plugins (that need to be at the end of the zshrc script)
 source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh