mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-01-11 20:40:24 +01:00
feat: update flake inputs, fix issues
This commit is contained in:
859
flake.lock
generated
859
flake.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -2,8 +2,6 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
myvars,
|
myvars,
|
||||||
nuenv,
|
nuenv,
|
||||||
nixpkgs,
|
|
||||||
lib,
|
|
||||||
...
|
...
|
||||||
} @ args: {
|
} @ args: {
|
||||||
nixpkgs.overlays =
|
nixpkgs.overlays =
|
||||||
@@ -19,8 +17,7 @@
|
|||||||
|
|
||||||
# auto upgrade nix to the unstable version
|
# auto upgrade nix to the unstable version
|
||||||
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/tools/package-management/nix/default.nix#L284
|
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/tools/package-management/nix/default.nix#L284
|
||||||
# nix.package = pkgs.nixVersions.latest;
|
nix.package = pkgs.nixVersions.latest;
|
||||||
nix.package = pkgs.nixVersions.nix_2_22;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
git # used by nix flakes
|
git # used by nix flakes
|
||||||
@@ -110,14 +107,4 @@
|
|||||||
];
|
];
|
||||||
builders-use-substitutes = true;
|
builders-use-substitutes = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# make `nix run nixpkgs#nixpkgs` use the same nixpkgs as the one used by this flake.
|
|
||||||
nix.registry.nixpkgs.flake = nixpkgs;
|
|
||||||
|
|
||||||
environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}";
|
|
||||||
# make `nix repl '<nixpkgs>'` use the same nixpkgs as the one used by this flake.
|
|
||||||
# discard all the default paths, and only use the one from this flake.
|
|
||||||
nix.nixPath = lib.mkForce ["/etc/nix/inputs"];
|
|
||||||
# https://github.com/NixOS/nix/issues/9574
|
|
||||||
nix.settings.nix-path = lib.mkForce "nixpkgs=/etc/nix/inputs/nixpkgs";
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,4 +24,6 @@
|
|||||||
nix.settings.auto-optimise-store = false;
|
nix.settings.auto-optimise-store = false;
|
||||||
|
|
||||||
nix.gc.automatic = false;
|
nix.gc.automatic = false;
|
||||||
|
|
||||||
|
system.stateVersion = 5;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,5 +55,5 @@ def unset_proxy():
|
|||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
set_proxy()
|
# set_proxy()
|
||||||
# unset_proxy()
|
unset_proxy()
|
||||||
|
|||||||
Reference in New Issue
Block a user