From f563b036a1e0077c6d0f7355f1030eb671bf4ae0 Mon Sep 17 00:00:00 2001
From: caem <me@caem.dev>
Date: Fri, 26 Jul 2024 20:48:08 +0200
Subject: [PATCH] hyprland: Actually use the git release

---
 flake.lock                                | 36 ++++++++++++++++-------
 flake.nix                                 |  1 -
 home/default.nix                          |  5 +++-
 home/packages/hyprland.nix                | 12 +++++++-
 hosts/workstation/default.nix             |  1 +
 modules/desktop/environments/hyprland.nix |  7 +++--
 6 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 732c4d5..5425355 100644
--- a/flake.lock
+++ b/flake.lock
@@ -126,18 +126,16 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1721914179,
-        "narHash": "sha256-WZg2L+57atfJXwMA78pbmMnnlNXllnX+GcFwx2P/wPU=",
+        "lastModified": 1722016404,
+        "narHash": "sha256-zlO1JffU6YLrcc7XtPikMsodvhlkbdRcDfqDsoHzgQY=",
         "ref": "refs/heads/main",
-        "rev": "33a5c8ce325e1657ec5571b57e05c6378706f4cd",
-        "revCount": 4984,
+        "rev": "57371b93a058d17affb0ca92f13b8d40582b3ea0",
+        "revCount": 4985,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -270,6 +268,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1721379653,
+        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1721924956,
         "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
@@ -287,11 +301,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1722015900,
-        "narHash": "sha256-v/B1e5SQDTCBgppQbhZlSwf+RHt6Ct5pqdhrZbLA03w=",
+        "lastModified": 1722016195,
+        "narHash": "sha256-HwzjeK2aMYXn7X6pUfcuAd+fH90Ia+evhkT0ZODc+cU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2308f5ba2aa1288c01f2c1af4d4c1cbcefcde0f0",
+        "rev": "b51ebdb75573c51ddc621ba1bd3ea3488b2afc99",
         "type": "github"
       },
       "original": {
@@ -306,7 +320,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "impermanence": "impermanence",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nur": "nur"
       }
     },
diff --git a/flake.nix b/flake.nix
index 475cc56..fda735d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,6 @@
       type = "git";
       url = "https://github.com/hyprwm/Hyprland";
       submodules = true;
-      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
diff --git a/home/default.nix b/home/default.nix
index 6f0b6fa..12411df 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ inputs, config, pkgs, ... }:
 
 {
   imports = [
@@ -20,6 +20,9 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
+    extraSpecialArgs = {
+      inherit inputs;
+    };
     users.hu = {
       home.username = "hu";
       home.homeDirectory = "/home/hu";
diff --git a/home/packages/hyprland.nix b/home/packages/hyprland.nix
index 6b1b1b8..990100a 100644
--- a/home/packages/hyprland.nix
+++ b/home/packages/hyprland.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, pkgs, ... }:
 
 {
   services.hyprpaper = {
@@ -17,6 +17,7 @@
 
   wayland.windowManager.hyprland = {
     enable = true;
+    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
     systemd = {
       enable = true;
       variables = [ "--all" ];
@@ -29,6 +30,15 @@
 
       monitor = "DP-1,1920x1080@144,auto,1";
 
+      # Freezes Firefox, enable later when useable.
+      # experimental = {
+      #   explicit_sync = true;
+      # };
+
+      cursor = {
+        no_hardware_cursors = true;
+      };
+
       input = {
         kb_layout = "gb:intl";
         follow_mouse = 1;
diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index eda7371..9264576 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -55,6 +55,7 @@
     };
     nvidia = {
       modesetting.enable = true;
+      open = true;
       package = config.boot.kernelPackages.nvidiaPackages.beta;
     };
   };
diff --git a/modules/desktop/environments/hyprland.nix b/modules/desktop/environments/hyprland.nix
index 890c06a..96230c5 100644
--- a/modules/desktop/environments/hyprland.nix
+++ b/modules/desktop/environments/hyprland.nix
@@ -25,8 +25,11 @@
     NIXOS_OZONE_WL = 1;
   };
 
-  programs.hyprland.enable = true;
-  programs.hyprland.package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+  programs.hyprland = {
+    enable = true;
+    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+  };
+
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.greetd.enableGnomeKeyring = true;