From 841cd588cb37b1ddb3d03750b71c8676f9e412e0 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Thu, 25 Jul 2024 21:31:31 +0200 Subject: [PATCH] flake: cleanup inputs a bit --- flake.lock | 81 +++++++++++++++-------------------------- flake.nix | 16 +++----- system/flakes/Styx.nix | 8 ++-- system/hosts/tanker.nix | 2 - 4 files changed, 38 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 7a92669..6886554 100644 --- a/flake.lock +++ b/flake.lock @@ -299,10 +299,33 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ - "pre-commit-hooks-nix", + "git-hooks", "nixpkgs" ] }, @@ -397,34 +420,14 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" } }, - "mkalias": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1678761502, - "narHash": "sha256-tL3C/b2BPOGQpV287wECDCDWmKwwPvezAAN3qz7N07M=", - "owner": "reckenrode", - "repo": "mkalias", - "rev": "8a5478cdb646f137ebc53cb9d235f8e5892ea00a", - "type": "github" - }, - "original": { - "owner": "reckenrode", - "repo": "mkalias", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": [ "flake-parts" ], "git-hooks": [ - "pre-commit-hooks-nix" + "git-hooks" ], "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", @@ -574,11 +577,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -629,29 +632,6 @@ "type": "github" } }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -660,15 +640,14 @@ "disko": "disko", "flake-parts": "flake-parts", "flake-root": "flake-root", + "git-hooks": "git-hooks", "home-manager": "home-manager", "lix-module": "lix-module", - "mkalias": "mkalias", "neovim-nightly-overlay": "neovim-nightly-overlay", "nifoc-overlay": "nifoc-overlay", "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix_2" } }, diff --git a/flake.nix b/flake.nix index cad1ade..e791d24 100644 --- a/flake.nix +++ b/flake.nix @@ -26,8 +26,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - pre-commit-hooks-nix = { - url = "github:cachix/pre-commit-hooks.nix"; + git-hooks = { + url = "github:cachix/git-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -69,7 +69,7 @@ inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; - git-hooks.follows = "pre-commit-hooks-nix"; + git-hooks.follows = "git-hooks"; }; }; @@ -80,11 +80,6 @@ flake-parts.follows = "flake-parts"; }; }; - - mkalias = { - url = "github:reckenrode/mkalias"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = inputs@{ flake-parts, lix-module, deploy-rs, ... }: @@ -92,9 +87,8 @@ flake = let Styx = import ./system/flakes/Styx.nix { - inherit (inputs) nixpkgs home-manager nix-darwin agenix; + inherit (inputs) nixpkgs home-manager nix-darwin agenix neovim-nightly-overlay nifoc-overlay; inherit lix-module; - inherit inputs; }; tanker = import ./system/flakes/tanker.nix { @@ -156,7 +150,7 @@ imports = [ inputs.flake-root.flakeModule inputs.treefmt-nix.flakeModule - inputs.pre-commit-hooks-nix.flakeModule + inputs.git-hooks.flakeModule ]; systems = [ diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix index e632a0f..5219ac4 100644 --- a/system/flakes/Styx.nix +++ b/system/flakes/Styx.nix @@ -1,18 +1,16 @@ -{ nixpkgs, lix-module, home-manager, nix-darwin, agenix, inputs, ... }: +{ nixpkgs, lix-module, home-manager, nix-darwin, agenix, neovim-nightly-overlay, nifoc-overlay }: let default-system = "aarch64-darwin"; overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; }; - overlay-mkalias = _: _: { inherit (inputs.mkalias.packages.${default-system}) mkalias; }; nixpkgsConfig = { overlays = [ overlay-x86 agenix.overlays.default - inputs.neovim-nightly-overlay.overlays.default - inputs.nifoc-overlay.overlay - overlay-mkalias + neovim-nightly-overlay.overlays.default + nifoc-overlay.overlay ]; config = { diff --git a/system/hosts/tanker.nix b/system/hosts/tanker.nix index f80a6e0..23b6ddc 100644 --- a/system/hosts/tanker.nix +++ b/system/hosts/tanker.nix @@ -63,8 +63,6 @@ in system.stateVersion = "22.11"; nix = { - package = pkgs.nixVersions.stable; - settings = { experimental-features = [ "nix-command" "flakes" ]; extra-platforms = [ "aarch64-linux" ];