use upstream packages where possible

flake.lock

@@ -41,16 +41,14 @@
         "hyprland-protocols": "hyprland-protocols",
         "nixpkgs": "nixpkgs",
         "wlroots": "wlroots",
-        "xdph": [
+        "xdph": "xdph"
-          "xdph"
-        ]
       },
       "locked": {
-        "lastModified": 1683108321,
+        "lastModified": 1683143433,
-        "narHash": "sha256-XIRvYgJl0vIr00HhFN0cQK6zwcuww74DSq0wJSdijPA=",
+        "narHash": "sha256-nTSYUkhE7M9l9lKlbBQ6HWOmsf4OTtV0VcJzyx/FrTk=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "5a3c1449194aa70d5eacbd902fa99cc1b2910a30",
+        "rev": "da093a8aec7d3e5030f7ef4b0813f1d8160f47f5",
         "type": "github"
       },
       "original": {
@@ -80,47 +78,6 @@
         "type": "github"
       }
     },
-    "hyprland-protocols_2": {
-      "inputs": {
-        "nixpkgs": [
-          "xdph",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1681065697,
-        "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
-    "hyprpaper": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682542538,
-        "narHash": "sha256-752hHXEGsvKdw1Hm2LoFfi6sj2zVxu2AuKi4sRA7HN0=",
-        "owner": "hyprwm",
-        "repo": "hyprpaper",
-        "rev": "b4fdc0be52d7c3e48e932698bafc3f69dbd45b3b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprpaper",
-        "type": "github"
-      }
-    },
     "impermanence": {
       "locked": {
         "lastModified": 1682268411,
@@ -277,7 +234,6 @@
       "inputs": {
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "hyprpaper": "hyprpaper",
         "impermanence": "impermanence",
         "nix-colors": "nix-colors",
         "nix-index-database": "nix-index-database",
@@ -285,8 +241,7 @@
         "nixpkgs": "nixpkgs_2",
         "purge": "purge",
         "sops-nix": "sops-nix",
-        "trucksimulatorbot-images": "trucksimulatorbot-images",
+        "trucksimulatorbot-images": "trucksimulatorbot-images"
-        "xdph": "xdph"
       }
     },
     "sops-nix": {
@@ -350,17 +305,21 @@
     },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols_2",
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
         "nixpkgs": [
+          "hyprland",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1683042544,
+        "lastModified": 1682439384,
-        "narHash": "sha256-/kNKwmuv/HyByogFy/e+kkaWSjdD2s7TAgKfCk8uapY=",
+        "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "2bdadd2d37f42b516587c64c963ea638c6df8355",
+        "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -33,24 +33,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-
-    xdph = {
-      url = "github:hyprwm/xdg-desktop-portal-hyprland";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
-
     hyprland = {
       url = "github:hyprwm/Hyprland/";
-      inputs = {
-        xdph.follows = "xdph";
-      };
-    };
-
-    hyprpaper = {
-      url = "github:hyprwm/hyprpaper";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     purge = {

hosts/thinkpad/default.nix

@@ -72,7 +72,7 @@
   xdg.portal = {
     enable = true;
     extraPortals = [
-      xdph.packages.x86_64-linux.default
+      pkgs.xdg-desktop-portal-hyprland
     ];
   };
 

users/rouven/modules/hyprland/hyprpaper.nix

@@ -1,10 +1,7 @@
-{ config, hyprpaper, ... }:
+{ pkgs, ... }:
-let
-  hyprpaper-pkg = hyprpaper.packages.x86_64-linux.default;
-in
 {
-  home.packages = [
+  home.packages = with pkgs; [
-    hyprpaper-pkg
+    hyprpaper
   ];
   xdg.configFile."hypr/hyprpaper.conf".text = ''
     preload = ${../../../../images/wallpaper.png}
@@ -14,7 +11,7 @@ in
   systemd.user.services.hyprpaper = {
     Install.WantedBy = [ "graphical-session.target" ];
     Service = {
-      ExecStart = "${hyprpaper-pkg}/bin/hyprpaper";
+      ExecStart = "${pkgs.hyprpaper}/bin/hyprpaper";
       Restart = "on-failure";
     };
     Unit = {