From 97c1e6c232140c5bb677b8be166936bd6b4f250c Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 6 Jan 2021 00:59:11 +0100 Subject: [PATCH] =?UTF-8?q?Don=E2=80=98t=20use=20nom=20by=20default?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 3930e607..619468e4 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) &!> StdOut |> nom + nix_build nixPath (params ++ remoteBuildParams) 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}|]]) &!> StdOut |> nom + home_manager (nixPath <> ["switch", "-A", [i|apollo-#{mode}|]]) update_modes ''; selectMode = pkgs.writeHaskellScript { diff --git a/lib/update-system.nix b/lib/update-system.nix index 3a1d2b45..1c062253 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) &!> StdOut |> nom + nix_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args) setEnv "WITH_SECRETS" "true" - nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom + nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) ''; }