diff --git a/flake.lock b/flake.lock index 690bc4e..a2167f3 100644 --- a/flake.lock +++ b/flake.lock @@ -63,6 +63,70 @@ "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-darwin": [ + "determinate", + "determinate-nixd-aarch64-darwin" + ], + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751571582, + "narHash": "sha256-px4+H0VI5H+kzHgfoyAD0haTNiAXhiVgXqCAgAjT16A=", + "owner": "determinatesystems", + "repo": "determinate", + "rev": "e3f21c62aee2ccd25811be574c09e1de8a57a687", + "type": "github" + }, + "original": { + "owner": "determinatesystems", + "repo": "determinate", + "type": "github" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-+O3K2pZRWkbL0DEh5HyV0+pyAkRmJ0z6NjYTvetrTtk=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-r8BSSNXss3EoCUV4gYJwAS18OO7fceWXCL2SPLwls50=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-hSauxThw5pfDiiqdVeFv3QeL4e3DRI09hFYuGhTKQWU=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/x86_64-linux" + } + }, "flake-compat": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 8b16869..7b00dba 100644 --- a/flake.nix +++ b/flake.nix @@ -92,6 +92,10 @@ zedless = { url = "github:zedless-editor/zed"; + # DetNix is doing too well these days not to use it... + determinate = { + url = "github:determinatesystems/determinate"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; } diff --git a/modules/system/nix/module.nix b/modules/system/nix/module.nix index 925d18a..7c639af 100644 --- a/modules/system/nix/module.nix +++ b/modules/system/nix/module.nix @@ -12,11 +12,15 @@ in { imports = [ ./documentation.nix # nixos documentation ./nixpkgs.nix # global nixpkgs configuration - inputs.lix-module.nixosModules.default + inputs.determinate.nixosModules.default ]; nix = { - # package = pkgs.lix; + # Check that Nix can parse the generated nix.conf. + checkConfig = true; + + # Check the nix.conf, parsing for any kind of error. When disabled, checks only for unknown settings. + checkAllErrors = true; # fuck channels, no thanks channel.enable = mkForce false; @@ -63,10 +67,10 @@ in { # Automatically optimise symlinks auto-optimise-store = true; - # Allow sudo users to mark the following values as trusted + # Users that are allowed to connect to the Nix daemon. allowed-users = ["root" "@wheel" "nix-builder"]; - # Only allow sudo users to manage the nix store + # Users that are allowed to connect to the Nix daemon. trusted-users = ["root" "@wheel" "nix-builder"]; # Let the system decide the number of max jobs @@ -108,7 +112,7 @@ in { "flakes" # flakes "nix-command" # experimental nix commands "cgroups" # allow nix to execute builds inside cgroups - "pipe-operator" + "pipe-operators" ]; # Ensures that the result of Nix expressions is fully determined by @@ -148,13 +152,15 @@ in { # Substituters to pull from. substituters = [ "https://cache.nixos.org" - "https://cache.privatevoid.net" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" ]; + # Determinate nix config + # =========================================== + lazy-trees = true; + # =========================================== }; };