From 87d74ce166c40fedd5b3c290ec8cf527ff2bc581 Mon Sep 17 00:00:00 2001 From: poacher Date: Wed, 30 Sep 2026 10:42:38 -0400 Subject: [PATCH] refactor: remove scoped-flakes --- flake.lock | 76 +++++++++++++++++++-------------------- flake.nix | 78 ++++++++++++----------------------------- scoped-flakes.lock.json | 45 ------------------------ 3 files changed, 58 insertions(+), 141 deletions(-) delete mode 100644 scoped-flakes.lock.json diff --git a/flake.lock b/flake.lock index c7e4ed2..5a00ed5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,63 +1,59 @@ { "nodes": { "nixhooks": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1790778492, + "narHash": "sha256-s7/FJeOJsK24UYqi9I0KY/av4bJtVblAAgNKWfZ5YSo=", + "ref": "refs/heads/main", + "rev": "35313de1813e9dc36ad3394065c3143f49fdf191", + "revCount": 43, + "type": "git", + "url": "https://tangled.org/poacher.dev/nixhooks" + }, + "original": { + "type": "git", + "url": "https://tangled.org/poacher.dev/nixhooks" + } + }, + "nixpkgs": { "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "lastModified": 1789370336, + "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c7def046b9a883d46974757852106483d741586f", "type": "github" }, "original": { - "owner": "divnix", - "repo": "blank", + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, - "nixpkgs": { + "nixpkgs_2": { "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "lastModified": 1790652569, + "narHash": "sha256-641r7xrlSOHYoktL9/aArPIYNgZJ9eM5URzSEOtPJDY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6c8664de9b6cc07fe5666a29f91884ba81197c4", "type": "github" }, "original": { - "owner": "divnix", - "repo": "blank", + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { "nixhooks": "nixhooks", - "nixpkgs": "nixpkgs", - "scoped-flakes": "scoped-flakes" - } - }, - "scoped-flakes": { - "inputs": { - "nixhooks": [ - "nixhooks" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1790542265, - "narHash": "sha256-03NsZKhPnve2uls3aEK2Miv6smkGKpdr8hEDY4eNtj4=", - "ref": "refs/heads/main", - "rev": "3a91fbc84478f2caff0685fb005b94c5a6ee77fe", - "revCount": 4, - "type": "git", - "url": "https://tangled.org/poacher.dev/scoped-flakes" - }, - "original": { - "type": "git", - "url": "https://tangled.org/poacher.dev/scoped-flakes" + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flake.nix b/flake.nix index cec4155..93804b4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,18 @@ { inputs = { - scoped-flakes = { - url = "git+https://tangled.org/poacher.dev/scoped-flakes"; - inputs = { - nixpkgs.follows = "nixpkgs"; - nixhooks.follows = "nixhooks"; - }; - }; - nixpkgs.url = "github:divnix/blank"; - nixhooks.url = "github:divnix/blank"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable"; + nixhooks.url = "git+https://tangled.org/poacher.dev/nixhooks"; }; - outputs = inputs: let - inherit (inputs.scoped-flakes.lib) overrideInput; - forAllSystems = inputs.scoped-flakes.lib.forAllSystems { - inherit (inputs) self; - }; + outputs = { + nixpkgs, + nixhooks, + ... + }: let + systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"]; + forAllSystems = nixpkgs.lib.genAttrs systems; - hooks = nixhooks: system: + hooks = system: nixhooks.lib.${system}.mkHooks { hooks = { inherit (nixhooks.lib.${system}.presets) alejandra commitlint; @@ -30,47 +25,18 @@ }; in { lib = import ./.; - - apps = forAllSystems (system: { - name = "apps-${system}"; - isApp = true; - inputs.nixhooks = { - url = "git+https://tangled.org/poacher.dev/nixhooks"; - override = overrideInput inputs.nixhooks; - }; - - outputs = {nixhooks, ...}: (hooks nixhooks system).apps; - }); - - devShells = forAllSystems (system: { - name = "devshell-${system}"; - inputs = { - nixpkgs = { - url = "github:nixos/nixpkgs?ref=nixpkgs-unstable"; - override = overrideInput inputs.nixpkgs; - }; - - nixhooks = { - url = "git+https://tangled.org/poacher.dev/nixhooks"; - override = overrideInput inputs.nixhooks; - }; - }; - - outputs = { - nixpkgs, - nixhooks, - ... - }: let - pkgs = nixpkgs.legacyPackages.${system}; - in { - default = pkgs.mkShell { - shellHook = "${(hooks nixhooks system).install-hooks}/bin/install-hooks"; - nativeBuildInputs = [ - pkgs.nixd - pkgs.alejandra - pkgs.harper - ]; - }; + packages = forAllSystems (system: (hooks system).packages); + apps = forAllSystems (system: (hooks system).apps); + devShells = forAllSystems (system: let + pkgs = nixpkgs.legacyPackages.${system}; + in { + default = pkgs.mkShell { + inherit (hooks system) shellHook; + nativeBuildInputs = [ + pkgs.nixd + pkgs.alejandra + pkgs.harper + ]; }; }); }; diff --git a/scoped-flakes.lock.json b/scoped-flakes.lock.json deleted file mode 100644 index f112324..0000000 --- a/scoped-flakes.lock.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "entries": { - "apps-aarch64-darwin": { - "nixhooks": "sha256-uPtsaFf7BKQEh6UqXiDO979CBm5FpRZrKuhrBDNR00Y=" - }, - "apps-aarch64-linux": { - "nixhooks": "sha256-uPtsaFf7BKQEh6UqXiDO979CBm5FpRZrKuhrBDNR00Y=" - }, - "apps-x86_64-linux": { - "nixhooks": "sha256-uPtsaFf7BKQEh6UqXiDO979CBm5FpRZrKuhrBDNR00Y=" - }, - "devshell-aarch64-darwin": { - "nixhooks": "sha256-uPtsaFf7BKQEh6UqXiDO979CBm5FpRZrKuhrBDNR00Y=", - "nixpkgs": "sha256-EVMNYv7hYDDD9TGVT/hIyTYgpiXA8y3m5xIEIxuGNU0=" - }, - "devshell-aarch64-linux": { - "nixhooks": "sha256-uPtsaFf7BKQEh6UqXiDO979CBm5FpRZrKuhrBDNR00Y=", - "nixpkgs": "sha256-EVMNYv7hYDDD9TGVT/hIyTYgpiXA8y3m5xIEIxuGNU0=" - }, - "devshell-x86_64-linux": { - "nixhooks": "sha256-uPtsaFf7BKQEh6UqXiDO979CBm5FpRZrKuhrBDNR00Y=", - "nixpkgs": "sha256-EVMNYv7hYDDD9TGVT/hIyTYgpiXA8y3m5xIEIxuGNU0=" - } - }, - "resolved": { - "sha256-EVMNYv7hYDDD9TGVT/hIyTYgpiXA8y3m5xIEIxuGNU0=": { - "lastModified": 1790510107, - "narHash": "sha256-EVMNYv7hYDDD9TGVT/hIyTYgpiXA8y3m5xIEIxuGNU0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3181085bfd08663b6b9e60bc7a8395c2aaa741bd", - "type": "github" - }, - "sha256-uPtsaFf7BKQEh6UqXiDO979CBm5FpRZrKuhrBDNR00Y=": { - "lastModified": 1790206540, - "narHash": "sha256-uPtsaFf7BKQEh6UqXiDO979CBm5FpRZrKuhrBDNR00Y=", - "ref": "refs/heads/main", - "rev": "c7e590f7ad0eb099876254c1a27de1e51cc9fa2d", - "revCount": 40, - "type": "git", - "url": "https://tangled.org/poacher.dev/nixhooks" - } - }, - "version": 1 -} -- 2.51.2