From 805e84f73f263e4fcf3083c25d9c74b3c03fa404 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 29 Mar 2022 00:01:14 +0200
Subject: [PATCH] add hacks

---
 flake.nix        | 6 +++++-
 modules/c3d2.nix | 6 ++++--
 modules/nncp.nix | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6d333e35..bd4a1352 100644
--- a/flake.nix
+++ b/flake.nix
@@ -223,7 +223,11 @@
                 _module.args = extraArgs // {
                   inherit hostRegistry inputs zentralwerk;
                 };
-                nixpkgs.overlays = [ self.overlay ];
+                nixpkgs = {
+                  overlays = [ self.overlay ];
+                  # hack that needed to be added 2022-03-2x
+                  pkgs = nixpkgs.legacyPackages.${system};
+                };
               })
 
               self.nixosModules.c3d2
diff --git a/modules/c3d2.nix b/modules/c3d2.nix
index 7ac19045..97c3e123 100644
--- a/modules/c3d2.nix
+++ b/modules/c3d2.nix
@@ -1,6 +1,6 @@
 # This module defines options for use by all C3D2 machines.
 
-{ config, lib, pkgs, ... }:
+{ options, config, lib, pkgs, ... }:
 
 let
   cfg = config.c3d2;
@@ -171,7 +171,9 @@ in
             (lib.attrsets.filterAttrs (n: v: v.ip6 != null) cfg.hosts)
         ));
 
-      programs.nncp.settings = lib.mkIf cfg.mergeNncpSettings cfg.nncp;
+      programs = lib.optionalAttrs (options.programs ? nncp) {
+        nncp.settings = lib.optionalAttrs cfg.mergeNncpSettings cfg.nncp;
+      };
 
       users.motd = lib.mkIf cfg.enableMotd (builtins.readFile ./motd);
 
diff --git a/modules/nncp.nix b/modules/nncp.nix
index fd6037eb..e518432e 100644
--- a/modules/nncp.nix
+++ b/modules/nncp.nix
@@ -3,7 +3,7 @@ with lib;
 
 let
   nncpCfgFile = "/run/nncp.hjson";
-  programCfg = config.programs.nncp;
+  programCfg = lib.optionalAttrs (config.programs ? nncp) config.programs.nncp;
   callerCfg = config.services.nncp.caller;
   daemonCfg = config.services.nncp.daemon;
   settingsFormat = pkgs.formats.json { };