Merge from downqwerk

5 files changed, 15 insertions, 9 deletions

diff --git a/.config/mimeapps.list b/.config/mimeapps.list
index 61ac698..3cab7fd 100644
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@@ -1,5 +1,5 @@
 [Added Associations]
-application/pdf=com.github.xournalpp.xournalpp.desktop;org.pwmt.zathura-pdf-mupdf.desktop;org.gnome.Evince.desktop;firefox-developer-edition.desktop;
+application/pdf=org.pwmt.zathura.desktop;org.pwmt.zathura.desktop;com.github.xournalpp.xournalpp.desktop;firefox-developer-edition.desktop;
 text/plain=vim.desktop;
 application/postscript=org.gnome.Evince.desktop;firefox-developer-edition.desktop;
 unknown/unknown=vim.desktop;
@@ -34,3 +34,4 @@ application/x-extension-shtml=firefox-developer-edition.desktop
 application/xhtml+xml=firefox-developer-edition.desktop
 application/x-extension-xhtml=firefox-developer-edition.desktop
 application/x-extension-xht=firefox-developer-edition.desktop
+x-scheme-handler/discord-402572971681644545=discord-402572971681644545.desktop
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 74be556..14adf19 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -1,8 +1,7 @@
 XDG_DESKTOP_DIR="$HOME"
+XDG_DOCUMENTS_DIR="$HOME/documents"
 XDG_DOWNLOAD_DIR="$HOME/downloads"
-XDG_TEMPLATES_DIR="$HOME"
-XDG_PUBLICSHARE_DIR="$HOME"
-XDG_DOCUMENTS_DIR="$HOME"
+XDG_FONTS="$HOME/.local/share/fonts"
 XDG_MUSIC_DIR="$HOME"
 XDG_PICTURES_DIR="$HOME/pictures"
 XDG_VIDEOS_DIR="$HOME"
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index cfc8146..97a3388 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -6,7 +6,7 @@ set directory=$XDG_CACHE_HOME/vim,/tmp
 set backupdir=$XDG_CACHE_HOME/vim,/tmp
 set viminfo=%,<800,'10,/50,:100,h,f0,n$XDG_CACHE_HOME/vim/.viminfo
 let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc"
-set runtimepath=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after,$VIM,$VIMRUNTIME,$VIM/vimfiles,$VIM/vimfiles/after
+set runtimepath=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after,$VIM,$VIMRUNTIME,$VIM/vimfiles,$VIM/vimfiles/after,$VIM/vimfiles/plugin/
 
 " Check if the backup/swap dir exists
 if !isdirectory($XDG_CACHE_HOME)
@@ -199,4 +199,4 @@ autocmd InsertLeave * silent execute "!echo -ne '\e[2 q'"
 let &t_Cs = "\e[4:3m"
 let &t_Ce = "\e[4:0m"
 highlight SpellBad   guisp=red    gui=undercurl guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=underline cterm=undercurl ctermul=red
-highlight SpellCap   guisp=yellow    gui=undercurl guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=underline cterm=undercurl ctermul=yellow
+highlight SpellCap   guisp=yellow gui=undercurl guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=underline cterm=undercurl ctermul=yellow
diff --git a/.config/x/xinitrc b/.config/x/xinitrc
index 38dfe9a..b4ae303 100644
--- a/.config/x/xinitrc
+++ b/.config/x/xinitrc
@@ -1,10 +1,15 @@
 # For automatic lock on suspend/hibernation
 systemctl --user import-environment DISPLAY
+
 # Notification daemon
 dunst &
+#
 # Composite manager, for blur and other neat effects
 picom --blur-method dual_kawase --blur-strength 2 --experimental-backends --backend glx &
 
+# Fonts
+xset +fp "${XDG_FONTS:-$HOME/.local/share/fonts}"
+
 # Disable mouse acceleration
 xset m 0 0 &
 xset r rate 300 50 &
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index d53e20e..ba4f07b 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -159,7 +159,7 @@ function get_dhcp_replies () {
 }
 
 ## Aliases
-alias c='cd $(tree -dfqi --noreport | fzf)'
+alias c=$'cd $(tree -dnfqi --noreport | sed -Ee "s/^\\.\\///g" | fzf)'
 alias diff='diff --color=auto'
 alias dmesg='dmesg --color=auto'
 alias fsharpc='fsharpc --nologo --standalone'
@@ -170,13 +170,14 @@ alias glog='git log --pretty="%Cgreen%H%Creset [%G?] %cn: %s %Cred%d%Creset"'
 alias irssi="irssi --home=${XDG_DATA_HOME:-$HOME/.config/irssi}"
 alias ip='ip -c'
 alias ls='lsd'
-alias l='ls -lAh'
+alias l='[ $(( $(tput cols) )) -lt 80 ] && ls -Ah || ls -lAh'
 alias mutt='neomutt'
 alias mv='mv -i'
 alias pbcopy='xclip -selection clipboard -i'
 alias pbpaste='xclip -selection clipboard -o'
 alias s='vim $(fzf)'
 alias scan='nmcli d wifi rescan'
+alias screen='TERM=st-256color screen -T screen-256color -s zsh'
 alias sudo='doas'
 alias v='vim --servername vim'
 alias ptop="ps -o pid,user,size,pcpu,command --sort size cx"
@@ -215,6 +216,6 @@ if [[ $(tput cols) -gt 140 ]]; then
 fi
 
 # Use screen if in a ssh session
-[ -n "$SSH_CLIENT" ] && ! [[ "$TERM" =~ ^screen.*$ ]] && TERM=st-256color screen -T screen-256color -s zsh -R && exit 0
+[ -n "$SSH_CLIENT" ] && ! [[ "$TERM" =~ ^screen.*$ ]] && screen -R && exit 0
 
 true