From 5be44d1c1ecea0c0ac30a7c6f6d24d2b00205170 Mon Sep 17 00:00:00 2001 From: Whovian9369 Date: Wed, 8 May 2024 00:26:39 -0400 Subject: [PATCH] Update `inputs` to clean up my `flake.lock` some more --- flake.lock | 123 ++++++++++++++--------------------------------------- flake.nix | 28 +++++++++++- 2 files changed, 59 insertions(+), 92 deletions(-) diff --git a/flake.lock b/flake.lock index c16f067..544198e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,15 @@ "agenix": { "inputs": { "darwin": [], - "home-manager": "home-manager", + "home-manager": [ + "nixpkgs" + ], "nixpkgs": [ "nixpkgs" ], - "systems": "systems" + "systems": [ + "nix-systems_default" + ] }, "locked": { "lastModified": 1715101957, @@ -41,25 +45,9 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" + "systems": [ + "nix-systems_default" + ] }, "locked": { "lastModified": 1710146030, @@ -76,27 +64,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -133,10 +100,27 @@ "type": "path" } }, + "nix-systems_default": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "nixos-wsl": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] @@ -175,61 +159,20 @@ "root": { "inputs": { "agenix": "agenix", - "home-manager": "home-manager_2", + "flake-utils": "flake-utils", + "home-manager": "home-manager", "my_packages": "my_packages", + "nix-systems_default": "nix-systems_default", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "xil": "xil" } }, - "systems": { - "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, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "xil": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 71e7f52..2dfc5d3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { description = "Whovian9369's WSL NixOS Config"; inputs = { + ### Basically required nixpkgs = { url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -9,6 +10,7 @@ nixos-wsl = { url = "github:nix-community/NixOS-WSL/main"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; }; ### My extra inputs @@ -16,10 +18,12 @@ agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; - # optional, not necessary for the module + # Optional, not necessary for the module inputs.darwin.follows = ""; - # optionally choose not to download darwin deps + # Optionally choose not to download darwin deps # (saves some resources on Linux) + inputs.systems.follows = "nix-systems_default"; + inputs.home-manager.follows = "nixpkgs"; }; home-manager = { @@ -35,7 +39,27 @@ xil = { url = "github:Qyriad/Xil"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; }; + + ######### + # Extra inputs that I am adding just to make my life easier, + # but don't like that they're included >:( + ######### + + # I don't like `flake-utils`, but so many things use it that I might as + # well only keep a single version of it. + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.systems.follows = "nix-systems_default"; + }; + + # Ditto to github:nix-systems/default + nix-systems_default = { + url = "github:nix-systems/default"; + }; + + }; # inputs outputs = { self, nixpkgs, nixos-wsl, agenix, home-manager, my_packages, xil, ... }: