From 81e167fdc78308db826be716835fe2fb08a7ab79 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Thu, 29 Feb 2024 15:37:20 +0530 Subject: [PATCH] cleanup inputs --- flake.lock | 89 +++++++++++++++++++++++++++++++++++++++++++++--------- flake.nix | 29 +++--------------- 2 files changed, 79 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index de22a8f..2c97209 100644 --- a/flake.lock +++ b/flake.lock @@ -138,6 +138,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -236,12 +254,8 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -261,7 +275,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "neovim-nightly", "nixpkgs" @@ -289,9 +303,7 @@ "flake-parts": "flake-parts_2", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1709165056, @@ -309,16 +321,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708984720, - "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", + "lastModified": 1709180022, + "narHash": "sha256-7X/voAbg7exNxhHHj6JBxSAHdvL8f3tj1UKSzKJWfXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", + "rev": "57789e56918f454069e7ed991276a184041cbd13", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -339,6 +351,38 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1709169036, + "narHash": "sha256-j+ywPKUS0JLpidNcz6vA0z1xI/rU5PcLV7pwZMce+Tw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ec25c90d35d24e36c0af3b3d58a09542367ebbee", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1708984720, + "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -377,7 +421,7 @@ "impermanence": "impermanence", "lanzaboote": "lanzaboote", "neovim-nightly": "neovim-nightly", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" } }, "rust-overlay": { @@ -434,6 +478,21 @@ "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2d5f75e..9dc2262 100644 --- a/flake.nix +++ b/flake.nix @@ -2,34 +2,15 @@ description = "NixOS Configuration"; inputs = { - nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-unstable"; - }; - - flake-utils = { - url = "github:numtide/flake-utils"; - }; - + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - - impermanence = { - url = "github:nix-community/impermanence"; - }; - - lanzaboote = { - url = "github:nix-community/lanzaboote"; - inputs = { - flake-utils.follows = "flake-utils"; - nixpkgs.follows = "nixpkgs"; - }; - }; - neovim-nightly = { - url = "github:nix-community/neovim-nightly-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + flake-utils.url = "github:numtide/flake-utils"; + impermanence.url = "github:nix-community/impermanence"; + lanzaboote.url = "github:nix-community/lanzaboote"; + neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; }; outputs =