From fa6e63ace616c218b31b39b9782a4c1dc5450ab1 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Tue, 24 Sep 2024 23:16:55 -0500
Subject: [PATCH] task | add support for colmena

---
 flake.nix                     | 34 ++++++++++++++++------------------
 hosts/eve/default.nix         |  3 +++
 hosts/fred/default.nix        |  3 +++
 hosts/loki/default.nix        |  3 +++
 hosts/server/default.nix      |  1 +
 hosts/smaug/default.nix       |  3 +++
 hosts/workstation/default.nix |  1 +
 7 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index ecd702e..5a6d5b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,7 @@
     home-manager,
     stylix,
     catppuccin,
+    colmena,
     ...
   }: let
     inherit (self) outputs;
@@ -40,15 +41,21 @@
     );
   in {
     inherit lib;
-    # nixosModules = import ./modules/nixos;
-    # homeManagerModules = import ./modules/home-manager;
-    # templates = import ./templates;
+    colmena = {
+      meta = {
+        nixpkgs = import nixpkgs {
+          system = "x86_64-linux";
+        };
+        specialArgs = {
+          inherit inputs outputs;
+        };
+      };
+      eve = import ./hosts/eve;
+      fred = import ./hosts/fred;
+      loki = import ./hosts/loki;
+      smaug = import ./hosts/smaug;
+    };
 
-    # overlays = import ./overlays { inherit inputs outputs; };
-
-    # packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
-    # devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
-    # formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt);
 
     nixosConfigurations = {
       # clients
@@ -71,16 +78,7 @@
         };
       };
       loki = lib.nixosSystem {
-        modules = [
-          # {
-          # nix.settings = {
-          # substituters = ["https://cosmic.cachix.org/"];
-          # trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
-          # };
-          # }
-          # nixos-cosmic.nixosModules.default
-          ./hosts/loki
-        ];
+        modules = [ ./hosts/loki ];
         specialArgs = {
           inherit inputs outputs;
         };
diff --git a/hosts/eve/default.nix b/hosts/eve/default.nix
index 1a9407f..8fd35de 100644
--- a/hosts/eve/default.nix
+++ b/hosts/eve/default.nix
@@ -19,4 +19,7 @@
     ../../home/work
   ];
   networking.hostName = "eve";
+  deployment = {
+    tags = [ "workstation" ];
+  };
 }
diff --git a/hosts/fred/default.nix b/hosts/fred/default.nix
index 7395ccb..a05ee35 100644
--- a/hosts/fred/default.nix
+++ b/hosts/fred/default.nix
@@ -15,4 +15,7 @@
     ./podman.nix
   ];
   networking.hostName = "fred";
+  deployment = {
+    tags = [ "server" ];
+  };
 }
diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix
index ba523e3..7d4ae1f 100644
--- a/hosts/loki/default.nix
+++ b/hosts/loki/default.nix
@@ -20,4 +20,7 @@
     ../../home/work
   ];
   networking.hostName = "loki";
+  deployment = {
+    tags = [ "workstation" ];
+  };
 }
diff --git a/hosts/server/default.nix b/hosts/server/default.nix
index 74c09f9..c87dd57 100644
--- a/hosts/server/default.nix
+++ b/hosts/server/default.nix
@@ -177,6 +177,7 @@ in {
     aspellDicts.en
     base16-schemes
     bash-completion
+    colmena
     nix-bash-completions
     btop
     git-crypt
diff --git a/hosts/smaug/default.nix b/hosts/smaug/default.nix
index d327143..69a0b28 100644
--- a/hosts/smaug/default.nix
+++ b/hosts/smaug/default.nix
@@ -18,4 +18,7 @@
     ../../home/work
   ];
   networking.hostName = "smaug";
+  deployment = {
+    tags = [ "workstation" ];
+  };
 }
diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index 1044b1b..10b1a1d 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -278,6 +278,7 @@ in {
     bash-completion
     brightnessctl
     btop
+    colmena
     espeak-classic
     fwup
     fwupd