From e13b567e3aaff0ad71f9a9953e080c19936784d2 Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Thu, 7 Mar 2024 15:05:44 -0600
Subject: [PATCH] More Hyprland config changes.

---
 flake.lock                        | 84 ++++---------------------------
 flake.nix                         |  2 +-
 nixos/durincore/configuration.nix |  3 +-
 3 files changed, 13 insertions(+), 76 deletions(-)

diff --git a/flake.lock b/flake.lock
index adb9d56..70024fd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -842,22 +842,20 @@
     },
     "hyprland-protocols-git": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols_4",
-        "hyprlang": "hyprlang_5",
         "nixpkgs": "nixpkgs_12",
-        "systems": "systems_8"
+        "systems": "systems_7"
       },
       "locked": {
-        "lastModified": 1709299639,
-        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
+        "lastModified": 1691753796,
+        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
         "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
+        "repo": "hyprland-protocols",
+        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
+        "repo": "hyprland-protocols",
         "type": "github"
       }
     },
@@ -914,31 +912,6 @@
       }
     },
     "hyprland-protocols_4": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland-protocols-git",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland-protocols-git",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1691753796,
-        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
-    "hyprland-protocols_5": {
       "inputs": {
         "nixpkgs": [
           "hyprland-xdph-git",
@@ -965,10 +938,10 @@
     },
     "hyprland-xdph-git": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols_5",
-        "hyprlang": "hyprlang_6",
+        "hyprland-protocols": "hyprland-protocols_4",
+        "hyprlang": "hyprlang_5",
         "nixpkgs": "nixpkgs_13",
-        "systems": "systems_10"
+        "systems": "systems_9"
       },
       "locked": {
         "lastModified": 1709299639,
@@ -1113,34 +1086,12 @@
       }
     },
     "hyprlang_5": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland-protocols-git",
-          "nixpkgs"
-        ],
-        "systems": "systems_7"
-      },
-      "locked": {
-        "lastModified": 1708681732,
-        "narHash": "sha256-ULZZLZ9C33G13IaXLuAc4oTzHUvnATI8Fj2u6gzMfT0=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "f4466367ef0a92a6425d482050dc2b8840c0e644",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprlang_6": {
       "inputs": {
         "nixpkgs": [
           "hyprland-xdph-git",
           "nixpkgs"
         ],
-        "systems": "systems_9"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1708681732,
@@ -2092,21 +2043,6 @@
         "type": "github"
       }
     },
-    "systems_10": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index e569020..f9f00a1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,7 @@
     };
     
     # hyprland-protocols
-    hyprland-protocols-git.url = "github:hyprwm/xdg-desktop-portal-hyprland";
+    hyprland-protocols-git.url = "github:hyprwm/hyprland-protocols";
 
     # hyprland-community nix
     hyprland-nix = {
diff --git a/nixos/durincore/configuration.nix b/nixos/durincore/configuration.nix
index 1b17076..98de12c 100644
--- a/nixos/durincore/configuration.nix
+++ b/nixos/durincore/configuration.nix
@@ -15,10 +15,11 @@
     hostName = "durincore"; # Define your hostname.
     networkmanager.enable = true;
   };
-
+  
   programs.hyprland = {
     enable = true;
     package = inputs.hyprland-git.packages.${pkgs.system}.hyprland;
+    portalPackage = inputs.hyprland-xdph-git.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
   };
 
   environment.sessionVariables = {