From 334a8691591b1afd32c9a839022a21f6c517c233 Mon Sep 17 00:00:00 2001 From: Thies Lennart Alff Date: Wed, 26 Apr 2023 17:32:44 +0200 Subject: [PATCH] added polkit --- .gitconfig | 8 ++++++-- i3/config | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 1f69584..7751653 100644 --- a/.gitconfig +++ b/.gitconfig @@ -2,9 +2,13 @@ email = lennart.alff@gmail.com name = Thies Lennart Alff [merge] - tool = vimdiff + tool = vscode +[difftool "vscode"] + cmd = code --wait --diff $LOCAL $REMOTE +[mergetool "vscode"] + cmd = code --wait $MERGED [diff] - guitool = kompare + guitool = vscode [init] defaultBranch = main [core] diff --git a/i3/config b/i3/config index 884878b..91fc62b 100644 --- a/i3/config +++ b/i3/config @@ -30,6 +30,8 @@ exec "xrandr --dpi 96" exec_always --no-startup-id "ibus-daemon -drx --panel /usr/lib/ibus/ibus-ui-gtk3" exec --no-startup-id nm-applet +exec --no-startip-id /usr/lib/polkit-kde-authentication-agent-1 & + # nitrogen handles the desktop background exec --no-startup-id "nitrogen --restore"