remove NIX_PATH settings

This commit is contained in:
Sean Buckley 2024-06-09 23:28:59 -04:00
parent 41e7f72e29
commit 3dc4079d86
3 changed files with 7 additions and 28 deletions

View file

@ -14,20 +14,6 @@
forAllSystems = lib.genAttrs [ "x86_64-linux" ]; forAllSystems = lib.genAttrs [ "x86_64-linux" ];
pins = {
nix.registry.nixpkgs.to = {
inherit (nixpkgs) rev;
owner = "NixOS";
repo = "nixpkgs";
type = "github";
};
nix.registry.bck.to = {
owner = "buckley310";
repo = "nixos-config";
type = "github";
};
};
in in
{ {
formatter = forAllSystems (system: formatter = forAllSystems (system:
@ -47,9 +33,13 @@
nixosModules = nixosModules =
{ {
inherit pins;
inherit (impermanence.nixosModules) impermanence; inherit (impermanence.nixosModules) impermanence;
pkgs.nixpkgs.overlays = [ (_: mypkgs) ]; pkgs.nixpkgs.overlays = [ (_: mypkgs) ];
pins.nix.registry.bck.to = {
owner = "buckley310";
repo = "nixos-config";
type = "github";
};
} // } //
self.lib.dirToAttrs ./modules import; self.lib.dirToAttrs ./modules import;

View file

@ -38,7 +38,7 @@
networking.usePredictableInterfaceNames = lib.mkDefault false; networking.usePredictableInterfaceNames = lib.mkDefault false;
nix = { nix = {
nixPath = [ ]; nixPath = [ "nixpkgs=flake:nixpkgs" ];
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';

View file

@ -163,16 +163,5 @@
alias day='date "+%Y-%m-%d"' alias day='date "+%Y-%m-%d"'
alias grep='grep --color=auto' alias grep='grep --color=auto'
alias tmp='cd "$(mktemp -d)"' alias tmp='cd "$(mktemp -d)"'
'' + '';
# compatibility for programs that need $NIX_PATH set:
lib.concatMapStrings
(x: ''
alias ${x}='NIX_PATH="nixpkgs=$(nix eval nixpkgs#path)" ${x}'
'')
[
"nix-build"
"nix-index"
"nix-prefetch-github"
"nix-shell"
];
} }