From 504a26ed12bd86e24f842808cca55f8206ed02e3 Mon Sep 17 00:00:00 2001 From: mat ess Date: Sun, 10 Jul 2022 22:08:44 -0400 Subject: [PATCH] Tweaks --- darwin/bootstrap.nix | 5 +-- flake.lock | 81 ++++++++------------------------------------ home/default.nix | 1 + home/shells.nix | 4 +-- 4 files changed, 21 insertions(+), 70 deletions(-) diff --git a/darwin/bootstrap.nix b/darwin/bootstrap.nix index aae53a3..6394cd6 100644 --- a/darwin/bootstrap.nix +++ b/darwin/bootstrap.nix @@ -5,6 +5,7 @@ nix.binaryCaches = [ "https://cache.nixos.org/" "https://hydra.iohk.io" + "https://cache.iog.io" "https://nix-community.cachix.org" ]; nix.binaryCachePublicKeys = [ @@ -17,8 +18,8 @@ ]; users.nix.configureBuildUsers = true; - nix.buildCores = 1; - nix.maxJobs = 8; + nix.buildCores = 2; + nix.maxJobs = 4; # Enable experimental nix command and flakes # nix.package = pkgs.nixUnstable; diff --git a/flake.lock b/flake.lock index bcc3164..67d7bb3 100644 --- a/flake.lock +++ b/flake.lock @@ -37,29 +37,13 @@ "type": "github" } }, - "flake-compat_2": { - "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" - } - }, "flake-utils": { "locked": { - "lastModified": 1656065134, - "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "owner": "numtide", "repo": "flake-utils", - "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { @@ -70,20 +54,17 @@ }, "home-manager": { "inputs": { - "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs-unstable" ], - "nmd": "nmd", - "nmt": "nmt", "utils": "utils" }, "locked": { - "lastModified": 1656266731, - "narHash": "sha256-yHA/O4VEtjaGFyI7tUD3/eCrrcrRrscwLyPttdd4jgE=", + "lastModified": 1657396086, + "narHash": "sha256-4cQ6hEuewWoFkTBlu211JGxPQQ1Zyli8oEq1cu7cVeA=", "owner": "nix-community", "repo": "home-manager", - "rev": "72a135b093cbf3497a287bd5b1a605dcdcc73b7a", + "rev": "c645cc9f82c7753450d1fa4d1bc73b64960a9d7a", "type": "github" }, "original": { @@ -94,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1656198488, - "narHash": "sha256-xe81o3Kin6a0jXA3mTxcR+jeA1jLKw3TCar5LUo/B5c=", + "lastModified": 1656782578, + "narHash": "sha256-1eMCBEqJplPotTo/SZ/t5HU6Sf2I8qKlZi9MX7jv9fw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46af3303651699dc58cfc251d9b18c0f59d857da", + "rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b", "type": "github" }, "original": { @@ -110,11 +91,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1656270636, - "narHash": "sha256-gMF++Oe2wZmC63/CwoWtTD9d7XgB4jYeCLNIVOOPny0=", + "lastModified": 1657491355, + "narHash": "sha256-VQUKwiEiRMwGc2jVCH10zigyxO3LoCLYwG58y7pXSd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3b81e322917818cd31a58f64596cb583da67664", + "rev": "9130ba39bf9f09b2775aad001b63f323801b6890", "type": "github" }, "original": { @@ -126,11 +107,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1656130826, - "narHash": "sha256-dLqquYHvj6/EYPljULXJVUKcizB/8cbgdIL7aEXTDZY=", + "lastModified": 1657413868, + "narHash": "sha256-qDC9kUZhGhoDtOzhd6kIMUQHRZNys6/xsJAWrJB+gqU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72d1b0d0fac131df1ea254b65413c85609bdd2ee", + "rev": "7802f1b6479d6f04bea5cc94e8290ea61e210ecf", "type": "github" }, "original": { @@ -140,38 +121,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": { "darwin": "darwin", diff --git a/home/default.nix b/home/default.nix index 28fe056..a7b0ce1 100644 --- a/home/default.nix +++ b/home/default.nix @@ -105,6 +105,7 @@ comma # run software from without installing it nixpkgs-fmt nix-prefetch-git + nix-tree # nodePackages.node2nix ] ++ lib.optionals stdenv.isDarwin [ diff --git a/home/shells.nix b/home/shells.nix index 86e55ce..4060fe7 100644 --- a/home/shells.nix +++ b/home/shells.nix @@ -134,8 +134,8 @@ # OG # Nix related - drb = "darwin-rebuild build --flake ${nixConfigDir}/; and rm result"; - drs = "darwin-rebuild switch --flake ${nixConfigDir}/; and rm result"; + drb = "pushd ${nixConfigDir}/; darwin-rebuild build --flake ${nixConfigDir}/; popd"; + drs = "pushd ${nixConfigDir}/; darwin-rebuild switch --flake ${nixConfigDir}/; popd"; drc = "codium ${nixConfigDir}"; drv = "vim ${nixConfigDir}"; cdr = "cd ${nixConfigDir}";