diff --git a/system/home-manager/default.nix b/system/home-manager/default.nix
index 5ab1456..2b9be0f 100644
--- a/system/home-manager/default.nix
+++ b/system/home-manager/default.nix
@@ -5,7 +5,7 @@ let
     name = "nixos-home-manager-unstable";
     url = "https://github.com/nix-community/home-manager";
     ref = "refs/heads/master";
-    rev = "5160039edca28a7e66bad0cfc72a07c91d6768ad"; # 20-04-2023
+    rev = "6f9781b1b0cf3fedbe9d2d0a785aeec4d6085c10"; # 24-04-2023
   };
 in {
   imports = [ (import "${homeManager}/nixos") ];
diff --git a/system/home-manager/sway.nix b/system/home-manager/sway.nix
index cb2ac7d..10af0ef 100644
--- a/system/home-manager/sway.nix
+++ b/system/home-manager/sway.nix
@@ -6,15 +6,16 @@ in {
     enable = true;
     systemdIntegration = true;
     extraSessionCommands = ''
-      export MOZ_ENABLE_WAYLAND=1
-      export QT_QPA_PLATFORM=wayland-egl
       export CLUTTER_BACKEND=wayland
       export ECORE_EVAS_ENGINE=wayland-egl
       export ELM_ENGINE=wayland_egl
-      export SDL_VIDEODRIVER=wayland
-      export _JAVA_AWT_WM_NONREPARENTING=1
+      export MOZ_ENABLE_WAYLAND=1
+      export NIXOS_OZONE_WL=1
       export NO_AT_BRIDGE=1
+      export QT_QPA_PLATFORM=wayland-egl
+      export SDL_VIDEODRIVER=wayland
       export XDG_CURRENT_DESKTOP=sway
+      export _JAVA_AWT_WM_NONREPARENTING=1
     '';
     xwayland = false;
     config = {
@@ -291,15 +292,6 @@ in {
     };
   };
 
-  # FIXME: Temporary until upstream is fixed
-  # https://github.com/nix-community/home-manager/pull/3899
-  xdg.dataFile."dbus-1/services/fnott.service".text = ''
-    [D-BUS Service]
-    Name=org.freedesktop.Notifications
-    Exec=${config.services.fnott.package}/bin/fnott"
-    SystemdService=fnott.service
-  '';
-
   programs.wofi = {
     enable = true;
     style = builtins.readFile ../../extra/wofi/style.css;