From 845c6e7cf85dfe77b5b02cf899b4a86f128ef2d6 Mon Sep 17 00:00:00 2001 From: Thies Lennart Alff Date: Thu, 12 Oct 2023 14:27:38 +0200 Subject: [PATCH] several updates --- .config/sway/config | 2 +- home/.gitconfig | 4 ++-- home/.zprofile | 11 +++++++++++ home/.zshrc | 3 ++- 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 home/.zprofile diff --git a/.config/sway/config b/.config/sway/config index 75ae5a5..e860f81 100644 --- a/.config/sway/config +++ b/.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 diff --git a/home/.gitconfig b/home/.gitconfig index 5533aaa..0771be7 100644 --- a/home/.gitconfig +++ b/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 diff --git a/home/.zprofile b/home/.zprofile new file mode 100644 index 0000000..e1d5652 --- /dev/null +++ b/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 diff --git a/home/.zshrc b/home/.zshrc index 7fda96b..7d80f36 100644 --- a/home/.zshrc +++ b/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