Changes over vacation to Ga/Sc & first day of college

8 files changed, 225 insertions, 197 deletions

diff --git a/nvim/init.vim b/nvim/init.vim
index 65e980e..58b0141 100755
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -7,45 +7,51 @@ if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autolo
 endif
 
 call plug#begin(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/plugged"'))
-Plug 'chrisbra/Colorizer'
-Plug 'junegunn/goyo.vim'
 Plug 'jiangmiao/auto-pairs'
+Plug 'junegunn/goyo.vim'
+Plug 'alvan/vim-closetag'
+Plug 'ap/vim-css-color'
 call plug#end()
 
 " Basic options
-syntax on			" Enable syntax highlighting
-set number relativenumber	" Enable relative line numbers
-set linebreak			" Word wrap
-set wildmode=longest,list,full	" Enable file auto-complete
-set splitbelow splitright	" Open splits on bottom/right instead of top/left
+set autochdir			" Always change directory to current file
+set autoindent			" Keeps indentation on new lines
 set hlsearch			" Highlight search hits
 set ignorecase			" Case-insensitive search...
-set smartcase			" ...Unless the search term is capital
-set autoindent			" Keeps indentation on new lines
+set linebreak			" Word wrap
 set mouse=a			" Because sometimes it's just easier to use the mouse
-set autochdir			" Always change directory to current file
+set number relativenumber	" Enable relative line numbers
+set smartcase			" ...Unless the search term is capital
+set splitbelow splitright	" Open splits on bottom/right instead of top/left
+set wildmode=longest,list,full	" Enable file auto-complete
+syntax on			" Enable syntax highlighting
 
 " Keybindings
  " Set leader-key to comma
 let mapleader =","
  " Invoke goyo with comma-m
-map <leader>m :Goyo<CR>
+nmap <leader>m :Goyo<CR>
  " Invoke spellcheck mode with comma-o
-map <leader>l :setlocal spell! spelllang=en_us<CR>
+nmap <leader>l :setlocal spell! spelllang=en_us<CR>
  " Invoke spellcheck mode with comma-o
-map <leader>c :set cursorcolumn!<CR>
+nmap <leader>c :set cursorcolumn!<CR>
  " Send cursor to top or bottom currently visible line with ctrl-jk
 " map <C-j> :call cursor(line('w$'),col('.'))<CR>
 " map <C-k> :call cursor(line('w0'),col('.'))<CR>
-map <C-j> <C-d>
-map <C-k> <C-u>
-map <C-h> 0
-map <C-l> $
+ " Navigate faster than hjkl with ctrl-hjlk
+nmap <C-h> 0
+nmap <C-j> <C-d>
+nmap <C-k> <C-u>
+nmap <C-l> $
  " Faster split navigation (alt-hjlk, as opposed to ctrl-w + hjlk)
 "map <A-h> <C-w>h
 "map <A-j> <C-w>j
 "map <A-k> <C-w>k
 "map <A-l> <C-w>l
+ " Streamlined tab navigation with chromium inspired keybindings
+nmap <TAB> gt
+nmap <S-TAB> gT
+nmap <C-T> :tabnew<CR>
 
 " Colorscheme for root and normal users (since vimrc is just symlinked to the root user's home)
 if ($USER) == 'root'
@@ -79,13 +85,25 @@ let &t_SR.="\<Esc>[4 q" " Replace mode
 let &t_EI.="\<Esc>[2 q" " Normal mode
 let &t_ti.="\<Esc>[2 q" " Cursor on startup
 
-" Automatically deletes all trailing whitespace and newlines at end of file on save
-"autocmd BufWritePre * let ccc=col('.')		" Set current cursor column
-"autocmd BufWritePre * let ccl=line('.')		" Set current cursor line
-"autocmd BufWritePre * %s/\s\+$//e		"	  \/
-"autocmd BufWritePre * %s/\n\+\%$//e		" Remove white space
-"autocmd BufWritePre *.[ch] %s/\%$/\r/e		"	  /\
-"autocmd BufWritePre * call cursor(ccl,ccc)	" Move cursor to previous position
+" Automatically deletes all trailing whitespace on save
+function DelWS()
+	:let ccc=col('.')	" Set current cursor column
+	:let ccl=line('.')	" Set current cursor line
+	:%s/\s\+$//e		" Find and remove trailing whitespace on each line
+	:call cursor(ccl,ccc)	" Move cursor to previous position
+endfunction
+autocmd BufWritePre * call DelWS()
+
+" Disables automatic commenting on newline:
+	autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
+" Perform dot commands over visual blocks:
+	vnoremap . :normal .<CR>
+" Save file as sudo on files that require root permission
+	cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
+
+" Plugin options
+ " closetag
+let g:closetag_filenames = '*.html,*.xhtml,*.phtml'
 
 " Get rid of the pointless .viminfo files that clutter the home directory
 let skip_defaults_vim=1
diff --git a/nvim/plugged/Colorizer b/nvim/plugged/Colorizer
deleted file mode 160000
-Subproject 826d5691ac7d36589591314621047b1b9d89ed3
diff --git a/nvim/plugged/vim-closetag b/nvim/plugged/vim-closetag
new file mode 160000
+Subproject c0779ef575d5c239162f4ca3506cfb4a95d45a5
diff --git a/nvim/plugged/vim-css-color b/nvim/plugged/vim-css-color
new file mode 160000
+Subproject 7337c35588e9027b516f80f03c3b9621a271e16
diff --git a/zsh/.zcompdump b/zsh/.zcompdump
index cc586f5..9958117 100644
--- a/zsh/.zcompdump
+++ b/zsh/.zcompdump
@@ -1,4 +1,4 @@
-#files: 753	version: 5.8
+#files: 754	version: 5.8
 
 _comps=(
 '-' '_precommand'
@@ -1452,6 +1452,7 @@ _comps=(
 'ypxfr' '_yp'
 'ytalk' '_other_accounts'
 'zargs' '_zargs'
+'zathura' '_zathura'
 'zcalc' '_zcalc'
 'zcat' '_zcat'
 'zcompile' '_zcompile'
@@ -1608,155 +1609,155 @@ bindkey '^[~' _bash_complete-word
 
 autoload -Uz _alacritty _bat _exa _flatpak _lf \
             _libinput _pass _sv _xbps _xbps_src \
-            _xtools _xwallpaper _cdr _all_labels _all_matches \
-            _alternative _approximate _arg_compile _arguments _bash_completions \
-            _cache_invalid _call_function _combination _comp_locale _complete \
-            _complete_debug _complete_help _complete_help_generic _complete_tag _correct \
-            _correct_filename _correct_word _describe _description _dispatch \
-            _expand _expand_alias _expand_word _extensions _external_pwds \
-            _generic _guard _history _history_complete_word _ignored \
-            _list _main_complete _match _menu _message \
-            _most_recent_file _multi_parts _next_label _next_tags _normal \
-            _nothing _oldlist _pick_variant _prefix _read_comp \
-            _regex_arguments _regex_words _requested _retrieve_cache _sep_parts \
-            _sequence _set_command _setup _store_cache _sub_commands \
-            _tags _user_expand _values _wanted _acpi \
-            _acpitool _alsa-utils _analyseplugin _brctl _btrfs \
-            _chattr _chcon _chrt _cpupower _cryptsetup \
-            _dkms _e2label _ethtool _findmnt _free \
-            _fuse_arguments _fuse_values _fusermount _gpasswd _htop \
-            _iconvconfig _ionice _ipset _iptables _iwconfig \
-            _kpartx _losetup _lsattr _lsblk _lsusb \
-            _ltrace _mdadm _mii-tool _modutils _mondo \
-            _networkmanager _opkg _pidof _pmap _qdbus \
-            _schedtool _selinux_contexts _selinux_roles _selinux_types _selinux_users \
-            _setsid _slabtop _ss _sshfs _strace \
-            _sysstat _tload _tpb _tracepath _tune2fs \
-            _uml _valgrind _vserver _wakeup_capable_devices _wipefs \
-            _wpa_cli _a2ps _aap _abcde _absolute_command_paths \
-            _ack _adb _ansible _ant _antiword \
-            _apachectl _apm _arch_archives _arch_namespace _arp \
-            _arping _asciidoctor _asciinema _at _attr \
-            _augeas _avahi _awk _base64 _basename \
-            _bash _baudrates _baz _beep _bibtex \
-            _bind_addresses _bison _bittorrent _bogofilter _bpf_filters \
-            _bpython _bzip2 _bzr _cabal _cal \
-            _calendar _canonical_paths _cat _ccal _cdcd \
-            _cdrdao _cdrecord _chkconfig _chmod _chown \
-            _chroot _chsh _cksum _clay _cmdambivalent \
-            _cmdstring _cmp _column _comm _composer \
-            _compress _configure _cowsay _cp _cpio \
-            _cplay _crontab _cscope _cssh _ctags_tags \
-            _curl _cut _cvs _darcs _date \
-            _date_formats _dates _dbus _dconf _dd \
-            _devtodo _df _dhclient _dict _dict_words \
-            _diff _diff3 _diff_options _diffstat _dig \
-            _dir_list _directories _django _dmesg _dmidecode \
-            _dns_types _doas _domains _dos2unix _drill \
-            _dsh _dtruss _du _dvi _ecasound \
-            _ed _elfdump _elinks _email_addresses _enscript \
-            _entr _env _espeak _etags _fakeroot \
-            _feh _fetchmail _ffmpeg _figlet _file_modes \
-            _file_systems _files _find _find_net_interfaces _finger \
-            _flac _flex _fmt _fold _fortune \
-            _fsh _fuser _gcc _gcore _gdb \
-            _gem _genisoimage _getconf _getent _getfacl \
-            _getmail _getopt _ghostscript _git _global \
-            _global_tags _gnu_generic _gnupod _gnutls _go \
-            _gpg _gphoto2 _gprof _gradle _graphicsmagick \
-            _grep _groff _groups _growisofs _gsettings \
-            _guilt _gzip _have_glob_qual _head _hexdump \
-            _host _hostname _hosts _iconv _id \
-            _ifconfig _iftop _imagemagick _init_d _initctl \
-            _install _iostat _ip _ipsec _irssi \
-            _ispell _java _java_class _joe _join \
-            _jq _killall _knock _kvno _last \
-            _ld_debug _ldconfig _ldd _less _lha \
-            _libvirt _links _list_files _lldb _ln \
-            _loadkeys _locale _localedef _locales _locate \
-            _look _lp _ls _lsof _lua \
-            _luarocks _lynx _lz4 _lzop _mail \
-            _mailboxes _make _man _md5sum _mencal \
-            _mh _mime_types _mkdir _mkfifo _mknod \
-            _mktemp _module _monotone _moosic _mosh \
-            _mount _mpc _mt _mtools _mtr \
-            _mutt _mv _my_accounts _myrepos _mysql_utils \
-            _mysqldiff _ncftp _net_interfaces _netcat _netstat \
-            _newsgroups _nginx _ngrep _nice _nkf \
-            _nl _nm _nmap _npm _nslookup \
-            _numfmt _objdump _object_files _od _openstack \
-            _other_accounts _pack _pandoc _paste _patch \
-            _patchutils _path_commands _path_files _pax _pbm \
-            _pdf _perforce _perl _perl_basepods _perl_modules \
-            _perldoc _pgrep _php _picocom _pids \
-            _pine _ping _pkg-config _pkg_instance _pkgadd \
-            _pkginfo _pkgrm _pon _ports _postfix \
-            _postgresql _postscript _printenv _printers _process_names \
-            _prove _ps _pspdf _psutils _pump \
-            _pv _pwgen _pydoc _python _python_modules \
-            _qemu _quilt _rake _ranlib _rar \
-            _rclone _rcs _readelf _readlink _remote_files \
-            _renice _ri _rlogin _rm _rmdir \
-            _route _rrdtool _rsync _rubber _ruby \
-            _runit _samba _sccs _scons _screen \
-            _script _seafile _sed _seq _service \
-            _services _setfacl _sh _shasum _showmount \
-            _shred _shuf _shutdown _signals _sisu \
-            _slrn _smartmontools _socket _sort _spamassassin \
-            _split _sqlite _sqsh _ssh _ssh_hosts \
-            _stat _stdbuf _stgit _stow _strings \
-            _strip _stty _su _subversion _sudo \
-            _surfraw _swaks _swanctl _swift _sys_calls \
-            _sysctl _tac _tail _tar _tar_archive \
-            _tardy _tcpdump _tcptraceroute _tee _telnet \
-            _terminals _tex _texi _texinfo _tidy \
-            _tiff _tilde_files _time_zone _timeout _tin \
-            _tla _tmux _todo.sh _toilet _top \
-            _topgit _totd _touch _tput _tr \
-            _transmission _tree _truss _tty _ttys \
-            _twidge _twisted _umountable _unace _uname \
-            _unexpand _uniq _unison _units _uptime \
-            _urls _user_admin _user_at_host _users _users_on \
-            _vcsh _vim _visudo _vmstat _vorbis \
-            _vpnc _w _w3m _watch _wc \
-            _webbrowser _wget _whereis _who _whois \
-            _wiggle _xargs _xmlsoft _xmlstarlet _xmms2 \
-            _xxd _xz _yafc _yodl _yp \
-            _zcat _zdump _zfs _zfs_dataset _zfs_keysource_props \
-            _zfs_pool _zip _zpool _zsh _acroread \
-            _code _dcop _eog _evince _geany \
-            _gnome-gv _gqview _gv _kdeconnect _kfmclient \
-            _matlab _mozilla _mplayer _mupdf _nautilus \
-            _nedit _netscape _okular _pdftk _qiv \
-            _rdesktop _setxkbmap _sublimetext _urxvt _vnc \
-            _x_arguments _x_borderwidth _x_color _x_colormapid _x_cursor \
-            _x_display _x_extension _x_font _x_geometry _x_keysym \
-            _x_locale _x_modifier _x_name _x_resource _x_selection_timeout \
-            _x_title _x_utils _x_visual _x_window _xauth \
-            _xautolock _xclip _xdvi _xfig _xft_fonts \
-            _xloadimage _xmodmap _xournal _xpdf _xrandr \
-            _xscreensaver _xset _xt_arguments _xt_session_id _xterm \
-            _xv _xwit _zeal _add-zle-hook-widget _add-zsh-hook \
-            _alias _aliases _arrays _assign _autocd \
-            _bindkey _brace_parameter _builtin _cd _command \
-            _command_names _compadd _compdef _completers _condition \
-            _default _delimiters _directory_stack _dirs _disable \
-            _dynamic_directory_name _echotc _echoti _emulate _enable \
-            _equal _exec _fc _file_descriptors _first \
-            _functions _globflags _globqual_delims _globquals _hash \
-            _history_modifiers _in_vared _jobs _jobs_bg _jobs_builtin \
-            _jobs_fg _kill _limit _limits _math \
-            _math_params _mere _module_math_func _options _options_set \
-            _options_unset _parameter _parameters _precommand _print \
-            _prompt _ps1234 _read _redirect _run-help \
-            _sched _set _setopt _source _strftime \
-            _subscript _suffix_alias_files _tcpsys _tilde _trap \
-            _ttyctl _typeset _ulimit _unhash _user_math_func \
-            _value _vared _vars _wait _which \
-            _widgets _zargs _zattr _zcalc _zcalc_line \
-            _zcompile _zed _zftp _zle _zmodload \
-            _zmv _zparseopts _zpty _zsh-mime-handler _zsocket \
-            _zstyle _ztodo
+            _xtools _xwallpaper _zathura _cdr _all_labels \
+            _all_matches _alternative _approximate _arg_compile _arguments \
+            _bash_completions _cache_invalid _call_function _combination _comp_locale \
+            _complete _complete_debug _complete_help _complete_help_generic _complete_tag \
+            _correct _correct_filename _correct_word _describe _description \
+            _dispatch _expand _expand_alias _expand_word _extensions \
+            _external_pwds _generic _guard _history _history_complete_word \
+            _ignored _list _main_complete _match _menu \
+            _message _most_recent_file _multi_parts _next_label _next_tags \
+            _normal _nothing _oldlist _pick_variant _prefix \
+            _read_comp _regex_arguments _regex_words _requested _retrieve_cache \
+            _sep_parts _sequence _set_command _setup _store_cache \
+            _sub_commands _tags _user_expand _values _wanted \
+            _acpi _acpitool _alsa-utils _analyseplugin _brctl \
+            _btrfs _chattr _chcon _chrt _cpupower \
+            _cryptsetup _dkms _e2label _ethtool _findmnt \
+            _free _fuse_arguments _fuse_values _fusermount _gpasswd \
+            _htop _iconvconfig _ionice _ipset _iptables \
+            _iwconfig _kpartx _losetup _lsattr _lsblk \
+            _lsusb _ltrace _mdadm _mii-tool _modutils \
+            _mondo _networkmanager _opkg _pidof _pmap \
+            _qdbus _schedtool _selinux_contexts _selinux_roles _selinux_types \
+            _selinux_users _setsid _slabtop _ss _sshfs \
+            _strace _sysstat _tload _tpb _tracepath \
+            _tune2fs _uml _valgrind _vserver _wakeup_capable_devices \
+            _wipefs _wpa_cli _a2ps _aap _abcde \
+            _absolute_command_paths _ack _adb _ansible _ant \
+            _antiword _apachectl _apm _arch_archives _arch_namespace \
+            _arp _arping _asciidoctor _asciinema _at \
+            _attr _augeas _avahi _awk _base64 \
+            _basename _bash _baudrates _baz _beep \
+            _bibtex _bind_addresses _bison _bittorrent _bogofilter \
+            _bpf_filters _bpython _bzip2 _bzr _cabal \
+            _cal _calendar _canonical_paths _cat _ccal \
+            _cdcd _cdrdao _cdrecord _chkconfig _chmod \
+            _chown _chroot _chsh _cksum _clay \
+            _cmdambivalent _cmdstring _cmp _column _comm \
+            _composer _compress _configure _cowsay _cp \
+            _cpio _cplay _crontab _cscope _cssh \
+            _ctags_tags _curl _cut _cvs _darcs \
+            _date _date_formats _dates _dbus _dconf \
+            _dd _devtodo _df _dhclient _dict \
+            _dict_words _diff _diff3 _diff_options _diffstat \
+            _dig _dir_list _directories _django _dmesg \
+            _dmidecode _dns_types _doas _domains _dos2unix \
+            _drill _dsh _dtruss _du _dvi \
+            _ecasound _ed _elfdump _elinks _email_addresses \
+            _enscript _entr _env _espeak _etags \
+            _fakeroot _feh _fetchmail _ffmpeg _figlet \
+            _file_modes _file_systems _files _find _find_net_interfaces \
+            _finger _flac _flex _fmt _fold \
+            _fortune _fsh _fuser _gcc _gcore \
+            _gdb _gem _genisoimage _getconf _getent \
+            _getfacl _getmail _getopt _ghostscript _git \
+            _global _global_tags _gnu_generic _gnupod _gnutls \
+            _go _gpg _gphoto2 _gprof _gradle \
+            _graphicsmagick _grep _groff _groups _growisofs \
+            _gsettings _guilt _gzip _have_glob_qual _head \
+            _hexdump _host _hostname _hosts _iconv \
+            _id _ifconfig _iftop _imagemagick _init_d \
+            _initctl _install _iostat _ip _ipsec \
+            _irssi _ispell _java _java_class _joe \
+            _join _jq _killall _knock _kvno \
+            _last _ld_debug _ldconfig _ldd _less \
+            _lha _libvirt _links _list_files _lldb \
+            _ln _loadkeys _locale _localedef _locales \
+            _locate _look _lp _ls _lsof \
+            _lua _luarocks _lynx _lz4 _lzop \
+            _mail _mailboxes _make _man _md5sum \
+            _mencal _mh _mime_types _mkdir _mkfifo \
+            _mknod _mktemp _module _monotone _moosic \
+            _mosh _mount _mpc _mt _mtools \
+            _mtr _mutt _mv _my_accounts _myrepos \
+            _mysql_utils _mysqldiff _ncftp _net_interfaces _netcat \
+            _netstat _newsgroups _nginx _ngrep _nice \
+            _nkf _nl _nm _nmap _npm \
+            _nslookup _numfmt _objdump _object_files _od \
+            _openstack _other_accounts _pack _pandoc _paste \
+            _patch _patchutils _path_commands _path_files _pax \
+            _pbm _pdf _perforce _perl _perl_basepods \
+            _perl_modules _perldoc _pgrep _php _picocom \
+            _pids _pine _ping _pkg-config _pkg_instance \
+            _pkgadd _pkginfo _pkgrm _pon _ports \
+            _postfix _postgresql _postscript _printenv _printers \
+            _process_names _prove _ps _pspdf _psutils \
+            _pump _pv _pwgen _pydoc _python \
+            _python_modules _qemu _quilt _rake _ranlib \
+            _rar _rclone _rcs _readelf _readlink \
+            _remote_files _renice _ri _rlogin _rm \
+            _rmdir _route _rrdtool _rsync _rubber \
+            _ruby _runit _samba _sccs _scons \
+            _screen _script _seafile _sed _seq \
+            _service _services _setfacl _sh _shasum \
+            _showmount _shred _shuf _shutdown _signals \
+            _sisu _slrn _smartmontools _socket _sort \
+            _spamassassin _split _sqlite _sqsh _ssh \
+            _ssh_hosts _stat _stdbuf _stgit _stow \
+            _strings _strip _stty _su _subversion \
+            _sudo _surfraw _swaks _swanctl _swift \
+            _sys_calls _sysctl _tac _tail _tar \
+            _tar_archive _tardy _tcpdump _tcptraceroute _tee \
+            _telnet _terminals _tex _texi _texinfo \
+            _tidy _tiff _tilde_files _time_zone _timeout \
+            _tin _tla _tmux _todo.sh _toilet \
+            _top _topgit _totd _touch _tput \
+            _tr _transmission _tree _truss _tty \
+            _ttys _twidge _twisted _umountable _unace \
+            _uname _unexpand _uniq _unison _units \
+            _uptime _urls _user_admin _user_at_host _users \
+            _users_on _vcsh _vim _visudo _vmstat \
+            _vorbis _vpnc _w _w3m _watch \
+            _wc _webbrowser _wget _whereis _who \
+            _whois _wiggle _xargs _xmlsoft _xmlstarlet \
+            _xmms2 _xxd _xz _yafc _yodl \
+            _yp _zcat _zdump _zfs _zfs_dataset \
+            _zfs_keysource_props _zfs_pool _zip _zpool _zsh \
+            _acroread _code _dcop _eog _evince \
+            _geany _gnome-gv _gqview _gv _kdeconnect \
+            _kfmclient _matlab _mozilla _mplayer _mupdf \
+            _nautilus _nedit _netscape _okular _pdftk \
+            _qiv _rdesktop _setxkbmap _sublimetext _urxvt \
+            _vnc _x_arguments _x_borderwidth _x_color _x_colormapid \
+            _x_cursor _x_display _x_extension _x_font _x_geometry \
+            _x_keysym _x_locale _x_modifier _x_name _x_resource \
+            _x_selection_timeout _x_title _x_utils _x_visual _x_window \
+            _xauth _xautolock _xclip _xdvi _xfig \
+            _xft_fonts _xloadimage _xmodmap _xournal _xpdf \
+            _xrandr _xscreensaver _xset _xt_arguments _xt_session_id \
+            _xterm _xv _xwit _zeal _add-zle-hook-widget \
+            _add-zsh-hook _alias _aliases _arrays _assign \
+            _autocd _bindkey _brace_parameter _builtin _cd \
+            _command _command_names _compadd _compdef _completers \
+            _condition _default _delimiters _directory_stack _dirs \
+            _disable _dynamic_directory_name _echotc _echoti _emulate \
+            _enable _equal _exec _fc _file_descriptors \
+            _first _functions _globflags _globqual_delims _globquals \
+            _hash _history_modifiers _in_vared _jobs _jobs_bg \
+            _jobs_builtin _jobs_fg _kill _limit _limits \
+            _math _math_params _mere _module_math_func _options \
+            _options_set _options_unset _parameter _parameters _precommand \
+            _print _prompt _ps1234 _read _redirect \
+            _run-help _sched _set _setopt _source \
+            _strftime _subscript _suffix_alias_files _tcpsys _tilde \
+            _trap _ttyctl _typeset _ulimit _unhash \
+            _user_math_func _value _vared _vars _wait \
+            _which _widgets _zargs _zattr _zcalc \
+            _zcalc_line _zcompile _zed _zftp _zle \
+            _zmodload _zmv _zparseopts _zpty _zsh-mime-handler \
+            _zsocket _zstyle _ztodo
 autoload -Uz +X _call_program
 
 typeset -gUa _comp_assocs
diff --git a/zsh/aliasrc b/zsh/aliasrc
index 3ea8e29..9d7768b 100755
--- a/zsh/aliasrc
+++ b/zsh/aliasrc
@@ -23,7 +23,11 @@ alias \
 alias \
 	zrc="cd ~/.config/zsh" \
 	xrc="cd ~/.config/x11" \
-	vrc="nvim ~/.config/nvim/init.vim"
+	vrc="nvim ~/.config/nvim/init.vim" \
+	..="cd .." \
+	cdc="cd ~/.local/src/programs" \
+	cds="cd ~/.local/bin" \
+	cdw="cd ~/.local/src/sites" \
 
 # Package management
 [ "$COMPUTER" = "laptop" ] && alias \
@@ -32,35 +36,38 @@ alias \
 	xr="sudo xbps-remove"
 [ "$COMPUTER" = "desktop" ] && alias \
 	e="sudo emerge" \
-	eaum="sudo emerge --autounmask-continue"
+	eaum="sudo emerge --autounmask-continue" \
 
 # Power scripts
 alias \
 	halt="sudo poweroff" \
 	off="sudo poweroff" \
-	reboot="sudo reboot"
+	reboot="sudo reboot" \
+
 [ "$COMPUTER" = "laptop" ] && alias \
 	zzz="sudo zzz" \
-	xbs="xbacklight -set"
+	xbs="xbacklight -set" \
+
 [ "$COMPUTER" = "desktop" ] && alias \
-	zzz="sudo s2ram"
+	zzz="sudo s2ram" \
 
 # Colorize command output
 alias \
 	grep="grep --color=auto -I --line-number --ignore-case" \
-	diff="diff --color=auto"
+	diff="diff --color=auto" \
 	#ls="ls -hN --color=auto --group-directories-first" \
 
 # Verbosity / non-verbosity
 alias \
 	cp="cp --interactive --verbose" \
 	mv="mv --interactive --verbose" \
-	rm="rm --interactive --verbose" \
+	rm="rm --interactive=once --verbose" \
 	mkd="mkdir --parents --verbose" \
 	br="br -h" \
-	ffmpeg="ffmpeg -hide_banner"
+	ffmpeg="ffmpeg -hide_banner" \
 
 # Clean home directory
 alias \
 	startx="startx $XDG_CONFIG_HOME/x11/xinitrc" \
-	startdwm="/bin/startx $XDG_CONFIG_HOME/x11/xinitdwmrc"
+	startdwm="/bin/startx $XDG_CONFIG_HOME/x11/xinitdwmrc" \
+
diff --git a/zsh/zprofile.base b/zsh/zprofile.base
index b872ba3..93088df 100644
--- a/zsh/zprofile.base
+++ b/zsh/zprofile.base
@@ -1,11 +1,13 @@
 #!/bin/zsh
 
 # Path
-export PATH="/home/timmy/scripts/launch:$PATH"
-export PATH="/home/timmy/scripts/x11:$PATH"
-export PATH="/home/timmy/scripts/misc:$PATH"
-export PATH="/home/timmy/scripts/keyboard:$PATH"
-export PATH="/home/timmy/scripts/sync:$PATH"
+scriptspath="/home/timmy/.local/bin"
+export PATH="$scriptspath/launch:$PATH"
+export PATH="$scriptspath/x11:$PATH"
+export PATH="$scriptspath/misc:$PATH"
+export PATH="$scriptspath/keyboard:$PATH"
+export PATH="$scriptspath/sync:$PATH"
+export PATH="$scriptspath/programs:$PATH"
 
 # Default programs:
 export EDITOR="vim"
@@ -20,8 +22,7 @@ export XAUTHORITY="$XDG_CONFIG_HOME/x11/Xauthority"
 export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
 export INPUTRC="$XDG_CONFIG_HOME/zsh/inputrc"
 export NOTMUCH_COFIG="$XDG_CONFIG_HOME/notmuch/config"
-#export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
-export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config"
+export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # Move .zshrc
 
 export XDG_DATA_HOME="$HOME/.local/share"
@@ -30,7 +31,8 @@ export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
 
 export LESSHISTFILE="-"
 
+# Theming
 export QT_QPA_PLATFORMTHEME="qt5ct"
 
-# Autostart x11 after login
-if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then startx $XDG_CONFIG_HOME/x11/xinitrc; fi
+# Autostart X after login
+if [[ -z $DISPLAY ]] && [[ "$USER" != "root" ]] && [[ $(tty) = /dev/tty1 ]]; then startx $XDG_CONFIG_HOME/x11/xinitrc; fi
diff --git a/zsh/zshrc b/zsh/zshrc
index 67fc838..025123b 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -11,15 +11,15 @@ source "$XDG_CONFIG_HOME/zsh/keybindrc"
 source "$XDG_CONFIG_HOME/zsh/lficons"
 
 # History settings
-HISTFILE="$XDG_DATA_HOME/zsh-history"
+HISTFILE="$XDG_DATA_HOME/zsh/zhistory"
 HISTSIZE=200			# Max lines of history loaded into memory
 SAVEHIST=10000000		# Max lines of history saved to the histfile
-setopt INC_APPEND_HISTORY	# Write to the histfile after each command is ran, not after zsh exits
+setopt INC_APPEND_HISTORY	# Create entries after each command, not after zsh exits
 setopt SHARE_HISTORY		# Share history between zsh sessions
 setopt HIST_REDUCE_BLANKS
-setopt HIST_IGNORE_DUPS		# Successive duplicate commands ignored
-setopt HIST_IGNORE_SPACE	# Commands with leading space ignored
-# Letting this write to the histfile because it seems like it might actually reduce overall writes (while using more data ofc)
+setopt HIST_IGNORE_DUPS		# Successive duplicate entries ignored
+setopt HIST_IGNORE_SPACE	# Entries with leading space ignored
+# This seems to reduce overall disk writes
 #unsetopt EXTENDED_HISTORY	# Save only the command, not any superfluous info
 
 # Change cursor shape for different vi modes (Cred: LARBS)