lennartalff/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

several updates

Browse source
This commit is contained in:
Thies Lennart Alff 2023-10-12 14:27:38 +02:00
parent 0615753aac
commit 845c6e7cf8
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/sway/config
View file

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

4
home/.gitconfig
View file

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

11
home/.zprofile Normal file
View file

@ -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

3
home/.zshrc
View file

@ -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 rosterm='docker exec -it ros2-vim zsh'
alias git-delete-merged="git branch --merged main | grep -v '^[ *]*main$' | xargs git branch -d" 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