From 8e7958b4ddc23d0e01bb3898b07d9f3ec63435ad Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 17 Oct 2023 23:54:24 -0500 Subject: [PATCH] feat: calmeta Signed-off-by: jolheiser --- flake.nix | 14 ++++++++++++++ machines/dragonwell/default.nix | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 4ce5570..43aa039 100644 --- a/flake.nix +++ b/flake.nix @@ -180,6 +180,19 @@ ]; }; }; + colmena = { + meta = { + nixpkgs = import nixpkgs { + system = "x86_64-linux"; + }; + }; + dragonwell = { + imports = [ + golink.nixosModules.default + ./machines/dragonwell + ]; + }; + }; } // inputs.flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -187,6 +200,7 @@ devShells.default = pkgs.mkShell { nativeBuildInputs = [ agenix.packages.${system}.agenix + pkgs.colmena ]; }; }); diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index d413d27..2f6039b 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -1,7 +1,7 @@ let username = "jolheiser"; in { - imports = [./caddy.nix ./golink.nix ./hardware.nix ../common/nogui]; + imports = [./caddy.nix ./golink.nix ./hardware.nix]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true;