From 2327135fd8372ab2b92cdde576ee60ef6adde0a3 Mon Sep 17 00:00:00 2001
From: Vivian Roest <vivian@0x76.dev>
Date: Sun, 21 Aug 2022 12:01:19 +0200
Subject: [PATCH] add packages

---
 flake.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 598b6029..2cc1513a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,6 +45,12 @@
       # Define args each module gets access to (access to hosts is useful for DNS/DHCP)
       specialArgs = { inherit hosts flat_hosts inputs; };
       pkgs = serokell-nix.lib.pkgsWith nixpkgs.legacyPackages.${system} [ vault-secrets.overlay ];
+
+      # Script to apply local colmena deployments
+      apply-local = pkgs.writeScriptBin "apply-local" ''
+        #!${pkgs.stdenv.shell}
+        "${colmena.packages.x86_64-linux.colmena}"/bin/colmena apply-local --sudo --node "$(cat /proc/sys/kernel/hostname).$(cat /proc/sys/kernel/domainname)"
+      '';
     in
     {
       # Make the nixosConfigurations, mostly for vault-secrets
@@ -66,18 +72,16 @@
         }
         nixHosts;
 
+      packages.x86_64-linux.default = colmena.packages.x86_64-linux.colmena;
+      packages.x86_64-linux.apply-local = apply-local;
+
       # Use by running `nix develop`
       devShells.${system}.default = pkgs.mkShell {
         VAULT_ADDR = "http://vault.olympus:8200/";
         # This only support bash so just execute zsh in bash as a workaround :/
         shellHook = "zsh; exit $?";
-        buildInputs = with pkgs; let
-          apply-local = pkgs.writeScriptBin "apply-local" ''
-            #!${pkgs.stdenv.shell}
-            "${colmena.packages.x86_64-linux.colmena}"/bin/colmena apply-local --sudo --node "$(cat /proc/sys/kernel/hostname).$(cat /proc/sys/kernel/domainname)"
-          '';
-        in
-        [
+        buildInputs = with pkgs; [
+          apply-local
           colmena.packages.x86_64-linux.colmena
           fluxcd
           k9s