update

Signed-off-by: Anna (navi) Figueiredo Gomes <navi@vlhl.dev>

4 files changed, 235 insertions, 271 deletions

diff --git a/.config/zsh/.zcompdump b/.config/zsh/.zcompdump
index c9bc85b..e81e47b 100644
--- a/.config/zsh/.zcompdump
+++ b/.config/zsh/.zcompdump
@@ -1,4 +1,4 @@
-#files: 995	version: 5.9
+#files: 1145	version: 5.9
 
 _comps=(
 '-' '_precommand'
@@ -28,10 +28,12 @@ _comps=(
 'add-zle-hook-widget' '_add-zle-hook-widget'
 'add-zsh-hook' '_add-zsh-hook'
 'admin' '_sccs'
+'afew' '_afew'
 'ali' '_mh'
 'alias' '_alias'
 'amaya' '_webbrowser'
 'analyseplugin' '_analyseplugin'
+'android' '_android'
 'animate' '_imagemagick'
 'anno' '_mh'
 'ansible' '_ansible'
@@ -64,6 +66,7 @@ _comps=(
 'apt-move' '_apt-move'
 'apt-show-versions' '_apt-show-versions'
 'apvlv' '_pdf'
+'archlinux-java' '_archlinux-java'
 'arduino-ctags' '_ctags'
 'arecord' '_alsa-utils'
 'arena' '_webbrowser'
@@ -71,11 +74,13 @@ _comps=(
 'arp' '_arp'
 'arping' '_arping'
 '-array-value-' '_value'
+'artisan' '_artisan'
 'asciidoctor' '_asciidoctor'
 'asciinema' '_asciinema'
 'ash' '_sh'
 '-assign-parameter-' '_assign'
 'at' '_at'
+'atach' '_atach'
 'atq' '_at'
 'atrm' '_at'
 'attr' '_attr'
@@ -104,10 +109,12 @@ _comps=(
 'bibtex' '_bibtex'
 'bindkey' '_bindkey'
 'bison' '_bison'
+'bitcoin-cli' '_bitcoin-cli'
 'bmake' '_make'
 'bogofilter' '_bogofilter'
 'bogotune' '_bogofilter'
 'bogoutil' '_bogofilter'
+'bower' '_bower'
 'bpython' '_bpython'
 'bpython2' '_bpython'
 'bpython2-gtk' '_bpython'
@@ -138,9 +145,9 @@ _comps=(
 'bug' '_bug'
 'buildhash' '_ispell'
 'builtin' '_builtin'
+'bundle' '_bundle'
 'bunzip2' '_bzip2'
 'burst' '_mh'
-'bwrap' '_bwrap'
 'bzcat' '_bzip2'
 'bzegrep' '_grep'
 'bzfgrep' '_grep'
@@ -153,9 +160,12 @@ _comps=(
 'caffeinate' '_caffeinate'
 'cal' '_cal'
 'calendar' '_calendar'
+'cap' '_cap'
+'cask' '_cask'
 'cat' '_cat'
 'catchsegv' '_precommand'
 'cc' '_gcc'
+'ccache' '_ccache'
 'ccal' '_ccal'
 'cd' '_cd'
 'cdbs-edit-patch' '_cdbs-edit-patch'
@@ -166,6 +176,7 @@ _comps=(
 'cdrecord' '_cdrecord'
 'ceilometer' '_openstack'
 'certtool' '_gnutls'
+'cf' '_cf'
 'cftp' '_twisted'
 'chage' '_users'
 'chattr' '_chattr'
@@ -178,9 +189,11 @@ _comps=(
 'chkconfig' '_chkconfig'
 'chkstow' '_stow'
 'chmod' '_chmod'
+'choc' '_choc'
 'choom' '_choom'
 'chown' '_chown'
 'chpass' '_chsh'
+'chromium' '_chromium'
 'chroot' '_chroot'
 'chrt' '_chrt'
 'chsh' '_chsh'
@@ -195,9 +208,11 @@ _comps=(
 'clear' '_nothing'
 'cloudkitty' '_openstack'
 'clusterdb' '_postgresql'
+'cmake' '_cmake'
 'cmp' '_cmp'
 'co' '_rcs'
 'code' '_code'
+'coffee' '_coffee'
 'column' '_column'
 'comb' '_sccs'
 'combine' '_imagemagick'
@@ -210,13 +225,15 @@ _comps=(
 'compadd' '_compadd'
 'compdef' '_compdef'
 'composer' '_composer'
-'composer.phar' '_composer'
 'composite' '_imagemagick'
 'compress' '_compress'
+'conan' '_conan'
 'conch' '_twisted'
+'concourse' '_concourse'
 '-condition-' '_condition'
 'config.status' '_configure'
 'configure' '_configure'
+'console' '_console'
 'convert' '_imagemagick'
 'coreadm' '_coreadm'
 'cowsay' '_cowsay'
@@ -224,9 +241,10 @@ _comps=(
 'cp' '_cp'
 'cpio' '_cpio'
 'cplay' '_cplay'
+'cppcheck' '_cppcheck'
 'cpupower' '_cpupower'
-'createdb' '_postgresql'
-'createuser' '_postgresql'
+'createdb' '_pgsql_utils'
+'createuser' '_pgsql_utils'
 'crontab' '_crontab'
 'crsh' '_cssh'
 'cryptsetup' '_cryptsetup'
@@ -253,6 +271,7 @@ _comps=(
 'cygserver.exe' '_cygserver'
 'cygstart' '_cygstart'
 'cygstart.exe' '_cygstart'
+'dad' '_dad'
 'dak' '_dak'
 'darcs' '_darcs'
 'dash' '_sh'
@@ -287,9 +306,12 @@ _comps=(
 'designate' '_openstack'
 'devtodo' '_devtodo'
 'df' '_df'
+'dget' '_dget'
 'dhclient' '_dhclient'
 'dhclient3' '_dhclient'
+'dhcpcd' '_dhcpcd'
 'dhcpinfo' '_dhcpinfo'
+'diana' '_diana'
 'dict' '_dict'
 'diff' '_diff'
 'diff3' '_diff3'
@@ -317,6 +339,7 @@ _comps=(
 'docker' '_docker'
 'docker-compose' '_docker-compose'
 'dockerd' '_docker'
+'docpad' '_docpad'
 'domainname' '_yp'
 'dos2unix' '_dos2unix'
 'dosdel' '_floppy'
@@ -333,8 +356,9 @@ _comps=(
 'dput' '_dput'
 'drill' '_drill'
 'dropbox' '_dropbox'
-'dropdb' '_postgresql'
-'dropuser' '_postgresql'
+'dropdb' '_pgsql_utils'
+'dropuser' '_pgsql_utils'
+'drush' '_drush'
 'dscverify' '_dscverify'
 'dsh' '_dsh'
 'dtrace' '_dtrace'
@@ -343,6 +367,10 @@ _comps=(
 'dumpadm' '_dumpadm'
 'dumper' '_dumper'
 'dumper.exe' '_dumper'
+'_dunst' '_dunst'
+'dunst' '_dunst'
+'_dunstctl' '_dunstctl'
+'dunstctl' '_dunstctl'
 'dupload' '_dupload'
 'dvibook' '_dvi'
 'dviconcat' '_dvi'
@@ -357,6 +385,7 @@ _comps=(
 'e2label' '_e2label'
 'eatmydata' '_precommand'
 'ecasound' '_ecasound'
+'ecdsautil' '_ecdsautil'
 'echotc' '_echotc'
 'echoti' '_echoti'
 'ed' '_ed'
@@ -364,10 +393,12 @@ _comps=(
 'elfdump' '_elfdump'
 'elinks' '_elinks'
 'emulate' '_emulate'
+'emulator' '_emulator'
 'enable' '_enable'
 'enscript' '_enscript'
 'entr' '_entr'
 'env' '_env'
+'envdir' '_envdir'
 'eog' '_eog'
 'epdfview' '_pdf'
 'epsffit' '_psutils'
@@ -389,9 +420,12 @@ _comps=(
 'expand' '_unexpand'
 'explodepkg' '_pkgtool'
 'export' '_typeset'
+'exportfs' '_exportfs'
 'express' '_webbrowser'
 'extcheck' '_java'
 'extractres' '_psutils'
+'fab' '_fab'
+'fail2ban-client' '_fail2ban-client'
 'fakeroot' '_fakeroot'
 'false' '_nothing'
 'fc' '_fc'
@@ -400,6 +434,7 @@ _comps=(
 'feh' '_feh'
 'fetch' '_fetch'
 'fetchmail' '_fetchmail'
+'ffind' '_ffind'
 'ffmpeg' '_ffmpeg'
 'fg' '_jobs_fg'
 'fgrep' '_grep'
@@ -424,6 +459,7 @@ _comps=(
 'fixwpps' '_psutils'
 'fixwwps' '_psutils'
 'flac' '_flac'
+'fleetctl' '_fleetctl'
 'flex' '_flex'
 'flex++' '_flex'
 'flipdiff' '_patchutils'
@@ -431,6 +467,8 @@ _comps=(
 'flists' '_mh'
 'float' '_typeset'
 'flowadm' '_flowadm'
+'flutter' '_flutter'
+'fly' '_concourse'
 'fmadm' '_fmadm'
 'fmt' '_fmt'
 'fmttest' '_mh'
@@ -439,6 +477,7 @@ _comps=(
 'fold' '_fold'
 'folder' '_mh'
 'folders' '_mh'
+'force' '_force'
 'fortune' '_fortune'
 'forw' '_mh'
 'fprev' '_mh'
@@ -455,8 +494,10 @@ _comps=(
 'fusermount' '_fusermount'
 'fwhois' '_whois'
 'fw_update' '_fw_update'
+'fwupdmgr' '_fwupdmgr'
 'g++' '_gcc'
 'galeon' '_webbrowser'
+'gas' '_gas'
 'gawk' '_awk'
 'gb2sum' '_md5sum'
 'gbase32' '_base64'
@@ -507,21 +548,31 @@ _comps=(
 'ggetopt' '_getopt'
 'ggrep' '_grep'
 'ggv' '_gnome-gv'
+'ghc' '_ghc'
+'ghci' '_ghc'
+'ghc-pkg' '_ghc'
 'ghead' '_head'
 'ghostscript' '_ghostscript'
 'ghostview' '_pspdf'
 'gid' '_id'
 'ginstall' '_install'
+'gist' '_gist'
 'git' '_git'
 'git-buildpackage' '_git-buildpackage'
 'git-cvsserver' '_git'
+'git-flow' '_git-flow'
+'git-journal' '_git-journal'
 'gitk' '_git'
+'git-pulls' '_git-pulls'
 'git-receive-pack' '_git'
+'git-revise' '_git-revise'
 'git-shell' '_git'
 'git-upload-archive' '_git'
 'git-upload-pack' '_git'
+'git-wtf' '_git-wtf'
 'gjoin' '_join'
 'glance' '_openstack'
+'glances' '_glances'
 'gln' '_ln'
 'global' '_global'
 'glocate' '_locate'
@@ -550,13 +601,16 @@ _comps=(
 'gnutls-cli' '_gnutls'
 'gnutls-cli-debug' '_gnutls'
 'gnutls-serv' '_gnutls'
+'go' '_golang'
 'god' '_od'
 'gofmt' '_go'
+'google' '_google'
 'gpasswd' '_gpasswd'
 'gpaste' '_paste'
 'gpatch' '_patch'
 'gpg' '_gpg'
 'gpg2' '_gpg'
+'gpgconf' '_gpgconf'
 'gpgv' '_gpg'
 'gpg-zip' '_gpg'
 'gphoto2' '_gphoto2'
@@ -607,6 +661,7 @@ _comps=(
 'gtar' '_tar'
 'gtee' '_tee'
 'gtimeout' '_timeout'
+'gtk-launch' '_gtk-launch'
 'gtouch' '_touch'
 'gtr' '_tr'
 'gtty' '_tty'
@@ -658,16 +713,21 @@ _comps=(
 'hdiutil' '_hdiutil'
 'head' '_head'
 'heat' '_openstack'
+'hello' '_hello'
 'help' '_sccs'
 'hexdump' '_hexdump'
 'hilite' '_precommand'
 'histed' '_zed'
 'history' '_fc'
+'hledger' '_hledger'
+'homestead' '_homestead'
 'host' '_host'
 'hostname' '_hostname'
 'hotjava' '_webbrowser'
 'htop' '_htop'
+'http' '_httpie'
 'hwinfo' '_hwinfo'
+'ibus' '_ibus'
 'iceweasel' '_mozilla'
 'icombine' '_ispell'
 'iconv' '_iconv'
@@ -679,14 +739,16 @@ _comps=(
 'iftop' '_iftop'
 'ifup' '_net_interfaces'
 'ijoin' '_ispell'
+'img2sixel' '_img2sixel'
 'import' '_imagemagick'
 'inc' '_mh'
 'includeres' '_psutils'
+'include-what-you-use' '_include-what-you-use'
 'inetadm' '_inetadm'
 'info' '_texinfo'
 'infocmp' '_terminals'
 'initctl' '_initctl'
-'initdb' '_postgresql'
+'initdb' '_pgsql_utils'
 'insmod' '_modutils'
 'install' '_install'
 'install-info' '_texinfo'
@@ -694,6 +756,7 @@ _comps=(
 'integer' '_typeset'
 'interdiff' '_patchutils'
 'invoke-rc.d' '_invoke-rc.d'
+'inxi' '_inxi'
 'ionice' '_ionice'
 'iostat' '_iostat'
 'ip' '_ip'
@@ -726,11 +789,16 @@ _comps=(
 'jdb' '_java'
 'jexec' '_jexec'
 'jls' '_jls'
+'jmeter' '_jmeter'
+'jmeter-plugins' '_jmeter-plugins'
 'jobs' '_jobs_builtin'
 'joe' '_joe'
 'join' '_join'
+'jonas' '_jonas'
 'jot' '_jot'
 'jq' '_jq'
+'jrnl' '_jrnl'
+'kak' '_kak'
 'kdeconnect-cli' '_kdeconnect'
 'kdump' '_kdump'
 'keystone' '_openstack'
@@ -740,8 +808,10 @@ _comps=(
 'killall' '_killall'
 'killall5' '_killall'
 'kioclient' '_kfmclient'
+'kitchen' '_kitchen'
 'kldload' '_kld'
 'kldunload' '_kld'
+'knife' '_knife'
 'knock' '_knock'
 'konqueror' '_webbrowser'
 'kpartx' '_kpartx'
@@ -767,6 +837,7 @@ _comps=(
 'light' '_webbrowser'
 'lighty-disable-mod' '_lighttpd'
 'lighty-enable-mod' '_lighttpd'
+'lilypond' '_lilypond'
 'limit' '_limit'
 'links' '_links'
 'links2' '_links'
@@ -813,6 +884,7 @@ _comps=(
 'ltrace' '_ltrace'
 'lua' '_lua'
 'luarocks' '_luarocks'
+'lunchy' '_lunchy'
 'lynx' '_lynx'
 'lz4' '_lz4'
 'lz4c' '_lz4'
@@ -841,6 +913,8 @@ _comps=(
 '-math-' '_math'
 'matlab' '_matlab'
 'mattrib' '_mtools'
+'maturin' '_maturin'
+'mc' '_mc'
 'mcd' '_mtools'
 'mcopy' '_mtools'
 'md2' '_cksum'
@@ -872,8 +946,11 @@ _comps=(
 'mhpath' '_mh'
 'mhshow' '_mh'
 'mhstore' '_mh'
+'middleman' '_middleman'
 'mii-tool' '_mii-tool'
+'mina' '_mina'
 'mistral' '_openstack'
+'mix' '_mix'
 'mixerctl' '_mixerctl'
 'mkdir' '_mkdir'
 'mkfifo' '_mkfifo'
@@ -917,6 +994,7 @@ _comps=(
 'mread' '_mtools'
 'mren' '_mtools'
 'msgchk' '_mh'
+'mssh' '_mssh'
 'mt' '_mt'
 'mtn' '_monotone'
 'mtoolstest' '_mtools'
@@ -926,9 +1004,13 @@ _comps=(
 'mupdf' '_mupdf'
 'murano' '_openstack'
 'mush' '_mail'
+'mussh' '_mussh'
 'mutt' '_mutt'
+'mux' '_tmuxinator'
 'mv' '_mv'
 'mvim' '_vim'
+'mvn' '_mvn'
+'mvnDebug' '_mvn'
 'mx' '_hosts'
 'mysql' '_mysql_utils'
 'mysqladmin' '_mysql_utils'
@@ -937,6 +1019,8 @@ _comps=(
 'mysqlimport' '_mysql_utils'
 'mysqlshow' '_mysql_utils'
 'nail' '_mail'
+'nano' '_nano'
+'nanoc' '_nanoc'
 'native2ascii' '_java'
 'nautilus' '_nautilus'
 'nawk' '_awk'
@@ -955,6 +1039,7 @@ _comps=(
 'new' '_mh'
 'newgrp' '_groups'
 'next' '_mh'
+'nft' '_nftables'
 'nginx' '_nginx'
 'ngrep' '_ngrep'
 'nice' '_nice'
@@ -966,9 +1051,9 @@ _comps=(
 'nmblookup' '_samba'
 'nmcli' '_networkmanager'
 'nocorrect' '_precommand'
+'node' '_node'
 'noglob' '_precommand'
 'nohup' '_precommand'
-'notmuch' '_notmuch'
 'nova' '_openstack'
 'npm' '_npm'
 'ns' '_hosts'
@@ -977,6 +1062,7 @@ _comps=(
 'ntalk' '_other_accounts'
 'numfmt' '_numfmt'
 'nvim' '_vim'
+'nvm' '_nvm'
 'nvram' '_nvram'
 'objdump' '_objdump'
 'od' '_od'
@@ -991,10 +1077,13 @@ _comps=(
 'okular' '_okular'
 'open' '_open'
 'openrc' '_openrc'
+'openssl' '_openssl'
 'openstack' '_openstack'
+'openvpn3' '_openvpn3'
 'opera' '_webbrowser'
 'opera-next' '_webbrowser'
 'opkg' '_opkg'
+'optirun' '_optirun'
 'opusdec' '_opustools'
 'opusenc' '_opustools'
 'opusinfo' '_opustools'
@@ -1020,6 +1109,7 @@ _comps=(
 'paste' '_paste'
 'pasuspender' '_pulseaudio'
 'patch' '_patch'
+'patool' '_patool'
 'pax' '_pax'
 'pbcopy' '_pbcopy'
 'pbpaste' '_pbcopy'
@@ -1047,6 +1137,7 @@ _comps=(
 'pdksh' '_sh'
 'pebuild' '_pkgcore'
 'perf' '_perf'
+'periscope' '_periscope'
 'perl' '_perl'
 'perldoc' '_perldoc'
 'pfctl' '_pfctl'
@@ -1055,12 +1146,13 @@ _comps=(
 'pflags' '_pids'
 'pg_config' '_postgresql'
 'pg_ctl' '_postgresql'
-'pg_dump' '_postgresql'
-'pg_dumpall' '_postgresql'
+'pg_dump' '_pgsql_utils'
+'pg_dumpall' '_pgsql_utils'
 'pg_isready' '_postgresql'
 'pgrep' '_pgrep'
-'pg_restore' '_postgresql'
+'pg_restore' '_pgsql_utils'
 'pg_upgrade' '_postgresql'
+'phing' '_phing'
 'php' '_php'
 'pick' '_mh'
 'picocom' '_picocom'
@@ -1074,6 +1166,8 @@ _comps=(
 'ping6' '_ping'
 'pinspect' '_pkgcore'
 'piuparts' '_piuparts'
+'pixz' '_pixz'
+'pkcon' '_pkcon'
 'pkg' '_pkg5'
 'pkg_add' '_bsd_pkg'
 'pkgadd' '_pkgadd'
@@ -1088,8 +1182,10 @@ _comps=(
 'pkgrm' '_pkgrm'
 'pkgtool' '_pkgtool'
 'pkill' '_pgrep'
+'play' '_play'
 'pldd' '_pids'
 'plutil' '_plutil'
+'pm2' '_pm2'
 'pmaint' '_pkgcore'
 'pmake' '_make'
 'pman' '_perl_modules'
@@ -1111,6 +1207,7 @@ _comps=(
 'policytool' '_java'
 'pon' '_pon'
 'popd' '_directory_stack'
+'port' '_port'
 'portaudit' '_portaudit'
 'portlint' '_portlint'
 'portmaster' '_portmaster'
@@ -1129,6 +1226,7 @@ _comps=(
 'printf' '_print'
 'procstat' '_procstat'
 'prompt' '_prompt'
+'protoc' '_protoc'
 'prove' '_prove'
 'prs' '_sccs'
 'prstat' '_prstat'
@@ -1152,7 +1250,7 @@ _comps=(
 'psmerge' '_psutils'
 'psmulti' '_postscript'
 'psnup' '_psutils'
-'psql' '_postgresql'
+'psql' '_pgsql_utils'
 'psresize' '_psutils'
 'psselect' '_psutils'
 'pstack' '_pids'
@@ -1172,15 +1270,19 @@ _comps=(
 'pwait' '_pids'
 'pwdx' '_pids'
 'pwgen' '_pwgen'
+'pygmentize' '_pygmentize'
 'pyhtmlizer' '_twisted'
 'qdbus' '_qdbus'
 'qiv' '_qiv'
+'qmk' '_qmk'
 'qpdf' '_qpdf'
 'qtplay' '_qtplay'
 'querybts' '_bug'
 'quilt' '_quilt'
 'r' '_fc'
+'rails' '_rails'
 'rake' '_rake'
+'ralio' '_ralio'
 'ranlib' '_ranlib'
 'rar' '_rar'
 'rc' '_sh'
@@ -1200,6 +1302,7 @@ _comps=(
 'readshortcut' '_readshortcut'
 'readshortcut.exe' '_readshortcut'
 'rebootin' '_rebootin'
+'rec' '_redis-cli'
 '-redirect-' '_redirect'
 '-redirect-,<,bunzip2' '_bzip2'
 '-redirect-,<,bzip2' '_bzip2'
@@ -1214,6 +1317,7 @@ _comps=(
 '-redirect-,<,unxz' '_xz'
 '-redirect-,<,xz' '_xz'
 '-redirect-,>,xz' '_xz'
+'redis-cli' '_redis-cli'
 'refile' '_mh'
 'rehash' '_hash'
 'reindexdb' '_postgresql'
@@ -1226,10 +1330,12 @@ _comps=(
 'reprepro' '_reprepro'
 'restart' '_initctl'
 'retawq' '_webbrowser'
+'rfkill' '_rfkill'
 'rgrep' '_grep'
 'rgview' '_vim'
 'rgvim' '_vim'
 'ri' '_ri'
+'rkt' '_rkt'
 'rlogin' '_rlogin'
 'rm' '_rm'
 'rmadison' '_madison'
@@ -1240,6 +1346,8 @@ _comps=(
 'rmic' '_java'
 'rmid' '_java'
 'rmiregistry' '_java'
+'rmlint' '_rmlint'
+'rmlint.sh' '_rmlint'
 'rmm' '_mh'
 'rmmod' '_modutils'
 'route' '_route'
@@ -1252,11 +1360,15 @@ _comps=(
 'rpmverify' '_rpm'
 'rrdtool' '_rrdtool'
 'rsh' '_rlogin'
+'rslsync' '_rslsync'
+'rspec' '_rspec'
+'rsvm' '_rsvm'
 'rsync' '_rsync'
 'rtin' '_tin'
 'rubber' '_rubber'
 'rubber-info' '_rubber'
 'rubber-pipe' '_rubber'
+'rubocop' '_rubocop'
 'ruby' '_ruby'
 'ruby-mri' '_ruby'
 'run-help' '_run-help'
@@ -1273,7 +1385,10 @@ _comps=(
 'sar' '_sysstat'
 'savecore' '_savecore'
 'say' '_say'
+'sbt' '_sbt'
 'sbuild' '_sbuild'
+'scala' '_scala'
+'scalac' '_scala'
 'scan' '_mh'
 'sccs' '_sccs'
 'sccsdiff' '_sccs'
@@ -1288,9 +1403,11 @@ _comps=(
 'screen' '_screen'
 'script' '_script'
 'scriptreplay' '_script'
+'scrub' '_scrub'
 'scselect' '_scselect'
 'sc_usage' '_sc_usage'
 'scutil' '_scutil'
+'sdd' '_sdd'
 'seaf-cli' '_seafile'
 'sed' '_sed'
 'senlin' '_openstack'
@@ -1298,13 +1415,16 @@ _comps=(
 'serialver' '_java'
 'service' '_service'
 'set' '_set'
+'setcap' '_setcap'
 'setfacl' '_setfacl'
 'setfacl.exe' '_setfacl'
 'setfattr' '_attr'
 'setopt' '_setopt'
 'setpriv' '_setpriv'
 'setsid' '_setsid'
+'setup.py' '_setup.py'
 'setxkbmap' '_setxkbmap'
+'sfdx' '_sfdx'
 'sftp' '_ssh'
 'sh' '_sh'
 'sha1' '_cksum'
@@ -1318,10 +1438,12 @@ _comps=(
 'sha512sum' '_md5sum'
 'sha512t256' '_cksum'
 'shasum' '_shasum'
+'shellcheck' '_shellcheck'
 'shift' '_arrays'
 'show' '_mh'
 'showchar' '_psutils'
 'showmount' '_showmount'
+'showoff' '_showoff'
 'shred' '_shred'
 'shuf' '_shuf'
 'shutdown' '_shutdown'
@@ -1357,6 +1479,7 @@ _comps=(
 'sqlite3' '_sqlite'
 'sqsh' '_sqsh'
 'sr' '_surfraw'
+'srm' '_srm'
 'srptool' '_gnutls'
 'ss' '_ss'
 'ssh' '_ssh'
@@ -1366,6 +1489,7 @@ _comps=(
 'sshfs' '_sshfs'
 'ssh-keygen' '_ssh'
 'ssh-keyscan' '_ssh'
+'stack' '_stack'
 'star' '_tar'
 'start' '_initctl'
 'stat' '_stat'
@@ -1382,11 +1506,13 @@ _comps=(
 'strongswan' '_ipsec'
 'stty' '_stty'
 'su' '_su'
-'subl' '_sublimetext'
+'subl' '_subl'
+'subliminal' '_subliminal'
 '-subscript-' '_subscript'
 'sudo' '_sudo'
 'sudoedit' '_sudo'
 'sum' '_cksum'
+'supervisorctl' '_supervisorctl'
 'surfraw' '_surfraw'
 'SuSEconfig' '_SUSEconfig'
 'sv' '_runit'
@@ -1394,6 +1520,7 @@ _comps=(
 'svccfg' '_svccfg'
 'svcprop' '_svcprop'
 'svcs' '_svcs'
+'svm' '_svm'
 'svn' '_subversion'
 'svnadmin' '_subversion'
 'svnadmin-static' '_subversion'
@@ -1402,6 +1529,8 @@ _comps=(
 'svnliteadmin' '_subversion'
 'swaks' '_swaks'
 'swanctl' '_swanctl'
+'sway' '_sway'
+'swaymsg' '_swaymsg'
 'swift' '_swift'
 'swiftc' '_swift'
 'sw_vers' '_sw_vers'
@@ -1421,6 +1550,7 @@ _comps=(
 'talk' '_other_accounts'
 'tar' '_tar'
 'tardy' '_tardy'
+'tarsnap' '_tarsnap'
 'tcpdump' '_tcpdump'
 'tcp_open' '_tcpsys'
 'tcptraceroute' '_tcptraceroute'
@@ -1429,6 +1559,7 @@ _comps=(
 'tdd' '_devtodo'
 'tde' '_devtodo'
 'tdr' '_devtodo'
+'teamocil' '_teamocil'
 'tee' '_tee'
 'telnet' '_telnet'
 'tex' '_tex'
@@ -1437,6 +1568,7 @@ _comps=(
 'texi2pdf' '_texinfo'
 'texindex' '_texinfo'
 'tg' '_topgit'
+'thor' '_thor'
 'tidy' '_tidy'
 'tig' '_git'
 '-tilde-' '_tilde'
@@ -1449,12 +1581,15 @@ _comps=(
 'tla' '_tla'
 'tload' '_tload'
 'tmux' '_tmux'
+'tmuxinator' '_tmuxinator'
+'tmuxp' '_tmuxp'
 'todo' '_devtodo'
 'todo.sh' '_todo.sh'
 'toilet' '_toilet'
 'top' '_top'
 'totdconfig' '_totd'
 'touch' '_touch'
+'tox' '_tox'
 'tpb' '_tpb'
 'tpkg-debarch' '_toolchain-source'
 'tpkg-install' '_toolchain-source'
@@ -1469,6 +1604,10 @@ _comps=(
 'transmission-remote' '_transmission'
 'trap' '_trap'
 'trash' '_trash'
+'trash-empty' '_trash-empty'
+'trash-list' '_trash-list'
+'trash-put' '_trash-put'
+'trash-restore' '_trash-restore'
 'tree' '_tree'
 'trial' '_twisted'
 'trove' '_openstack'
@@ -1489,6 +1628,8 @@ _comps=(
 'type' '_which'
 'typeset' '_typeset'
 'udevadm' '_udevadm'
+'udisksctl' '_udisksctl'
+'ufw' '_ufw'
 'ulimit' '_ulimit'
 'uml_mconsole' '_uml'
 'uml_moo' '_uml'
@@ -1541,7 +1682,8 @@ _comps=(
 'useradd' '_user_admin'
 'userdel' '_users'
 'usermod' '_user_admin'
-'vacuumdb' '_postgresql'
+'vacuumdb' '_pgsql_utils'
+'vagrant' '_vagrant'
 'val' '_sccs'
 'valgrind' '_valgrind'
 '-value-' '_value'
@@ -1552,6 +1694,7 @@ _comps=(
 '-value-,ANSIBLE_STDOUT_CALLBACK,-default-' '_ansible'
 '-value-,ANT_ARGS,-default-' '_ant'
 '-value-,CFLAGS,-default-' '_gcc'
+'-value-,CMAKE_GENERATOR,-default-' '_cmake'
 '-value-,CPPFLAGS,-default-' '_gcc'
 '-value-,CXXFLAGS,-default-' '_gcc'
 '-value-,-default-,-command-' '_zargs'
@@ -1597,6 +1740,9 @@ _comps=(
 '-value-,XZ_OPT,-default-' '_xz'
 '-vared-' '_in_vared'
 'vared' '_vared'
+'VBoxHeadless' '_virtualbox'
+'vboxmanage' '_virtualbox'
+'VBoxManage' '_virtualbox'
 'vcs_info_hookadd' '_vcs_info'
 'vcs_info_hookdel' '_vcs_info'
 'vi' '_vi'
@@ -1615,6 +1761,7 @@ _comps=(
 'vmstat' '_vmstat'
 'vncserver' '_vnc'
 'vncviewer' '_vnc'
+'vnstat' '_vnstat'
 'vorbiscomment' '_vorbis'
 'vpnc' '_vpnc'
 'vpnc-connect' '_vpnc'
@@ -1627,8 +1774,10 @@ _comps=(
 'watch' '_watch'
 'watcher' '_openstack'
 'wc' '_wc'
+'wemux' '_wemux'
 'wget' '_wget'
 'wgetpaste' '_wgetpaste'
+'wg-quick' '_wg-quick'
 'what' '_sccs'
 'whatis' '_man'
 'whence' '_which'
@@ -1681,6 +1830,7 @@ _comps=(
 'xrandr' '_xrandr'
 'xrdb' '_x_utils'
 'xscreensaver-command' '_xscreensaver'
+'xsel' '_xsel'
 'xset' '_xset'
 'xsetbg' '_xloadimage'
 'xsetroot' '_x_utils'
@@ -1701,6 +1851,9 @@ _comps=(
 'xz' '_xz'
 'xzcat' '_xz'
 'yafc' '_yafc'
+'yaourt' '_yaourt'
+'yaourt.static' '_yaourt'
+'yarn' '_yarn'
 'yash' '_sh'
 'yast' '_yast'
 'yast2' '_yast'
@@ -1722,6 +1875,7 @@ _comps=(
 'zathura' '_zathura'
 'zcalc' '_zcalc'
 '-zcalc-line-' '_zcalc_line'
+'zcash-cli' '_zcash-cli'
 'zcat' '_zcat'
 'zcompile' '_zcompile'
 'zcp' '_zmv'
@@ -1810,16 +1964,19 @@ _services=(
 'svnliteadmin' 'svnadmin'
 'tunes2pod.pl' 'tunes2pod'
 'unlzma' 'unxz'
+'VBoxHeadless' 'vboxheadless'
+'vboxmanage' 'vboxmanage'
+'VBoxManage' 'vboxmanage'
 'xelatex' 'latex'
 'xetex' 'tex'
 'xzcat' 'unxz'
+'yaourt.static' 'yaourt'
 'zf_chgrp' 'chgrp'
 'zf_chown' 'chown'
 )
 
 _patcomps=(
 '*/(init|rc[0-9S]#).d/*' '_init_d'
-'notmuch-*' '_notmuch'
 )
 
 _postpatcomps=(
@@ -1834,11 +1991,15 @@ _postpatcomps=(
 'pydoc[0-9.]#' '_pydoc'
 'python[0-9.]#' '_python'
 'qemu(|-system-*)' '_qemu'
+'rmlint.*.sh' '_rmlint'
 '(ruby|[ei]rb)[0-9.]#' '_ruby'
 'shasum(|5).*' '_shasum'
 '(texi(2*|ndex))' '_texi'
 '(tiff*|*2tiff|pal2rgb)' '_tiff'
+'-value-,CCACHE_*,-default-' '_ccache'
+'-value-,CGO*,-default-' '_golang'
 '-value-,(ftp|http(|s))_proxy,-default-' '_urls'
+'-value-,GO*,-default-' '_golang'
 '-value-,LC_*,-default-' '_locales'
 '-value-,*path,-default-' '_directories'
 '-value-,*PATH,-default-' '_dir_list'
@@ -1883,12 +2044,42 @@ bindkey '^[,' _history-complete-newer
 bindkey '^[/' _history-complete-older
 bindkey '^[~' _bash_complete-word
 
-autoload -Uz _bwrap _docker _docker-compose _email-notmuch _firejail \
-            _libinput _meson _mpv _ninja _notmuch \
-            _openrc _pass _pkgcheck _pkgcore _pkgdev \
-            _pulseaudio _qpdf _rc-service _rc-status _rc-update \
-            _scrcpy _systemd-tmpfiles _udevadm _wgetpaste _xwallpaper \
-            _yt-dlp _zathura _cdr _floppy _logical_volumes \
+autoload -Uz _afew _android _archlinux-java _artisan _atach \
+            _bitcoin-cli _bower _bundle _caffeinate _cap \
+            _cask _ccache _cf _choc _chromium \
+            _cmake _coffee _composer _conan _concourse \
+            _console _cppcheck _dad _debuild _dget \
+            _dhcpcd _diana _docker _docker-compose _docpad \
+            _drush _dunst _dunstctl _ecdsautil _emulator \
+            _envdir _exportfs _fab _fail2ban-client _ffind \
+            _firejail _fleetctl _flutter _force _fwupdmgr \
+            _gas _ghc _gist _git-flow _git-journal \
+            _git-pulls _git-revise _git-wtf _glances _golang \
+            _google _gpgconf _gtk-launch _hello _hledger \
+            _homestead _httpie _ibus _img2sixel _include-what-you-use \
+            _inxi _jmeter _jmeter-plugins _jonas _jrnl \
+            _kak _kitchen _knife _language_codes _libinput \
+            _lilypond _lunchy _maturin _mc _meson \
+            _middleman _mina _mix _mpv _mssh \
+            _mussh _mvn _nano _nanoc _nftables \
+            _ninja _node _nvm _openrc _openssl \
+            _openvpn3 _optirun _opustools _pass _patool \
+            _perf _periscope _pgsql_utils _phing _pixz \
+            _pkcon _pkgcheck _pkgcore _pkgdev _play \
+            _pm2 _port _protoc _pulseaudio _pygmentize \
+            _qmk _qpdf _rails _ralio _rc-service \
+            _rc-status _rc-update _redis-cli _rfkill _rkt \
+            _rmlint _rslsync _rspec _rsvm _rubocop \
+            _sbt _scala _scrcpy _scrub _sdd \
+            _setcap _setup.py _sfdx _shellcheck _showoff \
+            _srm _stack _subl _subliminal _supervisorctl \
+            _svm _sway _swaymsg _systemd-tmpfiles _tarsnap \
+            _teamocil _thor _tmuxinator _tmuxp _tox \
+            _trash _trash-empty _trash-list _trash-put _trash-restore \
+            _udevadm _udisksctl _ufw _vagrant _virtualbox \
+            _vnstat _wemux _wgetpaste _wg-quick _xinput \
+            _xsel _xwallpaper _yaourt _yarn _yt-dlp \
+            _zathura _zcash-cli _cdr _floppy _logical_volumes \
             _lscfg _lsdev _lslv _lspv _lsvg \
             _object_classes _physical_volumes _smit _volume_groups _bsdconfig \
             _bsd_disks _bsdinstall _bsd_pkg _chflags _csup \
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index dc89a2e..e4532c4 100755
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -1,5 +1,5 @@
 if [[ -z "${XDG_RUNTIME_DIR}" ]]; then
-	XDG_RUNTIME_DIR=/tmp/user/$(id -u)
+	XDG_RUNTIME_DIR=/tmp/$(id -u)
 	if [[ ! -d ${XDG_RUNTIME_DIR} ]]; then
 		mkdir -p ${XDG_RUNTIME_DIR}
 		chmod 700 ${XDG_RUNTIME_DIR}
@@ -12,7 +12,5 @@ if [[ -z "${DISPLAY}" ]] && [[ "$(tty)" == "/dev/tty1" ]]; then
 	if [[ -z "${SSH_AGENT_PID}" ]]; then
 		eval $(ssh-agent)
 	fi
-	#exec startx "$XDG_CONFIG_HOME/X11/xinitrc" -- vt1
-	#openrc -U default
-	exec xinit -- -nolisten tcp -keeptty vt1
+	exec startx -- vt1
 fi
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index 7bb0104..9f7d3d6 100755
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -39,7 +39,7 @@ export ANDROID_NDK_HOME="$ANDROID_SDK_ROOT/ndk"
 export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible"
 
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
-export GPG_TTY="$(tty)"
+#export GPG_TTY="$(tty)"
 
 export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
 
@@ -52,14 +52,23 @@ export WGETRC="$XDG_CONFIG_HOME/wgetrc"
 export WLR_DRM_NO_MODIFIERS=1
 export LESSHISTFILE=-
 
-export GTK_IM_MODULE="xim"
+#export GTK_IM_MODULE="xim"
 
-export FZF_DEFAULT_OPTS='--height 40% --reverse'
+export FZF_DEFAULT_OPTS="
+	--height 40% --reverse
+	--color=fg:#908caa,bg:#191724,hl:#ebbcba
+	--color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
+	--color=border:#403d52,header:#31748f,gutter:#191724
+	--color=spinner:#f6c177,info:#9ccfd8,separator:#403d52
+	--color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"
 
 export PASSWORD_STORE_DIR="${XDG_DATA_HOME}/pass"
 
 export XCURSOR_PATH=/usr/share/icons:${XDG_DATA_HOME}/icons
 export PATH="$HOME/.local/bin:$CARGO_HOME/bin:$PATH"
+export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
+
+#export DBUS_SESSION_BUS_ADDRESS="unix:path=${XDG_RUNTIME_DIR}/bus"
 
 LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=00:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.avif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:*~=00;90:*#=00;90:*.bak=00;90:*.old=00;90:*.orig=00;90:*.part=00;90:*.rej=00;90:*.swp=00;90:*.tmp=00;90:*.dpkg-dist=00;90:*.dpkg-old=00;90:*.ucf-dist=00;90:*.ucf-new=00;90:*.ucf-old=00;90:*.rpmnew=00;90:*.rpmorig=00;90:*.rpmsave=00;90:';
 export LS_COLORS
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 8b2fd1a..81505a1 100755
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,12 +1,3 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.config/zsh/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
-# Created by newuser for 5.8
-
 # Enable colors:
 autoload -U colors && colors
 
@@ -16,254 +7,29 @@ SAVEHIST=10000
 HISTFILE=~/.cache/zsh/history
 HISTCONTROL=ereasedups
 
+ZSH_AUTOSUGGEST_STRATEGY=(history completion)
+
 # Basic auto/tab complete:
 autoload -U compinit promptinit
 zstyle ':completion:*' menu select
 zmodload zsh/complist
 compinit
 _comp_options+=(globdots)		# Include hidden files.
-#promptinit; prompt gentoo
-
-
-# vi mode
-bindkey -v
-export KEYTIMEOUT=1
-
-# Use vim keys in tab complete menu:
-bindkey -M menuselect 'h' vi-backward-char
-bindkey -M menuselect 'k' vi-up-line-or-history
-bindkey -M menuselect 'l' vi-forward-char
-bindkey -M menuselect 'j' vi-down-line-or-history
-bindkey -v '^?' backward-delete-char
-
-bindkey "^[[1;5C" forward-word
-bindkey "^[[1;5D" backward-word
-bindkey "^[[3~" delete-char
-bindkey "^[3;5~" delete-char
-
-
-# Change cursor shape for different vi modes.
-function zle-keymap-select {
-  if [[ ${KEYMAP} == vicmd ]] ||
-     [[ $1 = 'block' ]]; then
-    echo -ne '\e[1 q'
-  elif [[ ${KEYMAP} == main ]] ||
-       [[ ${KEYMAP} == viins ]] ||
-       [[ ${KEYMAP} = '' ]] ||
-       [[ $1 = 'beam' ]]; then
-    echo -ne '\e[5 q'
-  fi
-}
-zle -N zle-keymap-select
-zle-line-init() {
-    zle -K viins # initiate `vi insert` as keymap (can be removed if `bindkey -V` has been set elsewhere)
-    echo -ne "\e[5 q"
-}
-zle -N zle-line-init
-echo -ne '\e[5 q' # Use beam shape cursor on startup.
-preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt.
-
-# Use ranger to switch directories and bind it to ctrl-o
-ranger_cd() {
-	temp_file="$(mktemp -t "ranger_cd.XXXXXXXXXX")"
-	ranger --choosedir="$temp_file" -- "${@:-$PWD}"
-	if chosen_dir="$(cat -- "$temp_file")" && [ -n "$chosen_dir" ] && [ "$chosen_dir" != "$PWD" ]; then
-		cd -- "$chosen_dir"
-	fi
-	rm -f -- "$temp_file"
-}
-bindkey -s '^o' 'ranger_cd\n'
-ranger_pushd() {
-	temp_file="$(mktemp -t "ranger_cd.XXXXXXXXXX")"
-	ranger --choosedir="$temp_file" -- "${@:-$PWD}"
-	if chosen_dir="$(cat -- "$temp_file")" && [ -n "$chosen_dir" ] && [ "$chosen_dir" != "$PWD" ]; then
-		pushd -- "$chosen_dir"
-	fi
-	rm -f -- "$temp_file"
-}
-bindkey -s '^O' 'ranger_pushd\n'
-bindkey -s '^r' 'ranger\n'
-bindkey -s '^n' 'setsid kitty -d $(pwd)\n'
-
-bindkey -s '^z' 'bg && disown\n'
-
-mkcd() {
-	mkdir $1
-	cd $1
-}
-
-retry() {
-	local SLPT=5
-	[ "$1" = "-t" ] && SLPT="$2" && shift 2
-	while true; do
-		$@ && break
-		sleep "$SLPT"
-	done
-}
-
-alias test_internet='retry ping google.com -c 1'
-
-#alias ls='exa --group-directories-first -l'
-#alias la='exa --group-directories-first -la'
-alias ls='ls --group-directories-first --color=auto'
-alias ll='ls -la --group-directories-first --color=auto'
-alias la='ls -a --group-directories-first --color=auto'
-
-alias less='less -R'
-
-alias ci3='$EDITOR $HOME/.config/i3/config'
-alias cpb='$EDITOR $HOME/.config/polybar/config.ini'
-alias cpbm='$EDITOR $HOME/.config/polybar/modules.ini'
-alias czsh='$EDITOR $HOME/.config/zsh/.zshrc'
-alias cnv='$EDITOR $HOME/.config/nvim/init.vim'
-
-alias r='ranger'
-
-alias s='swallow'
-
-alias dotfiles='/usr/bin/git --git-dir=${XDG_DATA_HOME:-${HOME}/.local/share}/dotfiles --work-tree=$HOME'
-
-alias luamake=/home/nerdjp/dev/lua-language-server/3rd/luamake/luamake
-alias clip='xclip -selection "clipboard"'
-
-alias e='edit.sh'
-alias c='config.sh'
-
-pls() {
-	sudo !!
-}
-
-# Edit line in vim with ctrl-e:
-autoload edit-command-line; zle -N edit-command-line
-bindkey '^e' edit-command-line
 
 setopt auto_cd
 
-alias cp='cp -i'
-alias mv='mv -i'
-
-alias dcp='pwd | xclip -selection clipboard'
-
-alias ffmpeg='ffmpeg -hide_banner'
-alias ffprobe='ffprobe -hide_banner'
-alias iv='nsxiv'
-alias mp='ncmpcpp'
-alias vi='nvim'
-alias grep='grep --color=auto'
+source ${ZDOTDIR}/functions.zsh
+source ${ZDOTDIR}/aliases.zsh
+source ${ZDOTDIR}/keybinds.zsh
+source ${ZDOTDIR}/prompt.zsh
 
 source /usr/share/fzf/key-bindings.zsh
-#source /usr/share/fzf/completion.zsh
-
-alias gs='git status'
-alias gb='git branch'
-alias gc='git checkout'
-alias gcb='git checkout -b'
-alias gf='git pull'
-alias gp='git pull'
-
-smv() {
-	[[ -n $1 ]] && mv $(\ls | fzf -m) $1
-}
-
-gbc() {
-	git branch $@ && git checkout $@
-}
-
-fzfg() {
-	JOB=$(jobs | fzf | cut -d ' ' -f 1 | sed -e 's/\[/%/' -e 's/\]//')
-	[ -n "$JOB" ] && fg "$JOB"
-}
-
-evi() {
-	if [ -z "${1}" ]; then
-		EBUILD_PATH="/var/db/repos/"
-	else
-		EBUILD_PATH="$(equery w ${1})"
-	fi
-	[ -n "${EBUILD_PATH}" ] && vi ${EBUILD_PATH}
-}
-
-detach() {
-	JOBS=$(jobs)
-	if [ -n "$JOBS" ]; then
-		[ "$(wc -l <<< ${JOBS})" -le 1 ] && { bg && sleep 0.1 && disown && return }
-		JOB=$(fzf <<< ${JOBS} | cut -d ' ' -f 1 | sed -e 's/\[/%/' -e 's/\]//')
-		echo $JOB
-		bg "$JOB" && disown "$JOB"
-	fi
-}
-
-ZSH_AUTOSUGGEST_STRATEGY=(history completion)
 
-# make kernel
-# sync
-# update
-# myip
-# open ports
-
-#eval "$(starship init zsh)"
-autoload -Uz vcs_info
-zstyle ':vcs_info:*' formats ' %b'
-
-preexec_timer() { SECONDS=0 }
-preexec_functions+=( preexec_timer )
-
-precmd_jobs() {
-	local IFS="
-	"
-	for job in $(jobs); do
-		if [[ "$job" =~ "running" ]]; then
-			printf "\033[38;5;2m %s" "${job##running}"
-		elif [[ "$job" =~ "suspended" ]]; then
-			printf "\033[38;5;3m %s" "${job##suspended}"
-		else
-			printf "%s" "${job}"
-		fi
-	done
-}
-
-preexec_rename() {
-	printf '\033]2;%s@%s: %s\033\\' ${USER} ${HOST} ${1}
-}
-
-precmd_vcs_info() { vcs_info }
-precmd_functions+=( precmd_vcs_info precmd_jobs precmd_rename )
-
-preexec_functions+=( preexec_rename )
-
-setopt prompt_subst
-PROMPT='%F{magenta}%n@%m%f %F{blue}%1~%f %(?,[,%F{red}[%f) '
-
-#PROMPT='%F{magenta}%f %F{blue}%1~%f %(?,[,%F{red}[%f) '
-#
-RPROMPT=' %(?,],%F{red}]%f)'
-
-#%F{cyan}${vcs_info_msg_0_}%f'
-#%1(S,took $(format-time $SECONDS),)'
-#%F{magenta}%D{%I:%m %p}%f'
-
-#paleofetch
-
-# Load zsh-syntax-highlighting; should be last.
 source /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
 source /usr/share/zsh/site-functions/zsh-autosuggestions.zsh
 
-printf '\033]2;%s@%s\033\\' $USER $HOST
 cat "${HOME}/doc/ascii-arts/woman.txt"
 
-attach_tmux_group() {
-	if [[ -z ${TMUX} ]]; then
-		local group="${1:-common}"
-		local session=$(tmux list-sessions -F "#S:#{session_group}:#{session_attached}" \
-			| grep ":${group}:0" | cut -d ':' -f 1)
-
-		if [[ -n ${session} ]]; then
-			exec tmux attach -t "${session}"
-		else
-			tmux new-window -at "${group}:"
-			tmux new -t "${group}"
-		fi
-	fi
+open_stream() {
+	mpv rtmp://vlhl.dev/live/$1
 }
-
-#attach_tmux_group