lots of changes after neglecting this repo

fish/.config/fish/config.fish

@@ -20,7 +20,6 @@ status --is-interactive; and begin
     # Aliases
     alias backup '$HOME/.borg/backup.sh'
     alias budget 'hledger print income:krankengeld | grep -Po '\''^\d\d\d\d-\d\d-\d\d'\'' | tail -1 | xargs -I{} hledger balance budgets date:{}-today'
-    alias cat bat
     alias fox cat
     alias g git
     alias grep rg
@@ -33,6 +32,7 @@ status --is-interactive; and begin
     alias tt 'exa --git -Tl'
     alias vimdiff 'nvim -d'
     alias vim 'nvim'
+    alias cat batcat
 
     # Interactive shell initialisation
     set -gx GPG_TTY (tty)
@@ -41,10 +41,10 @@ status --is-interactive; and begin
 
 end
 
-if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]
-  exec sway
-end
+#if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]
+#  exec sway
+#end
 
 set -g EDITOR /usr/bin/nvim
 set -g VISUAL /usr/bin/nvim
-set -g SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket
+#set -g SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket