From 16a0fe100a802f35a6ee670139630d869c0410eb Mon Sep 17 00:00:00 2001 From: Jake Ginesin Date: Sat, 25 Jan 2025 22:05:27 -0500 Subject: [PATCH] 305 current 2025-01-25 21:36:27 25.05.20241217.d3c42f1 6.6.66 * --- flake.lock | 22 ++++++++++++++++++++++ flake.nix | 21 +++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 0fcc9e1..aa44af4 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,27 @@ "type": "github" } }, + "haumea": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -69,6 +90,7 @@ "root": { "inputs": { "flake-parts": "flake-parts", + "haumea": "haumea", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index a50a72f..e0a1258 100644 --- a/flake.nix +++ b/flake.nix @@ -10,26 +10,25 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # old - # nur = { - # url = "github:nix-community/NUR"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + haumea = { + url = "github:nix-community/haumea/v0.2.2"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs @ { flake-parts, self, + haumea, + nixpkgs, ... }: flake-parts.lib.mkFlake {inherit inputs;} { imports = [ # To import a flake module - # 1. Add foo to inputs - # 2. Add foo as a parameter to the outputs function - # 3. Add here: foo.flakeModule #cajun-xmonad.default ]; + systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"]; perSystem = { config, @@ -49,6 +48,12 @@ formatter = pkgs.alejandra; }; flake = { + lib = haumea.lib.load { + scripts = ./scripts; + inputs = { + inherit (nixpkgs) lib; + }; + }; # The usual flake attributes can be defined here, including system- # agnostic ones like nixosModule and system-enumerating ones, although # those are more easily expressed in perSystem.