From 96b37521172532e962b31b4796001c437ab53bcb Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 12 Jun 2024 14:50:26 -0400 Subject: [PATCH] hyprland: Lock version to v0.39.1-patched Note that using a separate fork is necessary since overlaying flakes seems to be non-trivial here. Also note that previously the nixpkgs hyprland was being started from greetd. This fixes that. --- flake.lock | 200 ++++++++++++++++++++++++++++++++++++++++++ flake.nix | 5 ++ modules/desktop.nix | 2 +- overlays/hyprland.nix | 5 -- 4 files changed, 206 insertions(+), 6 deletions(-) delete mode 100644 overlays/hyprland.nix diff --git a/flake.lock b/flake.lock index 0476928d..325cc1cb 100644 --- a/flake.lock +++ b/flake.lock @@ -184,6 +184,140 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717181720, + "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems", + "wlroots": "wlroots", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1717988466, + "narHash": "sha256-gg/R5UdReHiaHbc3xCi3ThzpBRSmEdF5ADr2nJQXt70=", + "owner": "donovanglover", + "repo": "Hyprland", + "rev": "82fcf90342a89bc7515850d7969284862264d6a5", + "type": "github" + }, + "original": { + "owner": "donovanglover", + "ref": "v0.39.1-patched", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": "hyprutils", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1717881334, + "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1714253743, @@ -203,6 +337,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "hyprland": "hyprland", "nixpkgs": "nixpkgs", "sakaya": "sakaya", "stylix": "stylix" @@ -260,6 +395,71 @@ "rev": "6bc871ab352c9f18d1179daab9e392a4d46393af", "type": "github" } + }, + "systems": { + "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" + } + }, + "wlroots": { + "flake": false, + "locked": { + "lastModified": 1713124002, + "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "type": "github" + } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717918856, + "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "72907822c19afc0983c69d59d299204381623725", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 440173fa..9093390e 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,11 @@ }; }; + hyprland = { + url = "github:donovanglover/Hyprland/v0.39.1-patched"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + sakaya = { url = "github:donovanglover/sakaya"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/desktop.nix b/modules/desktop.nix index 0a4ac2e9..8b2faee3 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -98,7 +98,7 @@ in }; initial_session = { - command = "${pkgs.hyprland}/bin/Hyprland"; + command = "${nix-config.inputs.hyprland.packages.${pkgs.system}.hyprland}/bin/Hyprland"; user = username; }; }; diff --git a/overlays/hyprland.nix b/overlays/hyprland.nix deleted file mode 100644 index f02dbf3e..00000000 --- a/overlays/hyprland.nix +++ /dev/null @@ -1,5 +0,0 @@ -final: prev: { - hyprland = prev.hyprland.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or [ ]) ++ [ ../patches/hyprland-fix-fcitx-window-focus.patch ]; - }); -}