From d9f918f37f5ae8ed31da920d249227f154535e54 Mon Sep 17 00:00:00 2001 From: Tamipes Date: Sat, 11 Jul 2026 21:59:24 +0200 Subject: [PATCH] feat: support `https://niks3-cache.tami.moe` and add `niks3` binary --- flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 23 ++++++++++++++++++----- 2 files changed, 61 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index cfb7c71..36096f7 100644 --- a/flake.lock +++ b/flake.lock @@ -64,6 +64,27 @@ "type": "github" } }, + "niks3": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1783583669, + "narHash": "sha256-fiAFsNCgzMmaeoEFQiibMIYO3MyUqvKlwNT3F+N94MI=", + "owner": "Mic92", + "repo": "niks3", + "rev": "fbcded5420a3f2357fda14b6cf0f0453d1ed3266", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "niks3", + "type": "github" + } + }, "nix": { "inputs": { "flake-compat": "flake-compat", @@ -150,9 +171,31 @@ }, "root": { "inputs": { + "niks3": "niks3", "nix": "nix", "nixpkgs": "nixpkgs_2" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "niks3", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780220602, + "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0b32008..676d72d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,18 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nix.url = "github:nixos/nix"; + niks3 = { + url = "github:Mic92/niks3"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { nixpkgs, nix, self }: - let pkgs = import nixpkgs { system = "x86_64-linux"; }; in { - packages.x86_64-linux = rec { + outputs = { nixpkgs, nix, self, ... }@inputs: + let + system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; }; + in + { + packages.${system} = rec { default = nix-with-tools; minimal-nix = import (nix + "/docker.nix") { @@ -23,12 +31,17 @@ }; nix-with-tools = import (nix + "/docker.nix") { inherit pkgs; - extraPkgs = [ pkgs.nodejs pkgs.skopeo ]; + extraPkgs = [ + pkgs.nodejs + pkgs.skopeo + inputs.niks3.packages.${system}.default + ]; nixConf = { - extra-substituters = [ "https://nix-cache.tami.moe" ]; + extra-substituters = [ "https://nix-cache.tami.moe" "https://niks3-cache.tami.moe" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-cache.tami.moe:3jrWZ412K0YTFfKMJC6ftc4lsugeMVWDBiudFCAdDb8=" + "niks3-garage:l7ZLnM6i0mqqHbMEpHg+UAeqG53u8m/Mhep487dOOOE=" ]; };