From 94820a63347edf4270c3bc697f4794220df980fa Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 5 Jul 2021 18:19:43 +0200 Subject: [PATCH] Nom workaround --- home-manager/roles/mode-switching.nix | 4 ++-- lib/update-system.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/roles/mode-switching.nix b/home-manager/roles/mode-switching.nix index 8fd3803d..780eebf6 100644 --- a/home-manager/roles/mode-switching.nix +++ b/home-manager/roles/mode-switching.nix @@ -37,9 +37,9 @@ in say "Building ~/.modes for ${hostName}" nixPath <- myNixPath "${configPath}" setEnv "WITH_SECRETS" "false" - nom_build nixPath (params ++ remoteBuildParams) + nix_build nixPath (params ++ remoteBuildParams) &!> StdOut |> nom setEnv "WITH_SECRETS" "true" - nom_build nixPath params + nix_build nixPath params &!> StdOut |> nom activate_mode ''; quickUpdateMode = pkgs.writeHaskellScript diff --git a/lib/update-system.nix b/lib/update-system.nix index ec20263d..f47f92ab 100644 --- a/lib/update-system.nix +++ b/lib/update-system.nix @@ -12,7 +12,7 @@ in paths <- myNixPath "${configPath}" args <- getArgs setEnv "WITH_SECRETS" "false" - nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args) + nix_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args) &!> StdOut |> nom setEnv "WITH_SECRETS" "true" oldSystem <- readlink "-f" "/run/current-system" |> captureTrim nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom