From 0166b86c8cd4827dc68da35d584b4c40041faf54 Mon Sep 17 00:00:00 2001
From: Mehdi Sadeghi <mehdi@mehdix.org>
Date: Wed, 8 Feb 2023 11:49:44 +0100
Subject: [PATCH] Apply xdg-desktop-portal-wlr config + minor fixes

- Change git credential helper to store credentials
- Add username to i3status
- Add a python keyring workaround
---
 .config/sway/config | 3 ++-
 .config/sway/xdpw   | 4 ++--
 .env                | 3 +++
 .gitconfig          | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.config/sway/config b/.config/sway/config
index 4cd1a74..4a550f4 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -236,7 +236,7 @@ bar {
 
 	# When the status_command prints a new line to stdout, swaybar updates.
 	# The default just shows the current date and time.
-	status_command while date +'%A W%V %Y-%m-%d %l:%M:%S %p'; do sleep 1; done
+	status_command while echo $USER@$(hostname) $(date +'%A W%V %Y-%m-%d %l:%M:%S %p'); do sleep 1; done
 
 	colors {
 		statusline #ffffff
@@ -257,3 +257,4 @@ exec ~/.config/sway/xdpw
 
 # Load machine specific configuration
 include ~/.config/sway/`hostname`
+
diff --git a/.config/sway/xdpw b/.config/sway/xdpw
index 81fc8ca..fe3fb96 100644
--- a/.config/sway/xdpw
+++ b/.config/sway/xdpw
@@ -3,5 +3,5 @@
 dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
 # Stop any services that are running, so that they receive the new env var when they restart.
-systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
-systemctl --user start pipewire-media-session
+systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
+systemctl --user start wireplumber
diff --git a/.env b/.env
index c6bb97b..5f187f8 100644
--- a/.env
+++ b/.env
@@ -63,4 +63,7 @@ export BROWSER=w3m
 export GPG_TTY="$(tty)"
 gpg-connect-agent updatestartuptty /bye >/dev/null
 
+# Null keyring for python - avoids problems with wallets
+export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
+
 echo .env end
diff --git a/.gitconfig b/.gitconfig
index 25946d1..ca2b182 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,3 +15,5 @@
 #	smtpPass = <pass> # or use pass-git-helper
 #	smtpServerPort = 587
 
+[credential]
+	helper = store
-- 
2.38.5