diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index 799e146..9d258f0 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -2,10 +2,22 @@ "nodes": { "aquamarine": { "inputs": { - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", - "systems": "systems" + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] }, "locked": { "lastModified": 1738107926, @@ -190,26 +202,26 @@ "hyprland-protocols": "hyprland-protocols", "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1737978223, - "narHash": "sha256-pSPgvZyvNgiZv/6MquETA6KMfhZ5cJM+YnERJmXA8x8=", + "lastModified": 1738457237, + "narHash": "sha256-9mtM+lwnmXnv5TPmdij1rR5fLzzqSjkltcyEuRf8uIk=", "owner": "hyprwm", "repo": "hyprland", - "rev": "04ac46c54357278fc68f0a95d26347ea0db99496", + "rev": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.47.0", + "ref": "v0.47.2", "repo": "hyprland", "type": "github" } @@ -226,11 +238,11 @@ ] }, "locked": { - "lastModified": 1735774328, - "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "type": "github" }, "original": { @@ -330,49 +342,49 @@ "inputs": { "hyprgraphics": "hyprgraphics_2", "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_3", - "hyprwayland-scanner": "hyprwayland-scanner_3", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_2" }, "locked": { - "lastModified": 1735497496, - "narHash": "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk=", + "lastModified": 1737652318, + "narHash": "sha256-PotjNmR69yAEZP/Dn4lB0p7sHBjAPclNDbc5WkBZx4s=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "3d63d9b129d5def270bc8a2471347e6f97274e2b", + "rev": "9cb5cd9e8227a6bfd456853f965b838f9d0b1786", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.6.1", + "ref": "v0.6.2", "repo": "hyprlock", "type": "github" } }, "hyprpicker-git": { "inputs": { - "hyprutils": "hyprutils_4", - "hyprwayland-scanner": "hyprwayland-scanner_4", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_3" }, "locked": { - "lastModified": 1737129788, - "narHash": "sha256-CWmzXhsdk+c1d7Ub7TXQ2BVYla1HSJ9jbgOilbVl1so=", + "lastModified": 1737635601, + "narHash": "sha256-/Jb/9HqC5Ou5JtsLHY2MJtj/c0aDG3kaeh4RLvc2X2U=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "0b044884d9298bb5fac164101eb880b499d8a5df", + "rev": "c3777320b358bb28a0f2112441377fe452d77ea8", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.4.2", "repo": "hyprpicker", + "rev": "c3777320b358bb28a0f2112441377fe452d77ea8", "type": "github" } }, @@ -380,12 +392,10 @@ "inputs": { "nixpkgs": [ "hyprland", - "aquamarine", "nixpkgs" ], "systems": [ "hyprland", - "aquamarine", "systems" ] }, @@ -406,20 +416,20 @@ "hyprutils_2": { "inputs": { "nixpkgs": [ - "hyprland", + "hyprlock", "nixpkgs" ], "systems": [ - "hyprland", + "hyprlock", "systems" ] }, "locked": { - "lastModified": 1736164519, - "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", + "lastModified": 1735316583, + "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", + "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8", "type": "github" }, "original": { @@ -429,25 +439,6 @@ } }, "hyprutils_3": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1736164519, - "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_4": { "inputs": { "nixpkgs": [ "hyprpicker-git", @@ -459,11 +450,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", "type": "github" }, "original": { @@ -476,12 +467,10 @@ "inputs": { "nixpkgs": [ "hyprland", - "aquamarine", "nixpkgs" ], "systems": [ "hyprland", - "aquamarine", "systems" ] }, @@ -502,11 +491,11 @@ "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ - "hyprland", + "hyprlock", "nixpkgs" ], "systems": [ - "hyprland", + "hyprlock", "systems" ] }, @@ -527,11 +516,11 @@ "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ - "hyprlock", + "hyprpicker-git", "nixpkgs" ], "systems": [ - "hyprlock", + "hyprpicker-git", "systems" ] }, @@ -549,31 +538,6 @@ "type": "github" } }, - "hyprwayland-scanner_4": { - "inputs": { - "nixpkgs": [ - "hyprpicker-git", - "nixpkgs" - ], - "systems": [ - "hyprpicker-git", - "systems" - ] - }, - "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nixgl": { "inputs": { "flake-utils": "flake-utils", @@ -597,38 +561,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1736012469, "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", @@ -674,7 +606,7 @@ "hyprlock": "hyprlock", "hyprpicker-git": "hyprpicker-git", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "wpaperd": "wpaperd" } }, @@ -759,43 +691,13 @@ "type": "github" } }, - "systems_5": { - "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" - } - }, - "systems_6": { - "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" - } - }, "wpaperd": { "inputs": { "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay", - "systems": "systems_6" + "systems": "systems_4" }, "locked": { "lastModified": 1734445299, diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index 60a9c5a..23bdb13 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -9,17 +9,17 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprlock = { - url = "github:hyprwm/hyprlock/v0.6.1"; + url = "github:hyprwm/hyprlock/v0.6.2"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprpicker-git = { - url = "github:hyprwm/hyprpicker/v0.4.2"; + url = "github:hyprwm/hyprpicker/c3777320b358bb28a0f2112441377fe452d77ea8"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { - url = "github:hyprwm/hyprland/v0.47.0"; + url = "github:hyprwm/hyprland/v0.47.2"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.aquamarine.url = "github:hyprwm/aquamarine/v0.7.2"; + #inputs.hyprutils.url = "github:/hyprwm/hyprutils/6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab"; }; nixgl = { url = "github:ryan77627/nixGL/3865170cbc23b32ec7cc8df1ec811fd44b6c2a58"; @@ -32,7 +32,7 @@ #mozff.url = "github:mozilla/nixpkgs-mozilla"; }; - outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, nixgl, wpaperd, hyprlock, ... }@inputs: + outputs = { nixpkgs, home-manager, hyprland, nixgl, wpaperd, hyprpicker-git, hyprlock, ... }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index bdb3b08..d7089dc 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, hyprpicker-git, wpaperd, hyprlock, ... }: +{ config, pkgs, hyprland, nixgl, wpaperd, hyprpicker-git, hyprlock, ... }: let lock-false = { Value = false;