From db18304fb6375aa70fcc1018deb6a9a8d8e4e612 Mon Sep 17 00:00:00 2001 From: Bernardo Magri Date: Fri, 10 Apr 2026 19:52:01 +0100 Subject: [PATCH] fix(install): fix syntax errors, module references and branding in install script --- install.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/install.sh b/install.sh index f94f1ff..52ee190 100644 --- a/install.sh +++ b/install.sh @@ -38,10 +38,10 @@ cat < "$LOCAL_DIR/flake.nix" }; # 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 system = "x86_64-linux"; targetUser = "$USERNAME"; @@ -49,7 +49,7 @@ cat < "$LOCAL_DIR/flake.nix" # THE SYSTEM DOMAIN nixosConfigurations."$HOSTNAME" = nixpkgs.lib.nixosSystem { inherit system; - specialArgs = { inherit inputs; }; + specialArgs = { inputs = nomarchy.inputs // inputs; }; modules = [ ./system/hardware-configuration.nix ./system/configuration.nix @@ -60,9 +60,9 @@ cat < "$LOCAL_DIR/flake.nix" # THE USER DOMAIN homeConfigurations."$USERNAME" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages."\${system}"; - extraSpecialArgs = { inherit inputs targetUser; }; + extraSpecialArgs = { inputs = nomarchy.inputs // inputs; inherit targetUser; }; modules = [ - nomarchy.homeManagerModules.ui + nomarchy.nixosModules.home ./home/home.nix ]; }; @@ -103,7 +103,7 @@ clear $NIX_RUN style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Ready for Genesis" 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..." 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 $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 echo "Aborted. You can review your files in $LOCAL_DIR and run the build manually later." fi \ No newline at end of file