From 36de2379930d69d8558525d524d64f52510e34c9 Mon Sep 17 00:00:00 2001 From: John Ogle Date: Fri, 23 Aug 2024 15:27:58 -0700 Subject: [PATCH] Pin hyprland and hy3 to match the system --- flake.lock | 119 +++++++++++++++++++++++++++++++++++++++++++---------- flake.nix | 19 ++++----- 2 files changed, 106 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 6a3cc04..a531edd 100644 --- a/flake.lock +++ b/flake.lock @@ -3,28 +3,32 @@ "aquamarine": { "inputs": { "hyprutils": [ + "system-flake", "hyprland", "hyprutils" ], "hyprwayland-scanner": [ + "system-flake", "hyprland", "hyprwayland-scanner" ], "nixpkgs": [ + "system-flake", "hyprland", "nixpkgs" ], "systems": [ + "system-flake", "hyprland", "systems" ] }, "locked": { - "lastModified": 1724273991, - "narHash": "sha256-+aUSOXKGpS5CRm1oTitgNAr05ThQNbKIXalZHl3nC6Y=", + "lastModified": 1722347739, + "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9a3161ad4c78dc420d1cbb3aae638222608c7de4", + "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", "type": "github" }, "original": { @@ -53,9 +57,31 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "system-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hy3": { "inputs": { "hyprland": [ + "system-flake", "hyprland" ] }, @@ -77,24 +103,27 @@ "hyprcursor": { "inputs": { "hyprlang": [ + "system-flake", "hyprland", "hyprlang" ], "nixpkgs": [ + "system-flake", "hyprland", "nixpkgs" ], "systems": [ + "system-flake", "hyprland", "systems" ] }, "locked": { - "lastModified": 1722623071, - "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", + "lastModified": 1721330371, + "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", + "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", "type": "github" }, "original": { @@ -110,13 +139,14 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "systems": "systems", "xdph": "xdph" }, "locked": { "lastModified": 1723058230, "narHash": "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=", + "ref": "refs/heads/main", "rev": "9a09eac79b85c846e3a865a9078a3f8ff65a9259", "revCount": 5069, "submodules": true, @@ -133,11 +163,13 @@ "hyprland-protocols": { "inputs": { "nixpkgs": [ + "system-flake", "hyprland", "xdph", "nixpkgs" ], "systems": [ + "system-flake", "hyprland", "xdph", "systems" @@ -160,24 +192,27 @@ "hyprlang": { "inputs": { "hyprutils": [ + "system-flake", "hyprland", "hyprutils" ], "nixpkgs": [ + "system-flake", "hyprland", "nixpkgs" ], "systems": [ + "system-flake", "hyprland", "systems" ] }, "locked": { - "lastModified": 1724174162, - "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=", + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "type": "github" }, "original": { @@ -189,20 +224,22 @@ "hyprutils": { "inputs": { "nixpkgs": [ + "system-flake", "hyprland", "nixpkgs" ], "systems": [ + "system-flake", "hyprland", "systems" ] }, "locked": { - "lastModified": 1722869141, - "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", + "lastModified": 1722098849, + "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0252fd13e78e60fb0da512a212e56007515a49f7", + "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", "type": "github" }, "original": { @@ -214,10 +251,12 @@ "hyprwayland-scanner": { "inputs": { "nixpkgs": [ + "system-flake", "hyprland", "nixpkgs" ], "systems": [ + "system-flake", "hyprland", "systems" ] @@ -238,11 +277,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -252,7 +307,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1723637854, "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", @@ -271,9 +326,28 @@ "root": { "inputs": { "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "system-flake": "system-flake" + } + }, + "system-flake": { + "inputs": { + "home-manager": "home-manager_2", "hy3": "hy3", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "dirtyRev": "c11d973b4b80e9093469c2d631413400af2d0122-dirty", + "dirtyShortRev": "c11d973-dirty", + "lastModified": 1724450819, + "narHash": "sha256-m9w2HgDUvtXegSjuIPE3whTYOPnyEZuAdIRZLMtGQBc=", + "type": "git", + "url": "file:///etc/nixos" + }, + "original": { + "type": "git", + "url": "file:///etc/nixos" } }, "systems": { @@ -295,24 +369,27 @@ "inputs": { "hyprland-protocols": "hyprland-protocols", "hyprlang": [ + "system-flake", "hyprland", "hyprlang" ], "nixpkgs": [ + "system-flake", "hyprland", "nixpkgs" ], "systems": [ + "system-flake", "hyprland", "systems" ] }, "locked": { - "lastModified": 1724073926, - "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", + "lastModified": 1722365976, + "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a08ecbbf33598924e93542f737fc6169a26b481e", + "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5a9ab61..d18a255 100644 --- a/flake.nix +++ b/flake.nix @@ -10,19 +10,13 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { + system-flake = { type = "git"; - url = "https://github.com/hyprwm/Hyprland"; - submodules = true; - rev = "9a09eac79b85c846e3a865a9078a3f8ff65a9259"; - }; - hy3 = { - url = "github:outfoxxed/hy3?ref=hl0.42.0"; - inputs.hyprland.follows = "hyprland"; + url = "file:///etc/nixos"; }; }; - outputs = { nixpkgs, home-manager, hyprland, hy3, ... }: + outputs = { nixpkgs, home-manager, ... } @inputs : let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -33,14 +27,17 @@ # Specify your home configuration modules here, for example, # the path to your home.nix. modules = [ - hyprland.homeManagerModules.default + inputs.system-flake.inputs.hyprland.homeManagerModules.default ./home.nix ]; # Optionally use extraSpecialArgs # to pass through arguments to home.nix - extraSpecialArgs = { inherit hy3; inherit hyprland; }; + extraSpecialArgs = { + hy3 = inputs.system-flake.inputs.hy3; + hyprland = inputs.system-flake.inputs.hyprland; + }; }; }; }