From 0234847aeb980d9fd6cf63442488f05896cf3134 Mon Sep 17 00:00:00 2001 From: eoli3n Date: Wed, 2 Jun 2021 15:37:42 +0200 Subject: [PATCH] added xdg-desktop-portal-wlr and updated git config --- roles/git/templates/gitconfig.j2 | 2 ++ roles/sway/files/sway.fish | 2 +- roles/sway/templates/config.j2 | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/git/templates/gitconfig.j2 b/roles/git/templates/gitconfig.j2 index 3e8c10a..47e0cd3 100644 --- a/roles/git/templates/gitconfig.j2 +++ b/roles/git/templates/gitconfig.j2 @@ -6,3 +6,5 @@ rebase = false [gpg] program = gpg2 +[init] + defaultBranch = main diff --git a/roles/sway/files/sway.fish b/roles/sway/files/sway.fish index 1ae0111..80128a7 100644 --- a/roles/sway/files/sway.fish +++ b/roles/sway/files/sway.fish @@ -1,6 +1,6 @@ # Autostart sway when user login on tty1 -set -x XDG_CURRENT_DESKTOP 'Unity' # waybar workaround for tray +#set -x XDG_CURRENT_DESKTOP 'Unity' # waybar workaround for tray set -x MOZ_ENABLE_WAYLAND 1 set -x KITTY_ENABLE_WAYLAND 1 set -x QT_QPA_PLATFORM 'wayland-egl' diff --git a/roles/sway/templates/config.j2 b/roles/sway/templates/config.j2 index ec41690..b8a9ab6 100644 --- a/roles/sway/templates/config.j2 +++ b/roles/sway/templates/config.j2 @@ -202,6 +202,8 @@ exec_always bash -c "pgrep syncthing || syncthing" # pipewire exec_always bash -c "pgrep pipewire || pipewire" exec_always bash -c "pgrep pipewire-pulse || pipewire-pulse" +# xdg-desktop-portal-wlr +exec dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway # exec foreground apps