From 41ac50c92f334de0758d984dd52fd835c3502ebe Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 20 Jul 2021 18:52:24 +0200 Subject: [PATCH] Revert "Nom workaround" This reverts commit 94820a63347edf4270c3bc697f4794220df980fa. --- 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 800ebc2e..757360a6 100644 --- a/home-manager/roles/mode-switching.nix +++ b/home-manager/roles/mode-switching.nix @@ -38,9 +38,9 @@ in say "Building ~/.modes for ${hostName}" nixPath <- myNixPath "${configPath}" setEnv "WITH_SECRETS" "false" - nix_build nixPath (params ++ remoteBuildParams) &!> StdOut |> nom + nom_build nixPath (params ++ remoteBuildParams) setEnv "WITH_SECRETS" "true" - nix_build nixPath params &!> StdOut |> nom + nom_build nixPath params activate_mode ''; quickUpdateMode = pkgs.writeHaskellScript diff --git a/lib/update-system.nix b/lib/update-system.nix index f47f92ab..ec20263d 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" - nix_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args) &!> StdOut |> nom + nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args) setEnv "WITH_SECRETS" "true" oldSystem <- readlink "-f" "/run/current-system" |> captureTrim nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom