mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-12-21 19:24:15 +00:00
remove NIX_PATH settings
This commit is contained in:
parent
41e7f72e29
commit
3dc4079d86
3 changed files with 7 additions and 28 deletions
20
flake.nix
20
flake.nix
|
@ -14,20 +14,6 @@
|
|||
|
||||
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
|
||||
{
|
||||
formatter = forAllSystems (system:
|
||||
|
@ -47,9 +33,13 @@
|
|||
|
||||
nixosModules =
|
||||
{
|
||||
inherit pins;
|
||||
inherit (impermanence.nixosModules) impermanence;
|
||||
pkgs.nixpkgs.overlays = [ (_: mypkgs) ];
|
||||
pins.nix.registry.bck.to = {
|
||||
owner = "buckley310";
|
||||
repo = "nixos-config";
|
||||
type = "github";
|
||||
};
|
||||
} //
|
||||
self.lib.dirToAttrs ./modules import;
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
networking.usePredictableInterfaceNames = lib.mkDefault false;
|
||||
|
||||
nix = {
|
||||
nixPath = [ ];
|
||||
nixPath = [ "nixpkgs=flake:nixpkgs" ];
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
|
|
|
@ -163,16 +163,5 @@
|
|||
alias day='date "+%Y-%m-%d"'
|
||||
alias grep='grep --color=auto'
|
||||
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"
|
||||
];
|
||||
'';
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue