colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

split nix --flake enabling out of modules/nix.nix into universal

Browse Source
This commit is contained in:
colin
2022-07-06 14:16:09 -07:00
parent 6aa79e9e55
commit 24fa857ee0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/nix.nix
View File

@@ -12,9 +12,9 @@ in
}; };
}; };
config = { config = mkIf cfg.enable {
# use our own binary cache # use our own binary cache
nix.settings = mkIf cfg.enable { nix.settings = {
substituters = [ substituters = [
"https://nixcache.uninsane.org" "https://nixcache.uninsane.org"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
@@ -25,10 +25,5 @@ in
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
}; };
# allow `nix flake ...` command
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
}; };
} }

5
modules/universal/default.nix
View File

@@ -29,5 +29,10 @@
# git claims it should use EDITOR, but it doesn't! # git claims it should use EDITOR, but it doesn't!
GIT_EDITOR = "vim"; GIT_EDITOR = "vim";
}; };
# allow `nix flake ...` command
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
} }