diff --git a/config/base.nix b/config/base.nix index 5924aa5..70d7bb5 100644 --- a/config/base.nix +++ b/config/base.nix @@ -1,26 +1,33 @@ { config, pkgs, lib, ... }: #let - #disko = pkgs.callPackage ../pkgs/disko/package.nix {}; - #disko = "github:nix-community/disko" +# installFiles = pkgs.runCommand "install-files" { +# #inherit (pkgs) coreutils; +# } '' +# mkdir -p $out +# cp -rv ${./initrd-include}/* $out/ +# ''; #in -let - installFiles = pkgs.runCommand "install-files" { - #inherit (pkgs) coreutils; - } '' - mkdir -p $out - cp -rv ${./initrd-include}/* $out/ - ''; -in +## above is the olde installFiles Declaration. { + options.myPackages.installFiles = lib.mkOption { + type = lib.types.package; + }; imports = [ ../quickly.nix ## installer.nix is a system service to run a script on boot ../installer/installer.nix ]; + #_module.args = { inherit installFiles; }; ##uncomment to pass installFiles to modules config = { + myPackages.installFiles = pkgs.runCommand "install-files" "..." { + #inherit (pkgs) coreutils; + } '' + mkdir -p $out + cp -rv ${./initrd-include}/* $out/ + ''; services.getty.autologinUser = "nixos"; security.sudo.wheelNeedsPassword = false; - services.getty.loginProgram = "${installFiles}/bin/install.sh"; + services.getty.loginProgram = "${config.myPackages.installFiles}/bin/install.sh"; users.users.nixos = { isNormalUser = true; password = "password"; @@ -45,7 +52,7 @@ in pkgs.nixos-install-tools pkgs.util-linux pkgs.nettools - installFiles + config.myPackages.installFiles ]; }; diff --git a/installer/installer.nix b/installer/installer.nix index 6f25c24..cf94e55 100644 --- a/installer/installer.nix +++ b/installer/installer.nix @@ -16,7 +16,7 @@ # Your installation commands here if [ ! -f /etc/installation-completed ]; then # Run your installation steps - "${pkgs.installFiles}/bin/install.sh" + "${config.myPackages.installFiles}/bin/install.sh" # Mark as completed touch /etc/installation-completed fi