mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-28 02:37:09 +00:00
Code Activity

change default nix.nixPath to work for single user installs

Browse source
This commit is contained in:
Daiderd Jordan 2016-12-15 14:37:31 +01:00
parent 5949d2ed5d
commit 3e4583ee9a
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/examples/lnl.nix
View file

@ -58,13 +58,9 @@
programs.zsh.enable = true;
programs.zsh.shellInit = ''
export NIX_PATH=nixpkgs=$HOME/.nix-defexpr/nixpkgs:darwin=$HOME/.nix-defexpr/darwin:darwin-config=$HOME/.nixpkgs/darwin-config.nix:$HOME/.nix-defexpr/channels_root
# Set up secure multi-user builds: non-root users build through the
# Nix daemon.
if [ "$USER" != root -a ! -w /nix/var/nix/db ]; then
export NIX_REMOTE=daemon
fi
cfg=$HOME/.nixpkgs/darwin-config.nix
darwin=$HOME/.nix-defexpr/darwin
pkgs=$HOME/.nix-defexpr/nixpkgs
'';
programs.zsh.loginShellInit = ''
@ -98,10 +94,6 @@
;;
esac
}
cfg=$HOME/.nixpkgs/darwin-config.nix
darwin=$HOME/.nix-defexpr/darwin
pkgs=$HOME/.nix-defexpr/nixpkgs
'';
programs.zsh.interactiveShellInit = ''
@ -125,6 +117,16 @@
environment.shellAliases.gl = "git log --graph --oneline";
environment.shellAliases.gd = "git diff --minimal --patch";
nix.distributedBuilds = true;
nix.nixPath =
[ # Use local nixpkgs checkout instead of channels.
"darwin=$HOME/.nix-defexpr/darwin"
"darwin-config=$HOME/.nixpkgs/darwin-configuration.nix"
"nixpkgs=$HOME/.nix-defexpr/nixpkgs"
"/nix/var/nix/profiles/per-user/root/channels"
];
nixpkgs.config.allowUnfree = true;
nixpkgs.config.packageOverrides = self: {

5
modules/nix/default.nix
View file

@ -284,10 +284,11 @@ in
nixPath = mkOption {
type = types.listOf types.str;
default =
[ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixpkgs"
"/nix/var/nix/profiles/per-user/root/channels"
[ # Incldue default paths for <darwin> and <darwin-config>.
"darwin=$HOME/.nix-defexpr/darwin"
"darwin-config=$HOME/.nixpkgs/darwin-configuration.nix"
"nixpkgs=$HOME/.nix-defexpr/channels/nixpkgs"
"$HOME/.nix-defexpr/channels"
];
description = ''
The default Nix expression search path, used by the Nix