From 33dff4df078cafff3d2abe6a5265bab5ccc7a337 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 20 Apr 2023 20:13:06 +0200
Subject: [PATCH] refactoring

---
 hosts/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/hosts/default.nix b/hosts/default.nix
index cbf7a67..30c5a10 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -58,12 +58,7 @@
               check = lib.isFunction;
               merge = lib.mergeOneOption;
             });
-            default = with inputs; [
-              agenix.overlays.default
-              comma.overlays.default
-              nur.overlay
-              nil.overlays.default # FIXME This shouldn't be here
-            ];
+            default = [];
           };
           extraModules = lib.mkOption {
             description = "Extra NixOS modules";
@@ -81,6 +76,11 @@
             default = "ccr";
           };
         };
+        config.overlays = with inputs; [
+          agenix.overlays.default
+          comma.overlays.default
+          nur.overlay
+        ];
       }));
       default = {};
     };
@@ -165,6 +165,7 @@
           ccrEmacs.hmModules.default
           hyprland.homeManagerModules.default
         ];
+        overlays = [inputs.nil.overlays.default];
         secrets = {
           "thinkpad-wireguard-private-key" = {};
           "cachix-personal-token".owner = "ccr";
@@ -209,6 +210,7 @@
             ];
           }
         ];
+        overlays = [inputs.nil.overlays.default];
         secrets = {
           "mothership-wireguard-private-key" = {};
           "cachix-personal-token".owner = "ccr";