aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2024-10-25 00:00:59 -0700
committerMark Nipper <nipsy@bitgnome.net>2024-10-25 00:00:59 -0700
commit85c1f8f3fb98bee656e29125db213e127dbdf0e0 (patch)
tree9170651a39b03e8cfd4500708fe8a9e8d3e40a63
parentb720ebb1ecb354cc9ca3df06ec67e4a8a2c4c9e5 (diff)
downloadnix-85c1f8f3fb98bee656e29125db213e127dbdf0e0.tar
nix-85c1f8f3fb98bee656e29125db213e127dbdf0e0.tar.gz
nix-85c1f8f3fb98bee656e29125db213e127dbdf0e0.tar.bz2
nix-85c1f8f3fb98bee656e29125db213e127dbdf0e0.tar.lz
nix-85c1f8f3fb98bee656e29125db213e127dbdf0e0.tar.xz
nix-85c1f8f3fb98bee656e29125db213e127dbdf0e0.tar.zst
nix-85c1f8f3fb98bee656e29125db213e127dbdf0e0.zip
Add nix build-dir option
-rw-r--r--hosts/common/core/nix.nix17
-rwxr-xr-xscripts/pretty-rebuild4
2 files changed, 5 insertions, 16 deletions
diff --git a/hosts/common/core/nix.nix b/hosts/common/core/nix.nix
index 94be2f6..99aff56 100644
--- a/hosts/common/core/nix.nix
+++ b/hosts/common/core/nix.nix
@@ -1,22 +1,13 @@
-{ inputs, lib, ... }:
-{
-
- # work around very annoying TMPDIR handling
- # see: https://github.com/NixOS/nix/issues/7154
- boot.tmp.useTmpfs = true;
- systemd.services."nix-daemon".environment.TMPDIR = "/nix/tmp";
- systemd.tmpfiles.rules = [
- "d /nix/tmp 770 root nixbld"
- ];
+{ inputs, lib, ... }: {
nix = {
settings = {
- trusted-users = [ "root" "@wheel" ];
-
auto-optimise-store = lib.mkDefault true;
+ build-dir = "/var/tmp";
experimental-features = [ "nix-command" "flakes" ];
- warn-dirty = false;
#flake-registry = ""; # Disable global flake registry This is a hold-over setting from Misterio77. Not sure significance but likely to do with nix.registry entry below.
+ trusted-users = [ "root" "@wheel" ];
+ warn-dirty = false;
};
# Add each flake input as a registry to make nix3 commands consistent with your flake
diff --git a/scripts/pretty-rebuild b/scripts/pretty-rebuild
index 4e30f4a..0814cca 100755
--- a/scripts/pretty-rebuild
+++ b/scripts/pretty-rebuild
@@ -1,11 +1,9 @@
#!/usr/bin/env nix-shell
#!nix-shell -i zsh --packages nvd zsh
-# sudo is used for nixos-rebuild below due to: https://github.com/NixOS/nix/issues/7154
cd /etc/nixos && \
nix flake update && \
- cd && \
- sudo env TMPDIR=/nix/tmp nixos-rebuild switch --upgrade --show-trace && \
+ nixos-rebuild switch --upgrade --show-trace && \
echo && \
nixos-rebuild list-generations | cat && \
echo && \