changed name of home dirs and other small tweaks

10 files changed, 211 insertions, 201 deletions

diff --git a/dunst/dunstrc b/dunst/dunstrc
index 5339b85..d4565ff 100644
--- a/dunst/dunstrc
+++ b/dunst/dunstrc
@@ -81,10 +81,10 @@
 
     # Defines width in pixels of frame around the notification window.
     # Set to 0 to disable.
-    frame_width = 3
+    frame_width = 1
 
     # Defines color of the frame around the notification window.
-    frame_color = "#aaaaaa"
+    frame_color = "#11d72e"
 
     # Define a color for the separator.
     # possible values are:
@@ -106,7 +106,7 @@
 
     ### Text ###
 
-    font = Monospace 8
+    font = TamsynPango 12
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
@@ -192,7 +192,7 @@
     min_icon_size = 0
 
     # Scale larger icons down to this size, set to 0 to disable
-    max_icon_size = 32
+    max_icon_size = 128
 
     # Paths to default icons.
     icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
@@ -327,9 +327,9 @@
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#222222"
-    foreground = "#888888"
-    timeout = 10
+    background = "#101010"
+    foreground = "#ffffff"
+    timeout = 4
     # Icon for notifications with low urgency, uncomment to enable
     #icon = /path/to/icon
 
diff --git a/nvim/init.vim b/nvim/init.vim
index 2f07f38..65e980e 100755
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -42,10 +42,10 @@ map <C-k> <C-u>
 map <C-h> 0
 map <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
+"map <A-h> <C-w>h
+"map <A-j> <C-w>j
+"map <A-k> <C-w>k
+"map <A-l> <C-w>l
 
 " Colorscheme for root and normal users (since vimrc is just symlinked to the root user's home)
 if ($USER) == 'root'
@@ -68,8 +68,8 @@ else
 	set cursorline			" Highlight current line
 	" Change the terminal emulator's window title and class name to vim
 	autocmd BufEnter * :set title
-	autocmd VimEnter * :silent exec "!~/Scripts/st/settitle Vim"
-	autocmd VimLeave * :silent exec "!~/Scripts/st/settitle st"
+	autocmd VimEnter * :silent exec "!/home/timmy/scripts/st/settitle Vim"
+	autocmd VimLeave * :silent exec "!/home/timmy/scripts/st/settitle st"
 	let &titleold="st"
 endif
 
diff --git a/x11/Xauthority b/x11/Xauthority
index 777fa3a..ca28b98 100644
--- a/x11/Xauthority
+++ b/x11/Xauthority
diff --git a/x11/Xresources b/x11/Xresources
deleted file mode 100755
index 1cd640d..0000000
--- a/x11/Xresources
+++ /dev/null
@@ -1,7 +0,0 @@
-Xft.dpi: 120
-
-Xcursor.theme: default
-Xcursor.size: 38
-
-Sxiv.foreground: #bbbbbb
-Sxiv.background: #222222
diff --git a/zsh/.zcompdump b/zsh/.zcompdump
index 3c86be0..cc586f5 100644
--- a/zsh/.zcompdump
+++ b/zsh/.zcompdump
@@ -1,4 +1,4 @@
-#files: 751	version: 5.8
+#files: 753	version: 5.8
 
 _comps=(
 '-' '_precommand'
@@ -105,6 +105,7 @@ _comps=(
 'add-zle-hook-widget' '_add-zle-hook-widget'
 'add-zsh-hook' '_add-zsh-hook'
 'admin' '_sccs'
+'alacritty' '_alacritty'
 'ali' '_mh'
 'alias' '_alias'
 'amaya' '_webbrowser'
@@ -404,6 +405,7 @@ _comps=(
 'fixwpps' '_psutils'
 'fixwwps' '_psutils'
 'flac' '_flac'
+'flatpak' '_flatpak'
 'flex' '_flex'
 'flex++' '_flex'
 'flipdiff' '_patchutils'
@@ -907,19 +909,12 @@ _comps=(
 'opkg' '_opkg'
 'p4' '_perforce'
 'p4d' '_perforce'
-'pacat' '_pulseaudio'
 'pack' '_pack'
 'packf' '_mh'
-'pacmd' '_pulseaudio'
-'pactl' '_pulseaudio'
-'padsp' '_pulseaudio'
 'pandoc' '_pandoc'
-'paplay' '_pulseaudio'
-'parec' '_pulseaudio'
-'parecord' '_pulseaudio'
+'pass' '_pass'
 'passwd' '_users'
 'paste' '_paste'
-'pasuspender' '_pulseaudio'
 'patch' '_patch'
 'pax' '_pax'
 'pcat' '_pack'
@@ -1025,7 +1020,6 @@ _comps=(
 'pstops' '_psutils'
 'pstotgif' '_pspdf'
 'pswrap' '_postscript'
-'pulseaudio' '_pulseaudio'
 'pump' '_pump'
 'pushd' '_cd'
 'pv' '_pv'
@@ -1612,156 +1606,157 @@ bindkey '^[,' _history-complete-newer
 bindkey '^[/' _history-complete-older
 bindkey '^[~' _bash_complete-word
 
-autoload -Uz _bat _exa _lf _libinput _pulseaudio \
-            _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
+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
 autoload -Uz +X _call_program
 
 typeset -gUa _comp_assocs
diff --git a/zsh/aliasrc b/zsh/aliasrc
index 7c0d74a..3ea8e29 100755
--- a/zsh/aliasrc
+++ b/zsh/aliasrc
@@ -60,7 +60,7 @@ alias \
 	br="br -h" \
 	ffmpeg="ffmpeg -hide_banner"
 
-# Make startx link to proper xinitrc location
+# Clean home directory
 alias \
-	startx="startx ~/.config/x11/xinitrc" \
-	startdwm="/bin/startx ~/.config/x11/xinitdwmrc"
+	startx="startx $XDG_CONFIG_HOME/x11/xinitrc" \
+	startdwm="/bin/startx $XDG_CONFIG_HOME/x11/xinitdwmrc"
diff --git a/zsh/zprofile.base b/zsh/zprofile.base
index 3a49327..b872ba3 100644
--- a/zsh/zprofile.base
+++ b/zsh/zprofile.base
@@ -1,27 +1,36 @@
 #!/bin/zsh
 
 # Path
-export PATH=~/Scripts/launch:$PATH
-export PATH=~/Scripts/x11:$PATH
-export PATH=~/Scripts/misc:$PATH
-export PATH=~/Scripts/keyboard:$PATH
-export PATH=~/Scripts/sync:$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"
 
 # Default programs:
 export EDITOR="vim"
 export TERMINAL="st"
-#export BROWSER="brave"
+export BROWSER="brave-browser"
 
 # Clean up home directory
+export XDG_CACHE_HOME="$HOME/.cache"
+
 export XDG_CONFIG_HOME="$HOME/.config"
+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 ZDOTDIR="$XDG_CONFIG_HOME/zsh" # Move .zshrc
+
 export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XAUTHORITY="${XDG_CONFIG_HOME:-$HOME/.config}/x11/Xauthority"
-export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/zsh/inputrc"
-export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh" # Move .zshrc
-#export VIMINIT="source ${XDG_CONFIG_HOME:-$HOME/.config}/vim/vimrc"
-export QT_QPA_PLATFORMTHEME="qt5ct"
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
+
 export LESSHISTFILE="-"
 
+export QT_QPA_PLATFORMTHEME="qt5ct"
+
 # Autostart x11 after login
-if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then startx ~/.config/x11/xinitrc; fi
+if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then startx $XDG_CONFIG_HOME/x11/xinitrc; fi
diff --git a/zsh/zprofile.desktop b/zsh/zprofile.desktop
index 2a27a12..ce1f28a 100644
--- a/zsh/zprofile.desktop
+++ b/zsh/zprofile.desktop
@@ -1,5 +1,5 @@
 #!/bin/zsh
 # vim: filetype=zsh
 export COMPUTER="desktop"
-export PATH=~/Scripts/pkgmgt/emerge:$PATH
+export PATH="/home/timmy/scripts/pkgmgt/emerge:$PATH"
 source /home/timmy/.config/zsh/zprofile.base
diff --git a/zsh/zprofile.laptop b/zsh/zprofile.laptop
index 1064de4..a3acf36 100644
--- a/zsh/zprofile.laptop
+++ b/zsh/zprofile.laptop
@@ -1,4 +1,5 @@
 #!/bin/zsh
+# vim: filetype=zsh
 export COMPUTER="laptop"
-export PATH=~/Scripts/pkgmgt/xbps:$PATH
+export PATH="/home/timmy/scripts/pkgmgt/xbps:$PATH"
 source /home/timmy/.config/zsh/zprofile.base
diff --git a/zsh/zshrc b/zsh/zshrc
index 370d6f5..67fc838 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -5,10 +5,22 @@ autoload -U colors && colors
 PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " # TODO: change $ to # when root
 
 # Load aliasrc and keybindrc
-source "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/aliasrc"
-source "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/keybindrc"
+source "$XDG_CONFIG_HOME/zsh/aliasrc"
+source "$XDG_CONFIG_HOME/zsh/keybindrc"
 # lf icons
-source "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/lficons"
+source "$XDG_CONFIG_HOME/zsh/lficons"
+
+# History settings
+HISTFILE="$XDG_DATA_HOME/zsh-history"
+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 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)
+#unsetopt EXTENDED_HISTORY	# Save only the command, not any superfluous info
 
 # Change cursor shape for different vi modes (Cred: LARBS)
 function zle-keymap-select () {