gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

update, patch nix, reformat

Browse source
This commit is contained in:
Gerg-L 2024-02-14 19:20:35 -05:00
parent 15529d185d
commit 1dfe51881d
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
9 changed files with 130 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/nix.nix
View file

@ -1,5 +1,10 @@
inputs:
{ lib, config, ... }:
{
lib,
config,
pkgs,
...
}:
{
#
# Flake registry and $NIX_PATH pinning
@ -10,13 +15,10 @@ inputs:
(x: x // { nixpkgs.flake = inputs.unstable; })
];
environment.etc =
lib.mapAttrs'
(name: value: {
name = "nix/path/${name}";
value.source = value.flake;
})
config.nix.registry;
environment.etc = lib.mapAttrs' (name: value: {
name = "nix/path/${name}";
value.source = value.flake;
}) config.nix.registry;
nix.nixPath = [ "/etc/nix/path" ];
#
# Ignore global registry
@ -25,7 +27,14 @@ inputs:
#
# Use nix directly from master
#
nix.package = inputs.nix.packages.default;
nix.package = inputs.nix.packages.default.overrideAttrs (old: {
patches = old.patches or [ ] ++ [
(pkgs.fetchpatch {
url = "https://github.com/NixOS/nix/commit/b6ae3be9c6ec4e9de55479188e76fc330b2304dd.patch";
hash = "sha256-VyIywGo1ie059wXmGWx+bNeHz9lNk6nlkJ/Qgd1kmzw=";
})
];
});
#
# Other nix settings
#
@ -56,6 +65,10 @@ inputs:
allowed-users = [ "@wheel" ];
use-xdg-base-directories = true;
auto-allocate-uids = true;
#
# A option for the custom patch
#
reject-flake-config = true;
};
#_file
}