maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Revert "Don‘t use nom by default"

Browse source 
This reverts commit 97c1e6c232.
This commit is contained in:
Malte Brandy 2021-02-21 04:29:56 +01:00
parent 3617b2ec48
commit 6bd90463c0
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home-manager/roles/laptop.nix
View file

@ -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 {

4
lib/update-system.nix
View file

@ -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
'';
}