diff --git a/hosts/python/users/configs/niri/config.kdl b/hosts/python/users/configs/niri/config.kdl
index 462478e..eac0965 100644
--- a/hosts/python/users/configs/niri/config.kdl
+++ b/hosts/python/users/configs/niri/config.kdl
@@ -207,7 +207,7 @@ layout {
 // Note that running niri as a session supports xdg-desktop-autostart,
 // which may be more convenient to use.
 // See the binds section below for more spawn examples.
-spawn-at-startup "waybar"
+// spawn-at-startup "waybar"
 
 // Uncomment this line to ask the clients to omit their client-side decorations if possible.
 // If the client will specifically ask for CSD, the request will be honored.
diff --git a/hosts/python/users/default.nix b/hosts/python/users/default.nix
index 30a0bec..13e6808 100644
--- a/hosts/python/users/default.nix
+++ b/hosts/python/users/default.nix
@@ -51,6 +51,4 @@
       "libvirtd"
     ];
   };
-
-  systemd.user.services.waybar.enable = false;
 }
diff --git a/hosts/python/users/waybar.nix b/hosts/python/users/waybar.nix
index 2e69be5..d72e6ff 100644
--- a/hosts/python/users/waybar.nix
+++ b/hosts/python/users/waybar.nix
@@ -27,7 +27,8 @@ in
         --add-flags "--style" \
         --add-flags "${styleCss}"
 
-      substitute ${waybar}/lib/systemd/user/waybar.service $out/lib/systemd/user/waybar-wrapped.service \
+      mv $out/lib/systemd/user/waybar.service $out/lib/systemd/user/.waybar-wrapped.service
+      substitute $out/lib/systemd/user/.waybar-wrapped.service $out/lib/systemd/user/waybar.service \
         --replace-fail ${waybar}/bin/waybar $out/bin/waybar
     '';
     meta = {
diff --git a/hosts/shared/niri.nix b/hosts/shared/niri.nix
index b91f9f8..bc06371 100644
--- a/hosts/shared/niri.nix
+++ b/hosts/shared/niri.nix
@@ -18,6 +18,16 @@ in {
       enable = true;
       configPackages = [cfg.package];
       extraPortals = [pkgs.xdg-desktop-portal-gnome];
+      config = {
+        niri = {
+          default = [
+            "gnome"
+          ];
+          "org.freedesktop.impl.portal.Secret" = [
+            "gnome-keyring"
+          ];
+        };
+      };
     };
 
     environment.systemPackages = [
diff --git a/hosts/shared/support.nix b/hosts/shared/support.nix
index 5424e9f..6690e62 100644
--- a/hosts/shared/support.nix
+++ b/hosts/shared/support.nix
@@ -24,8 +24,6 @@ in {
       "QT_QPA_PLATFORM" = "wayland";
     };
 
-    programs.waybar.enable = true;
-
     services.gnome.gnome-keyring.enable = true;
   };
 }
diff --git a/overlays/derivations/nu/cfg/env.nu b/overlays/derivations/nu/cfg/env.nu
index df315c0..2f444b2 100644
--- a/overlays/derivations/nu/cfg/env.nu
+++ b/overlays/derivations/nu/cfg/env.nu
@@ -15,4 +15,19 @@
 # Also see `help config env` for more options.
 #
 # You can remove these comments if you want or leave
-# them for future reference.
\ No newline at end of file
+# them for future reference.
+
+$env.config = {
+  hooks: {
+    pre_prompt: [{ ||
+      if (which direnv | is-empty) {
+        return
+      }
+
+      direnv export json | from json | default {} | load-env
+      if 'ENV_CONVERSIONS' in $env and 'PATH' in $env.ENV_CONVERSIONS {
+        $env.PATH = do $env.ENV_CONVERSIONS.PATH.from_string $env.PATH
+      }
+    }]
+  }
+}