Compare commits

...

3 Commits

Author SHA1 Message Date
773b4309e3 remove module args again 2025-01-01 20:05:19 -05:00
2dc1cf664e try try try again 2025-01-01 20:04:34 -05:00
f6accc8faf adjust import inherits 2025-01-01 20:00:27 -05:00
2 changed files with 19 additions and 17 deletions

View File

@@ -1,30 +1,32 @@
{ config, pkgs ? import <nixpkgs>, lib, ... }: { config, pkgs ? import <nixpkgs>, lib, ... }:
let #let
installFiles = pkgs.runCommand "installFiles" {} '' # installFiles = pkgs.runCommand "installFiles" {} ''
mkdir -p $out # mkdir -p $out
cp -rv ${./initrd-include}/* $out/ # cp -rv ${./initrd-include}/* $out/
chmod +x -R $out/bin/ # chmod +x -R $out/bin/
''; # '';
in { #in
{
imports = [ imports = [
../quickly.nix ../quickly.nix
#(../installer/installer.nix { inherit customPkgs; inherit config; inherit pkgs; inherit lib; })
../installer/installer.nix ../installer/installer.nix
]; ];
# _module.args = { # _module.args = {
# installFiles = config.installFiles; # installFiles = config.customPkgs.installFiles;
# }; # };
options.installFiles = lib.mkOption { options.customPkgs.installFiles = lib.mkOption {
type = lib.types.package; type = lib.types.package;
}; };
config = { config = {
#customPkgs.installFiles = pkgs.runCommand "installFiles" {} '' customPkgs.installFiles = pkgs.runCommand "installFiles" {} ''
# mkdir -p $out mkdir -p $out
# cp -rv ${./initrd-include}/* $out/ cp -rv ${./initrd-include}/* $out/
# chmod +x -R $out/bin/ chmod +x -R $out/bin/
#''; '';
services.getty.autologinUser = "nixos"; services.getty.autologinUser = "nixos";
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
@@ -52,7 +54,7 @@ in {
pkgs.util-linux pkgs.util-linux
pkgs.nettools pkgs.nettools
pkgs.nixos-facter pkgs.nixos-facter
config.installFiles config.customPkgs.installFiles
]; ];
system.autoUpgrade.channel = "https://nixos.org/channels/nixos-24.11/"; system.autoUpgrade.channel = "https://nixos.org/channels/nixos-24.11/";

View File

@@ -1,4 +1,4 @@
{ pkgs, config, lib, installFiles, ... }: { pkgs, config, lib, ... }:
{ {
config = { config = {
systemd.services.custom-install = { systemd.services.custom-install = {
@@ -17,7 +17,7 @@
script = '' script = ''
mkdir /home/nixos/installer mkdir /home/nixos/installer
cp -R ${installFiles}/ /home/nixos/installer cp -R ${config.customPkgs.installFiles}/ /home/nixos/installer
ln -s /home/nixos/installer/bin/installer.sh /home/nixos/installer.sh ln -s /home/nixos/installer/bin/installer.sh /home/nixos/installer.sh
echo "Installer files are available in /home/nixos/installer" echo "Installer files are available in /home/nixos/installer"
echo "The installer.sh script is available in directly in /home/nixos/installer.sh" echo "The installer.sh script is available in directly in /home/nixos/installer.sh"