refactor: use trusted-substituters from flake.nix

flake.lock

@@ -52,11 +52,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688307440,
+        "lastModified": 1688898859,
-        "narHash": "sha256-7PTjbN+/+b799YN7Tk2SS5Vh8A0L3gBo8hmB7Y0VXug=",
+        "narHash": "sha256-NjvwXnMp8oMQ86FHVhzlmgGy2dVDMGVLpZ4+YVsJgMU=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "b06bab83bdf285ea0ae3c8e145a081eb95959047",
+        "rev": "66a3047fa88eb6aa5c5a2e675de91f0431fbe561",
         "type": "github"
       },
       "original": {
@@ -97,6 +97,22 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -176,11 +192,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688731042,
+        "lastModified": 1688892808,
-        "narHash": "sha256-D1p/LLP1SpDYjutt9W+O5Ek+XGdszsjYjvL30ad++OY=",
+        "narHash": "sha256-AeWzyG37EqyHH2C1GmrV9y0ZQ4e7rAs9AUOnw8I4YUI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "34db2f05219bcb0e41cc85490e4c338e2405546c",
+        "rev": "b70db52ff06f30e3de7f21b6ea47e75baa0c46f6",
         "type": "github"
       },
       "original": {
@@ -189,18 +205,41 @@
         "type": "github"
       }
     },
+    "icat": {
+      "inputs": {
+        "nixpkgs": [
+          "nekowinston-nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688930064,
+        "narHash": "sha256-9HeztRRQyfFJPYUW/3Ryi0leFMcTUsT9P1aofc/A/VA=",
+        "owner": "nekowinston",
+        "repo": "icat",
+        "rev": "3a266a28051e6cd9bdb844becf79862a73da1c73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nekowinston",
+        "repo": "icat",
+        "type": "github"
+      }
+    },
     "nekowinston-nur": {
       "inputs": {
         "crane": "crane",
+        "flake-compat": "flake-compat_3",
+        "icat": "icat",
         "nixpkgs": "nixpkgs",
         "wezterm-src": "wezterm-src"
       },
       "locked": {
-        "lastModified": 1688713547,
+        "lastModified": 1688930381,
-        "narHash": "sha256-E0T1QWBk9rDu30YeLORm1QV0/dP7s8aV7IDiu/DSAQ8=",
+        "narHash": "sha256-CUPFEXJXqTnwgYW0Y1o6YWaGNl3XSVT11mRp30ygoRo=",
         "owner": "nekowinston",
         "repo": "nur",
-        "rev": "1ad3f020c8e980e2cf33b894ddc84a5091f6c725",
+        "rev": "5f80d5123eb33e369d83bcafa99ddffd6263efbc",
         "type": "github"
       },
       "original": {
@@ -216,11 +255,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688680913,
+        "lastModified": 1688874465,
-        "narHash": "sha256-jo/RDXXL7Zx6M36m0f0F+tQPJRzs31Y7gaDiTqqh4Ns=",
+        "narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "44337c30729a3616c7a71d485af70d231b29675a",
+        "rev": "757114749d4613cf71f3748e780a1be8a67a5d3c",
         "type": "github"
       },
       "original": {
@@ -257,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688646010,
+        "lastModified": 1688894907,
-        "narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=",
+        "narHash": "sha256-U7hEDDhzAhLp6T+DEUbfwAsL+BtqFFGn+S1pa/0XrZY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5daaa32204e9c46b05cd709218b7ba733d07e80c",
+        "rev": "4ddf98349c793377c76806ebfbdfb2b96dd4ef5d",
         "type": "github"
       },
       "original": {
@@ -459,11 +498,11 @@
     "wezterm-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1688677653,
+        "lastModified": 1688913516,
-        "narHash": "sha256-mCChFHIQc7EXZPd8VwbwYBTJcGTq5yWfmo0FGmO9pE0=",
+        "narHash": "sha256-jyg+DeDLhC8Zcrv9c2qNr4ZB+tb4I3nLD3y2vacn6NQ=",
         "ref": "refs/heads/main",
-        "rev": "18e4b9bad14743c96f53ce59b92a5a4bedf506ec",
+        "rev": "1bfaf8522af70a40011bc9356382d8f73b78df96",
-        "revCount": 7277,
+        "revCount": 7279,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/wez/wezterm"

flake.nix

@@ -116,7 +116,7 @@
     };
 
   nixConfig = {
-    extra-substituters = [
+    extra-trusted-substituters = [
       "https://cache.garnix.io"
       "https://mic92.cachix.org"
       "https://nekowinston.cachix.org"

machines/common/shared/nix.nix

@@ -3,17 +3,14 @@
   nix = {
     gc.automatic = true;
     package = pkgs.nixVersions.nix_2_16;
-    settings = {
+    settings =
-      auto-optimise-store = pkgs.stdenv.isLinux;
+      {
-      experimental-features = [
+        auto-optimise-store = pkgs.stdenv.isLinux;
-        "auto-allocate-uids"
+        experimental-features = ["auto-allocate-uids" "flakes" "nix-command" "repl-flake"];
-        "flakes"
+        trusted-users = ["@staff" "@sudo" "@wheel"];
-        "nix-command"
+        use-xdg-base-directories = true;
-        "repl-flake"
+        warn-dirty = false;
-      ];
+      }
-      tarball-ttl = 604800;
+      // ((import ../../../flake.nix).nixConfig);
-      trusted-users = ["@staff" "@sudo" "@wheel"];
-      warn-dirty = false;
-    };
   };
 }