librewolf => firefox, fix xdg-portals

6 files changed, 18 insertions, 24 deletions

diff --git a/home/config/hypr/config.d/keybinds.conf b/home/config/hypr/config.d/keybinds.conf
index a3ce255..4836e1d 100644
--- a/home/config/hypr/config.d/keybinds.conf
+++ b/home/config/hypr/config.d/keybinds.conf
@@ -7,7 +7,7 @@ bind = $mod, J, togglesplit
 bind = $mod, F, fullscreen
 
 bind = $mod, L, exec, hyprlock
-bind = $mod SHIFT, L, exec, killall Hyprland
+bind = $mod SHIFT, L, exec, killall dbus-run-session
 
 bind = $mod SHIFT, Q, killactive
 bind = $mod, F5, exec, sh -c 'killall waybar; waybar --config ~/.config/waybar/config.hypr'
diff --git a/home/config/hypr/hyprland.conf b/home/config/hypr/hyprland.conf
index ccea461..3020890 100644
--- a/home/config/hypr/hyprland.conf
+++ b/home/config/hypr/hyprland.conf
@@ -9,7 +9,7 @@ $scale = 1.25
 $radius = 5
 $border = 2
 
-$browser = librewolf
+$browser = firefox
 
 source = ~/.config/hypr/config.d/plugins.conf
 source = ~/.config/hypr/config.d/colors.conf
diff --git a/home/config/hypr/scripts.d/autostart.sh b/home/config/hypr/scripts.d/autostart.sh
index 30eac54..1c487b0 100755
--- a/home/config/hypr/scripts.d/autostart.sh
+++ b/home/config/hypr/scripts.d/autostart.sh
@@ -15,3 +15,13 @@ gtk-launch thunderbird &
 
 hyprpaper &
 hypridle &
+
+sleep 0.5
+killall -e xdg-desktop-portal-hyprland
+killall xdg-desktop-portal-gtk
+killall xdk-desktop-portal
+sleep 0.5
+$GUIX_PROFILE/libexec/xdg-desktop-portal-gtk &
+$GUIX_PROFILE/libexec/xdg-desktop-portal-hyprland &
+sleep 2
+$GUIX_PROFILE/libexec/xdg-desktop-portal &
diff --git a/home/config/hypr/scripts.d/systemd.sh b/home/config/hypr/scripts.d/systemd.sh
deleted file mode 100755
index 32b5528..0000000
--- a/home/config/hypr/scripts.d/systemd.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-systemctl --user set-environment XDG_CURRENT_DESKTOP=Hyprland
-systemctl --user import-environment DISPLAY \
-									WAYLAND_DISPLAY \
-									XDG_CURRENT_DESKTOP \
-									GTK_THEME \
-									QT_QPA_PLATFORMTHEME
-
-
-hash dbus-update-activation-environment 2>/dev/null && \
-	 dbus-update-activation-environment --systemd DISPLAY \
-												  XDG_CURRENT_DESKTOP=Hyprland \
-												  WAYLAND_DISPLAY \
-												  GTK_THEME \
-												  QT_QPA_PLATFORMTHEME
diff --git a/home/config/sway/config b/home/config/sway/config
index d8526ad..4150b3d 100644
--- a/home/config/sway/config
+++ b/home/config/sway/config
@@ -26,7 +26,7 @@ set $blur_radius 10
 set $blur_passes 3
 
 # Set browser
-set $browser librewolf
+set $browser firefox
 
 # System configs
 include /etc/sway/config.d/*
diff --git a/home/config/xdg/mimeapps.list b/home/config/xdg/mimeapps.list
index a1ab138..fd803cf 100644
--- a/home/config/xdg/mimeapps.list
+++ b/home/config/xdg/mimeapps.list
@@ -1,5 +1,5 @@
 [Default Applications]
-text/html=librewolf.desktop
+text/html=firefox.desktop
 image/png=imv.desktop
 image/jpeg=imv.desktop
 image/webp=imv.desktop
@@ -14,10 +14,10 @@ audio/mp3=mpv.desktop
 audio/wav=mpv.desktop
 application/pdf=org.pwmt.zathura.desktop
 application/x-shellscript=nvim.desktop
-x-scheme-handler/http=librewolf.desktop
-x-scheme-handler/https=librewolf.desktop
-x-scheme-handler/about=librewolf.desktop
-x-scheme-handler/unknown=librewolf.desktop
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+x-scheme-handler/about=firefox.desktop
+x-scheme-handler/unknown=firefox.desktop
 x-scheme-handler/mspa=unofficial-homestuck-collection.desktop
 
 [Added Associations]