From 6bd90463c0640b78846ddb35e19bf5674825dd4f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 21 Feb 2021 04:29:56 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"Don=E2=80=98t=20use=20nom=20by=20defa?= =?UTF-8?q?ult"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 97c1e6c232140c5bb677b8be166936bd6b4f250c. --- home-manager/roles/laptop.nix | 4 ++-- lib/update-system.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/roles/laptop.nix b/home-manager/roles/laptop.nix index bdf316e1..34b8f620 100644 --- a/home-manager/roles/laptop.nix +++ b/home-manager/roles/laptop.nix @@ -37,7 +37,7 @@ in { say "Building ~/.modes for apollo" nixPath <- myNixPath "${configPath}" setEnv "WITH_SECRETS" "false" - nix_build nixPath (params ++ remoteBuildParams) + nix_build nixPath (params ++ remoteBuildParams) &!> StdOut |> nom setEnv "WITH_SECRETS" "true" nix_build nixPath params activate_mode @@ -53,7 +53,7 @@ in { nixPath <- myNixPath "${configPath}" mode <- getMode say [i|Quick switching to mode #{mode} ...|] - home_manager (nixPath <> ["switch", "-A", [i|apollo-#{mode}|]]) + home_manager (nixPath <> ["switch", "-A", [i|apollo-#{mode}|]]) &!> StdOut |> nom update_modes ''; selectMode = pkgs.writeHaskellScript { diff --git a/lib/update-system.nix b/lib/update-system.nix index 1c062253..3a1d2b45 100644 --- a/lib/update-system.nix +++ b/lib/update-system.nix @@ -9,8 +9,8 @@ in { paths <- myNixPath "${configPath}" args <- getArgs setEnv "WITH_SECRETS" "false" - nix_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" - nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) + nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom ''; }