several updates

.config/sway/config

@@ -5,7 +5,7 @@ set $lock swaylock
 
 # scale internal display
 output eDP-1 scale 1.5
-output * scale 1.5
+output * scale 1.25
 
 focus_follows_mouse no
 

home/.gitconfig

@@ -2,7 +2,7 @@
 	email = lennart.alff@gmail.com
 	name = Thies Lennart Alff
 [merge]
-	tool = kdiff3
+	tool = nvim
 [difftool "vscode"]
 	cmd = code --wait --diff $LOCAL $REMOTE
 [mergetool "vscode"]
@@ -12,7 +12,7 @@
 [init]
 	defaultBranch = main
 [core]
-	editor = vim
+	editor = nvim
 	autocrlf = input
 [pull]
 	ff = only

home/.zprofile

@@ -0,0 +1,11 @@
+if [ "$(tty)" = "/dev/tty1" ]
+then
+    if [ "$(cat /etc/hostname)" = "archXPS15" ]
+    then
+        export MOZ_ENABLE_WAYLAND=1
+        export XDG_SESSION_TYPE=wayland
+        export XDG_CURRENT_DESKTOP=sway
+        export QT_QPA_PLATFORM=wayland
+        exec sway
+    fi
+fi

home/.zshrc

@@ -103,4 +103,5 @@ alias mount-lehre='kinit -kt "$HOME/keytabs/cta1233.keytab" cta1233@KERBEROS.TU-
 alias rosterm='docker exec -it ros2-vim zsh'
 
 alias git-delete-merged="git branch --merged main | grep -v '^[ *]*main$' | xargs git branch -d"
-export MOZ_ENABLE_WAYLAND=1
+# export MOZ_ENABLE_WAYLAND=1
+# export XDG_CURRENT_DESKTOP=sway