3 files changed, 11 insertions, 3 deletions

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index 22a9399..756c68f 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -87,10 +87,8 @@
                               ("ls" . "ls -p --color=auto")
                               ("python" . "python3")))
                    (bashrc (list (local-file
-                                  "/home/ryan/.config/guix/home-config/bashrc"
                                   "bashrc")))
                    (bash-profile (list (local-file
-                                        "/home/ryan/.config/guix/home-config/bash_profile"
                                         "bash_profile")))))
          (service home-xdg-configuration-files-service-type
                   `(("nvim/init.vim" ,(local-file "nvim/config/init.vim"))
diff --git a/home-config/profile b/home-config/profile
new file mode 100644
index 0000000..6869931
--- /dev/null
+++ b/home-config/profile
@@ -0,0 +1,9 @@
+# Quick hack to ensure user d-bus has proper env vars
+export XDG_CURRENT_DESKTOP=sway
+export XDG_SESSION_DESKTOP=sway
+export _JAVA_AWT_WM_NONREPEATING=1
+
+# Proper stuff
+HOME_ENVIRONMENT=$HOME/.guix-home
+. $HOME_ENVIRONMENT/setup-environment
+$HOME_ENVIRONMENT/on-first-login
diff --git a/home-config/sway/config b/home-config/sway/config
index 2cecb72..2507e56 100644
--- a/home-config/sway/config
+++ b/home-config/sway/config
@@ -26,6 +26,8 @@ exec sh ~/.profile
 # Load up the user session dbus
 #exec dbus-daemon --session --address=unix:path=$XDG_RUNTIME_DIR/bus
 
+exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
+
 #
 # Logo key. Use Mod1 for Alt.
 set $mod Mod4
@@ -275,7 +277,6 @@ bar {
     swaybar_command waybar
 }
 
-exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
 
 # Numlock on startup
 input * xkb_numlock enabled