From b089e350c7916a4995334db909aa963831b14ea2 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Wed, 27 Jul 2022 04:27:21 +0200 Subject: [PATCH] Update Flake inputs --- flake.lock | 69 ++++++-------------------------------------- hardware/desktop.nix | 2 +- modules/system.nix | 9 ++++-- 3 files changed, 16 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index aece308..093bf7a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,35 +1,16 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "home-manager": { "inputs": { - "flake-compat": "flake-compat", "nixpkgs": "nixpkgs", - "nmd": "nmd", - "nmt": "nmt", "utils": "utils" }, "locked": { - "lastModified": 1655858799, - "narHash": "sha256-Ws6BKlVuEVO29Ab3OEUfVLbWTECv/5Ax3yOMq/UeY0E=", + "lastModified": 1658751516, + "narHash": "sha256-Y/3dHoTjbvYBtWd+TTBQJUIgDPO9d+Gqt05C5dyR7E4=", "owner": "nix-community", "repo": "home-manager", - "rev": "06bb67ab24bd6e6c6d2bc97ecbcddd6c8b07ac18", + "rev": "dbed4c794d20d51027fc1107f063ec5be027dafc", "type": "github" }, "original": { @@ -40,11 +21,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654230545, - "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", + "lastModified": 1654953433, + "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=", "owner": "nixos", "repo": "nixpkgs", - "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", + "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a", "type": "github" }, "original": { @@ -56,11 +37,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1655807518, - "narHash": "sha256-5YV29Ry/DpAJc/0Hc/+ISVBAjwHpJvAkeKkcUG5lWsc=", + "lastModified": 1658737577, + "narHash": "sha256-xosJ5nJT9HX+b6UWsSX6R+ap4AdZOCrl/r+IKFp2ASQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a72d7811be1162dd6804c4e36e5402d76fb6e921", + "rev": "5a0e0d73b944157328d54c4ded1cf2f0146a86a5", "type": "github" }, "original": { @@ -70,38 +51,6 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1653339422, - "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=", - "owner": "rycee", - "repo": "nmd", - "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmd", - "type": "gitlab" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1648075362, - "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", - "owner": "rycee", - "repo": "nmt", - "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmt", - "type": "gitlab" - } - }, "root": { "inputs": { "home-manager": "home-manager", diff --git a/hardware/desktop.nix b/hardware/desktop.nix index 965cca3..346d805 100644 --- a/hardware/desktop.nix +++ b/hardware/desktop.nix @@ -34,7 +34,7 @@ swapDevices = [{ device = "/dev/disk/by-uuid/f714775c-b5af-4c0c-8330-999b43db4794"; }]; - nix.maxJobs = lib.mkDefault 16; + nix.settings.max-jobs = lib.mkDefault 16; networking.interfaces.enp31s0.useDHCP = true; services.xserver.videoDrivers = [ "amdgpu" ]; diff --git a/modules/system.nix b/modules/system.nix index 5bbc534..e679aa0 100644 --- a/modules/system.nix +++ b/modules/system.nix @@ -3,9 +3,12 @@ nix = { package = pkgs.nixUnstable; - sandboxPaths = [ - "/var/keys/netrc" - ]; + settings = { + extra-sandbox-paths = [ + "/var/keys/netrc" + ]; + }; + extraOptions = '' experimental-features = nix-command flakes '';