From 033b268389f5aa277f45c20daa5241c4bd9064d0 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Tue, 28 Nov 2023 09:07:49 -0500
Subject: [PATCH] dbus/xdg proper configuration

---
 .config/mako/config            | 21 +++++++--------------
 .config/sway/config            |  1 +
 .config/sway/config.d/keybinds |  4 ++--
 .config/sway/config.d/theme    |  4 ++++
 .config/sway/scripts.d/auto.sh | 14 +-------------
 .zprofile                      |  9 ++++-----
 aur                            |  1 +
 packages                       |  1 +
 8 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/.config/mako/config b/.config/mako/config
index 862f2e5..9c7a4eb 100644
--- a/.config/mako/config
+++ b/.config/mako/config
@@ -1,23 +1,16 @@
-font=Fira Mono 10
-background-color=#1d1b2b
+font=monospace 11
+background-color=#14171d
+border-color=#4d4754
 border-size=2
-border-radius=5
-margin=6
+text-color=#c7c6c3
+border-radius=3
+margin=5
 padding=5,8
 progress-color=#373c47
+default-timeout=5000
 layer=overlay
 icons=1
 
-[urgency=low]
-text-color=#98c379
-border-color=#98c379
-default-timeout=10000
-
-[urgency=normal]
-text-color=#61afef
-border-color=#61afef
-default-timeout=10000
-
 [urgency=critical]
 text-color=#e06c75
 border-color=#e06c75
diff --git a/.config/sway/config b/.config/sway/config
index effb3cd..61879fc 100755
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,5 +1,6 @@
 # xdg desktop portal fix
 exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
 # Set super key
 set $mod Mod4
diff --git a/.config/sway/config.d/keybinds b/.config/sway/config.d/keybinds
index 0543339..1bae11e 100644
--- a/.config/sway/config.d/keybinds
+++ b/.config/sway/config.d/keybinds
@@ -49,8 +49,8 @@ bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
 # Screenshot
-bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy && notify-send -t 1000 "Screenshot copied to clipboard" 
-bindsym Print exec grim - | wl-copy && notify-send -t 1000 "Screenshot copied to clipboard"
+bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Sway" "Screenshot copied to clipboard" 
+bindsym Print exec grim - | wl-copy -t iamge/png && notify-send -t 3000 "Sway" "Full screen copied to clipboard"
 bindsym Shift+Print exec slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
 
 # Michelsoft Binbows
diff --git a/.config/sway/config.d/theme b/.config/sway/config.d/theme
index e8d2822..661f9e5 100644
--- a/.config/sway/config.d/theme
+++ b/.config/sway/config.d/theme
@@ -30,3 +30,7 @@ layer_effects "wofi" blur enable; shadows enable
 
 ### Output configuration
 output * bg $bg fill
+
+### Bar
+
+exec env GTK_THEME="Adwaita-dark" waybar
diff --git a/.config/sway/scripts.d/auto.sh b/.config/sway/scripts.d/auto.sh
index c149f79..b22353d 100755
--- a/.config/sway/scripts.d/auto.sh
+++ b/.config/sway/scripts.d/auto.sh
@@ -1,19 +1,7 @@
 #!/usr/bin/env bash
 
-/usr/lib/xdg-desktop-portal -r &
-/usr/lib/xdg-desktop-portal-wlr -r &
-
-mako &
-
 GTK_THEME="Lavanda-Sea-Dark" nm-applet --indicator &
-
 autotiling &
-
-/usr/bin/gnome-keyring-daemon --foreground &
-
-GTK_THEME="Adwaita-dark" waybar &
-
 discord &
 element-desktop &
-#thunderbird &
-
+thunderbird &
diff --git a/.zprofile b/.zprofile
index 689be61..1bcd629 100644
--- a/.zprofile
+++ b/.zprofile
@@ -8,13 +8,12 @@ export EDITOR=nvim
 # wayland fixes
 export _JAVA_AWT_WM_NONREPARENTING=1
 export MOZ_ENABLE_WAYLAND=1
-export QT_QPA_PLATFORM=wayland-egl
-export SDL_VIDEODRIVER=wayland
-export XDG_SESSION_TYPE=wayland
-export XDG_CURRENT_DESKTOP=sway
-export XDG_CONFIG_HOME=$HOME/.config
 export MOZ_USE_XINPUT2=1
 
+# xdg
+export XDG_CONFIG_HOME=$HOME/.config
+export XDG_DATA_HOME=$HOME/.local/share
+
 # ricing
 export GTK_THEME=Lavanda-Sea-Dark
 
diff --git a/aur b/aur
index a21e48f..617e87f 100644
--- a/aur
+++ b/aur
@@ -1,3 +1,4 @@
+autotiling
 cider
 fbterm
 mkinitcpio-firmware
diff --git a/packages b/packages
index 35e5a30..bae4350 100644
--- a/packages
+++ b/packages
@@ -62,6 +62,7 @@ python-pynvim
 qbittorrent
 qemu-full
 qt5-wayland
+ripgrep
 ruby
 rustup
 sassc