diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix
index 064c538..b46c677 100644
--- a/modules/programs/hyprland/default.nix
+++ b/modules/programs/hyprland/default.nix
@@ -9,9 +9,7 @@ with lib;
 let
   cfg = config.my.programs.hyprland;
 
-  hyprland-default = inputs.hyprland.packages.${pkgs.system}.default;
-  hyprland-nvidia = hyprland-default.override { nvidiaPatches = true; };
-  hyprland = if cfg.nvidiaSupport then hyprland-nvidia else hyprland-default;
+  hyprland = pkgs.hyprland.override { nvidiaPatches = cfg.nvidiaSupport; };
 in
 {
   options.my.programs.hyprland = {
@@ -26,7 +24,10 @@ in
       programs.waybar = {
         enable = true;
         package = pkgs.waybar-hyprland;
-        systemd.enable = true;
+        systemd = {
+          enable = true;
+          target = "hyprland-session.target";
+        };
         settings = {
           mainBar = {
             layer = "top";
@@ -90,15 +91,14 @@ in
               wallpaper = ,${wallpaper}
             '';
           in
-          # setWallpaper "/home/moritz/.config/wallpapers/a_short_walk.png";
-          setWallpaper "/home/moritz/.config/wallpapers/mario.gif";
+          setWallpaper "/home/moritz/.config/wallpapers/a_short_walk.png";
         onChange = "${pkgs.systemd}/bin/systemctl restart --user hyprpaper.service";
       };
     };
     systemd.user.services.hyprpaper = {
       enable = true;
       path = [ pkgs.hyprpaper ];
-      wantedBy = [ "display-manager.service" ];
+      wantedBy = [ "hyprland-session.target" ];
       after = [ "display-manager.service" ];
       script = "hyprpaper";
     };
@@ -167,6 +167,7 @@ in
     xdg.portal = {
       enable = true;
       wlr.enable = true;
+      extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
     };
   };
 }