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

Migrate to nom-build

Browse source
This commit is contained in:
Malte Brandy 2021-03-03 18:30:02 +01:00
parent 4fdf6476aa
commit 8524db6577
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,9 +37,9 @@ in {
say "Building ~/.modes for apollo"
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
home-manager/roles/zsh/zshrc
View file

@ -9,7 +9,7 @@ mkdir -p /var/run/user/$UID/tmp/downloads
setopt prompt_subst
autoload -U colors && colors # Enable colors in prompt
alias nix-build-remote="nix-build --builders '@/etc/nix/machines' --max-jobs 0"
alias nom-build-remote="nom-build --builders '@/etc/nix/machines' --max-jobs 0"
alias nixpkgs-review-pr-remote='nixpkgs-review pr --build-args "--builders @/etc/nix/machines --max-jobs 0"'
alias nixpkgs-review-rev-remote='nixpkgs-review rev --build-args "--builders @/etc/nix/machines --max-jobs 0"'
alias cat=bat

2
lib/update-system.nix
View file

@ -9,7 +9,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"
nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom
'';

6
nix/sources.json
View file

@ -93,10 +93,10 @@
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e9f8cddbcd2167cf8eecb7ee6637d1e078018b4f",
"sha256": "0cmgzih3qgh9zkwzqznbljhglr767b41psjjhyk4a8nva4sc59sq",
"rev": "a2b0ea6865b2346ceb015259c76e111dcca039c5",
"sha256": "12dgwajv3w94p13scj68c24v01p055k9hcpcsn7w9i8fys72s99d",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9f8cddbcd2167cf8eecb7ee6637d1e078018b4f.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/a2b0ea6865b2346ceb015259c76e111dcca039c5.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"obelisk": {