diff --git a/flake.lock b/flake.lock index 5ecba04c..9b78a93b 100644 --- a/flake.lock +++ b/flake.lock @@ -454,7 +454,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1709126324, @@ -472,7 +472,7 @@ }, "flake-utils_11": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1701680307, @@ -490,7 +490,7 @@ }, "flake-utils_12": { "inputs": { - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1701680307, @@ -508,7 +508,7 @@ }, "flake-utils_13": { "inputs": { - "systems": "systems_13" + "systems": "systems_14" }, "locked": { "lastModified": 1701680307, @@ -561,7 +561,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1705309234, @@ -579,7 +579,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1709126324, @@ -597,7 +597,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1685518550, @@ -615,7 +615,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1685518550, @@ -633,7 +633,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1701680307, @@ -651,7 +651,7 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1709126324, @@ -835,6 +835,49 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708212860, + "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlock": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710863423, + "narHash": "sha256-JdSC7TCqPOp85B9jpAAlkVrIVejJFY+f9rSlDc9vKsk=", + "owner": "hyprwm", + "repo": "hyprlock", + "rev": "54da0cae0f197f07c17c672ebdc22de244859494", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlock", + "type": "github" + } + }, "ironbar": { "inputs": { "crane": "crane", @@ -1556,6 +1599,7 @@ "anyrun-rink": "anyrun-rink", "flake-utils": "flake-utils_3", "home-manager": "home-manager", + "hyprlock": "hyprlock", "ironbar": "ironbar", "lanzaboote": "lanzaboote", "music-player": "music-player", @@ -1779,6 +1823,21 @@ "type": "github" } }, + "systems_14": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1811,16 +1870,16 @@ }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 78a69bd1..eb63b8b6 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,7 @@ url = "github:uttarayan21/anyrun-rink"; inputs.nixpkgs.follows = "nixpkgs"; }; + ironbar = { url = "github:JakeStanger/ironbar"; inputs.nixpkgs.follows = "nixpkgs"; @@ -61,6 +62,11 @@ nur.url = "github:nix-community/nur"; + hyprlock = { + url = "github:hyprwm/hyprlock"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; outputs = diff --git a/linux/hyprland.nix b/linux/hyprland.nix index e63c8551..6c85d631 100644 --- a/linux/hyprland.nix +++ b/linux/hyprland.nix @@ -1,5 +1,6 @@ -{ pkgs, ... }: { - imports = [ ../modules/hyprpaper.nix ]; +{ pkgs, inputs, ... }: { + imports = [ ../modules/hyprpaper.nix inputs.hyprlock.homeManagerModules.hyprlock ]; + programs.hyprpaper = let wallpapers = import ../utils/wallhaven.nix { inherit pkgs; }; in { @@ -12,6 +13,9 @@ "DP-1" = wallpapers.shapes; }; }; + programs.hyprlock = { + enable = true; + }; wayland.windowManager.hyprland = { enable = true; diff --git a/overlays.nix b/overlays.nix index 3361c362..ef77d5d5 100644 --- a/overlays.nix +++ b/overlays.nix @@ -83,7 +83,9 @@ let }; anyrun-overlay = final: prev: { - anyrun = inputs.anyrun.packages.${prev.system}.anyrun; + anyrun = (inputs.anyrun.packages.${prev.system}.anyrun.overrideAttrs (finalAttrs: prevAttrs: { + cargoPatches = [ ./patches/anyrun.patch ]; + })); hyprwin = inputs.anyrun-hyprwin.packages.${prev.system}.hyprwin; nixos-options = inputs.anyrun-nixos-options.packages.${prev.system}.default; anyrun-rink = inputs.anyrun-rink.packages.${prev.system}.default;