From 4f3e57eeef45f30bce03161819f4582ca7f63ddb Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Sun, 2 Feb 2025 23:12:18 +0100 Subject: [PATCH] flake: update inputs, remove unused, avoid duplicates --- flake.lock | 147 +++++++++-------------------------------------------- flake.nix | 31 ++++++++--- 2 files changed, 47 insertions(+), 131 deletions(-) diff --git a/flake.lock b/flake.lock index d972275..5bcd0b5 100644 --- a/flake.lock +++ b/flake.lock @@ -82,7 +82,9 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1737775297, @@ -123,7 +125,9 @@ "deploy-rs": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -506,7 +510,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_4", "xdph": "xdph" @@ -904,7 +908,9 @@ }, "nezia_dev": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "resume": "resume", "tabi": "tabi" }, @@ -948,26 +954,12 @@ "type": "github" } }, - "nix-flatpak": { - "locked": { - "lastModified": 1732285094, - "narHash": "sha256-OD9tu/QN71OnEWtgvm9pXuQs+SGQtKnLHOGVRG5f9CU=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "d3a763532be5d223bb3474642f089667a8091cdf", - "type": "github" - }, - "original": { - "owner": "gmodena", - "ref": "v0.5.0", - "repo": "nix-flatpak", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs" + ], "umu": "umu" }, "locked": { @@ -1021,11 +1013,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { @@ -1072,70 +1064,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1735915915, - "narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1738297584, - "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9189ac18287c599860e878e905da550aa6dec1cd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1738410390, "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", @@ -1150,38 +1078,6 @@ "type": "indirect" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1737370608, - "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "300081d0cc72df578b02d914df941b8ec62240e6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1735554305, - "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nmd": { "flake": false, "locked": { @@ -1204,7 +1100,9 @@ "flake-utils": "flake-utils", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "nmd": "nmd", "plugin-aerial-nvim": "plugin-aerial-nvim", "plugin-alpha-nvim": "plugin-alpha-nvim", @@ -4103,11 +4001,10 @@ "hyprpaper": "hyprpaper", "hyprwm-contrib": "hyprwm-contrib", "nezia_dev": "nezia_dev", - "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", "nix-index-db": "nix-index-db", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_2", "nvf": "nvf", "treefmt-nix": "treefmt-nix" } @@ -4242,7 +4139,9 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1738070913, diff --git a/flake.nix b/flake.nix index 758bafb..2aa47dc 100644 --- a/flake.nix +++ b/flake.nix @@ -51,8 +51,14 @@ url = "github:anyrun-org/anyrun"; inputs.nixpkgs.follows = "nixpkgs"; }; - basix.url = "github:notashelf/basix"; - deploy-rs.url = "github:serokell/deploy-rs"; + basix = { + url = "github:notashelf/basix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + deploy-rs = { + url = "github:serokell/deploy-rs"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hyprland.url = "github:hyprwm/Hyprland"; hypridle = { @@ -90,11 +96,22 @@ url = "github:nezia1/hjem/implement-environment-variables"; # TODO: change to github:feel-co/hjem if env var PR gets in inputs.nixpkgs.follows = "nixpkgs"; }; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.5.0"; - nix-gaming.url = "github:fufexan/nix-gaming"; - nvf.url = "github:notashelf/nvf"; - treefmt-nix.url = "github:numtide/treefmt-nix"; - nezia_dev.url = "github:nezia1/nezia.dev"; + nix-gaming = { + url = "github:fufexan/nix-gaming"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nvf = { + url = "github:notashelf/nvf"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + treefmt-nix = { + url = "github:numtide/treefmt-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nezia_dev = { + url = "github:nezia1/nezia.dev"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; nixConfig = { extra-substituters = [