Add flake inputs to closure of systems

dwarfmaster · Sep 4, 2023 · 9e46098 · 9e46098
1 parent 2fb567a
commit 9e46098
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/flake.nix b/flake.nix
@@ -85,7 +85,7 @@
     neovim-nightly,
     nixvim,
     arkenfox,
-  }: let
+  } @ inputs: let
     # All overlays to apply
     overlays =
       self.overlays
@@ -202,6 +202,7 @@
     hosts = import ./hosts {
       inherit self lib;
       inherit overlays modules;
+      inputs = builtins.removeAttrs inputs [ "self" ];
     };
   in {
     packages = eachSupportedSystem (system: let

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -3,14 +3,20 @@
   self,
   overlays,
   modules,
+  inputs,
 }: let
   inherit (lib) types;
   inherit (builtins) attrValues removeAttrs;
 
   host-modules = hostName: let
-    global = {pkgs, ...}: {
+    global = {pkgs, lib, ...}: {
       profiles.core.enable = lib.mkDefault true;
 
+      # Add flake inputs to system closure to prevent garbage collection
+      environment.etc."flake-inputs".text =
+        lib.concatStringsSep "\n"
+          (lib.mapAttrsToList (k: v: "${k} -> ${v}") inputs);
+
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.sharedModules =