diff --git a/flake.lock b/flake.lock index 059bf588..66945f55 100644 --- a/flake.lock +++ b/flake.lock @@ -57,39 +57,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721571743, - "narHash": "sha256-hat7wggtDISBJD8kTo5MTrT+IsY/Ha2MwgjmqqijoCA=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "601f6cf95cbe4fef02dc7faf34bba58566c914e9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "arion": { "inputs": { "flake-parts": "flake-parts", @@ -959,7 +926,6 @@ }, "hyprland": { "inputs": { - "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", "hyprutils": "hyprutils", @@ -971,16 +937,17 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721684218, - "narHash": "sha256-FbFz+F5LJs92s6/DEkhh2h+k8NRqqrs8MGF+GRZWZGo=", + "lastModified": 1721463092, + "narHash": "sha256-P86aiF7iFAc5sAWL3nXf0XRfhXDAudHpmCh0sW7wrr4=", "ref": "refs/heads/main", - "rev": "3c758db95c129ed6ca7ce0c1b5b82ad6e189488d", - "revCount": 4963, + "rev": "f642fb97df5c69267a03452533de383ff8023570", + "revCount": 4934, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, "original": { + "rev": "f642fb97df5c69267a03452533de383ff8023570", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1003,16 +970,17 @@ ] }, "locked": { - "lastModified": 1721668405, - "narHash": "sha256-ZnIXa+jeMXoerhRz/ZJwVoYHaROjcLyQsr1b6JZ2AjQ=", + "lastModified": 1721415237, + "narHash": "sha256-wL8dHknJsDLzm0Dg8484kvdXQk2T74X13m69VsR1mZE=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "4c2cef8326711fbd91b7a313f095545eb50d2a57", + "rev": "f23d3ebd92fdbaac107b71893fab94701c39eeb8", "type": "github" }, "original": { "owner": "hyprwm", "repo": "hyprland-plugins", + "rev": "f23d3ebd92fdbaac107b71893fab94701c39eeb8", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 2e70bde8..06d930b4 100644 --- a/flake.nix +++ b/flake.nix @@ -124,6 +124,7 @@ }; hyprland = { inputs.nixpkgs.follows = "nixpkgs"; + rev = "f642fb97df5c69267a03452533de383ff8023570"; submodules = true; type = "git"; url = "https://github.com/hyprwm/Hyprland"; @@ -132,6 +133,7 @@ inputs.hyprland.follows = "hyprland"; owner = "hyprwm"; repo = "hyprland-plugins"; + rev = "f23d3ebd92fdbaac107b71893fab94701c39eeb8"; type = "github"; }; jellyfin-flake = { diff --git a/flake/inputs.nix b/flake/inputs.nix index ffc4fbdf..1bb9c29f 100644 --- a/flake/inputs.nix +++ b/flake/inputs.nix @@ -126,11 +126,15 @@ let type = "git"; url = "https://github.com/hyprwm/Hyprland"; submodules = true; + + # FIXME: cursor doesn't work right after aquamarine merge + rev = "f642fb97df5c69267a03452533de383ff8023570"; }; hyprland-plugins = mkHyprDep { owner = "hyprwm"; repo = "hyprland-plugins"; + rev = "f23d3ebd92fdbaac107b71893fab94701c39eeb8"; # type = "path"; # path = "/home/matt/git/hyprland-plugins";