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

Revert "Nom workaround"

Browse source 
This reverts commit 94820a6334.
This commit is contained in:
Malte Brandy 2021-07-20 18:52:24 +02:00
parent 89201cb537
commit 41ac50c92f
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home-manager/roles/mode-switching.nix
View file

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

2
lib/update-system.nix
View file

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