Compare commits

..

No commits in common. "2dc1cf664e5af12fd2a72f6100fdadb4f52e4c22" and "4ee3d6814896f4cdaabd4d38439ebef6bd5812c2" have entirely different histories.

2 changed files with 19 additions and 21 deletions

View File

@ -1,32 +1,30 @@
{ 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.customPkgs.installFiles; # installFiles = config.installFiles;
}; # };
options.customPkgs.installFiles = lib.mkOption { options.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;
@ -54,7 +52,7 @@
pkgs.util-linux pkgs.util-linux
pkgs.nettools pkgs.nettools
pkgs.nixos-facter pkgs.nixos-facter
config.customPkgs.installFiles config.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, ... }: { pkgs, config, lib, installFiles, ... }:
{ {
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 ${config.customPkgs.installFiles}/ /home/nixos/installer cp -R ${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"