From 260a2e3d681bea7a71596a8db244a3bc9d096bbc Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Sat, 19 Oct 2024 00:17:40 -0400 Subject: [PATCH] Added hyprlock --- home-config/nix-home-manager/flake.lock | 98 ++++++++++++++++++++++++- home-config/nix-home-manager/flake.nix | 7 +- home-config/nix-home-manager/home.nix | 3 +- 3 files changed, 104 insertions(+), 4 deletions(-) diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index 8885a8c..8a67541 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -207,15 +207,68 @@ "type": "github" } }, - "hyprpicker-git": { + "hyprlang_2": { "inputs": { + "hyprutils": [ + "hyprlock", + "hyprutils" + ], + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlock": { + "inputs": { + "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], "systems": "systems_2" }, + "locked": { + "lastModified": 1721563228, + "narHash": "sha256-w+AyYuqlZ/uWEimiptlHjtDFECm/JlUOD2ciCw8/+/8=", + "owner": "hyprwm", + "repo": "hyprlock", + "rev": "dba9d8b5175a6f23463035aafc6b0c741f9b73a5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "ref": "v0.4.1", + "repo": "hyprlock", + "type": "github" + } + }, + "hyprpicker-git": { + "inputs": { + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_3" + }, "locked": { "lastModified": 1727732210, "narHash": "sha256-VNKakkdx1mjfO5MyGZbx8m87YKZ4B8cylU50R0J662g=", @@ -256,6 +309,31 @@ } }, "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1721324102, + "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "962582a090bc233c4de9d9897f46794280288989", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprpicker-git", @@ -371,6 +449,7 @@ "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", + "hyprlock": "hyprlock", "hyprpicker-git": "hyprpicker-git", "nixgl": "nixgl", "nixpkgs": "nixpkgs" @@ -406,6 +485,21 @@ "type": "github" } }, + "systems_3": { + "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" + } + }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index 6429214..9eb13bf 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -16,13 +16,17 @@ url = "github:hyprwm/hyprland/v0.44.1"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprlock = { + url = "github:hyprwm/hyprlock/v0.4.1"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixgl = { url = "github:nix-community/nixGL"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, nixgl, ... }@inputs: + outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, hyprlock, nixgl, ... }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -43,6 +47,7 @@ _module.args = { inherit hyprland; inherit nixgl; + inherit hyprlock; }; } ]; diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 92e9082..c572a6f 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, hyprland, nixgl, ... }: +{ config, pkgs, hyprland, hyprlock, nixgl, ... }: { # Home Manager needs a bit of information about you and the paths it should @@ -49,6 +49,7 @@ # Flakes specific things defined in flake.nix hyprland.packages.${pkgs.system}.default nixgl.packages.${pkgs.system}.nixGLIntel + hyprlock.packages.${pkgs.system}.default # Fonts! noto-fonts