From 4ef33abd457eacca86b33036428077f03c061b7f Mon Sep 17 00:00:00 2001
From: Richard Mauer <richard@mauer.tech>
Date: Tue, 31 Dec 2024 19:59:16 -0500
Subject: [PATCH] refactored a bit

---
 config/base.nix                     | 1 +
 config/initrd-include/etc/flake.nix | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/base.nix b/config/base.nix
index 6bba75e..3a5a662 100644
--- a/config/base.nix
+++ b/config/base.nix
@@ -49,6 +49,7 @@
        pkgs.nixos-install-tools
        pkgs.util-linux
        pkgs.nettools
+       pkgs.nixos-facter
        config.myPackages.installFiles
     ];
   system.stateVersion = "24.05";
diff --git a/config/initrd-include/etc/flake.nix b/config/initrd-include/etc/flake.nix
index 9015a8d..4fa9ce5 100644
--- a/config/initrd-include/etc/flake.nix
+++ b/config/initrd-include/etc/flake.nix
@@ -2,13 +2,14 @@
   inputs ={
   nixpkgs.url = <nixpkgs>;
   #nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  disko.url = "../../pkgs/disko";
+  disko = <nixpkgs>.disko.nixosModules.disko;
   #disko.inputs.nixpkgs.follows = "nixpkgs";
-  #nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
+  nixos-facter-modules = <nixpkgs>.nixos-facter.nixosmodules.nixos-facter;
   };
   outputs =
     {
       nixpkgs,
+      self,
       disko,
       nixos-facter-modules,
       ...
@@ -16,9 +17,10 @@
     {
   nixosConfigurations.zabbixProxy = nixpkgs.lib.nixosSystem {
     system = "x86_64-linux";
+    specialArgs = {inherit self nixpkgs;};
     # to pass this flake into your configuration (see the example below)
     modules = [
-        disko.nixosModules.disko 
+        #imports = [ nixpkgs.disko.nixosModules.disko nixpkgs.nixos-facter.nixosmodules.nixos-facter ]
         ./disko.nix 
         ./configuration.nix
         ./hardware-configuration.nix