fix(install): fix syntax errors, module references and branding in install script

This commit is contained in:
Bernardo Magri
2026-04-10 19:52:01 +01:00
parent 57580dbdb0
commit db18304fb6

View File

@@ -38,10 +38,10 @@ cat <<EOF > "$LOCAL_DIR/flake.nix"
}; };
# The Public Upstream Core # The Public Upstream Core
nomarchy.url = \"git+https://git.bemagri.xyz/bernardo/Nomarchy.git\ nomarchy.url = "git+https://git.bemagri.xyz/bernardo/Nomarchy.git";
}; };
outputs = { self, nixpkgs, home-manager, witness-os, ... }@inputs: outputs = { self, nixpkgs, home-manager, nomarchy, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
targetUser = "$USERNAME"; targetUser = "$USERNAME";
@@ -49,7 +49,7 @@ cat <<EOF > "$LOCAL_DIR/flake.nix"
# THE SYSTEM DOMAIN # THE SYSTEM DOMAIN
nixosConfigurations."$HOSTNAME" = nixpkgs.lib.nixosSystem { nixosConfigurations."$HOSTNAME" = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit inputs; }; specialArgs = { inputs = nomarchy.inputs // inputs; };
modules = [ modules = [
./system/hardware-configuration.nix ./system/hardware-configuration.nix
./system/configuration.nix ./system/configuration.nix
@@ -60,9 +60,9 @@ cat <<EOF > "$LOCAL_DIR/flake.nix"
# THE USER DOMAIN # THE USER DOMAIN
homeConfigurations."$USERNAME" = home-manager.lib.homeManagerConfiguration { homeConfigurations."$USERNAME" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages."\${system}"; pkgs = nixpkgs.legacyPackages."\${system}";
extraSpecialArgs = { inherit inputs targetUser; }; extraSpecialArgs = { inputs = nomarchy.inputs // inputs; inherit targetUser; };
modules = [ modules = [
nomarchy.homeManagerModules.ui nomarchy.nixosModules.home
./home/home.nix ./home/home.nix
]; ];
}; };
@@ -103,7 +103,7 @@ clear
$NIX_RUN style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Ready for Genesis" $NIX_RUN style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Ready for Genesis"
echo "Your private downstream configuration has been generated." echo "Your private downstream configuration has been generated."
if $NIX_RUN confirm "Build Witness OS now? (This will take a few minutes)"; then if $NIX_RUN confirm "Build Nomarchy OS now? (This will take a few minutes)"; then
echo "Building System Engine..." echo "Building System Engine..."
sudo nixos-rebuild switch --flake "$LOCAL_DIR#$HOSTNAME" --extra-experimental-features "nix-command flakes" sudo nixos-rebuild switch --flake "$LOCAL_DIR#$HOSTNAME" --extra-experimental-features "nix-command flakes"
@@ -112,7 +112,7 @@ if $NIX_RUN confirm "Build Witness OS now? (This will take a few minutes)"; then
clear clear
$NIX_RUN style --border double --margin "1" --padding "1 2" --border-foreground 212 "Installation Complete" $NIX_RUN style --border double --margin "1" --padding "1 2" --border-foreground 212 "Installation Complete"
echo "Welcome to Witness OS. Reboot to enter your new environment." echo "Welcome to Nomarchy OS. Reboot to enter your new environment."
else else
echo "Aborted. You can review your files in $LOCAL_DIR and run the build manually later." echo "Aborted. You can review your files in $LOCAL_DIR and run the build manually later."
fi fi