From 5f7c6958bb53dd4130eca1754d97c98a361c6af9 Mon Sep 17 00:00:00 2001
From: Thomas Syms <thomassyms@gmail.com>
Date: Thu, 9 May 2024 09:59:04 -0300
Subject: [PATCH] Fixed devenv not using global cachix

---
 devenv.lock        | 18 +++++++++---------
 devenv.nix         |  4 +++-
 modules/system.nix |  8 ++------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/devenv.lock b/devenv.lock
index 6dfc81d..795b934 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -3,11 +3,11 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1714833004,
+        "lastModified": 1715246369,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "21a278606259134e0ad80c75e862986f93f09ee0",
-        "treeHash": "5d535cbcff02a22ffa44b03d40fd0a355c95f98d",
+        "rev": "8f089ccfdef53f2ea5e0bfabe25dba4769f5390f",
+        "treeHash": "9879f281d3e41405587c97f174a0564ceab94fbb",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714912032,
+        "lastModified": 1715037484,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
-        "treeHash": "d82c91581229b55f4682426a5b497b1595bf353b",
+        "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
+        "treeHash": "30f4b487bd2fc1c8db99ea1223922808967a04b8",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1714782413,
+        "lastModified": 1714971268,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "651b4702e27a388f0f18e1b970534162dec09aff",
-        "treeHash": "e1912709de4e106ed71e84f8b52ed9bbce65cc77",
+        "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c",
+        "treeHash": "20dbb6f37eecbe11d5db5d6f67a6b69caef954f9",
         "type": "github"
       },
       "original": {
diff --git a/devenv.nix b/devenv.nix
index 15672d5..f32b9c2 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -1,8 +1,10 @@
 {pkgs, ...}: {
+  cachix.enable = false;
+
   pre-commit.hooks = {
     alejandra.enable = true;
     deadnix.enable = true;
   };
 
-  packages = with pkgs; [nixpkgs-fmt nixfmt alejandra deadnix nil];
+  packages = with pkgs; [alejandra deadnix nil];
 }
diff --git a/modules/system.nix b/modules/system.nix
index ecb9913..f80377c 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -5,16 +5,12 @@
 }: {
   nix.settings = {
     experimental-features = ["nix-command" "flakes"];
-    substituters = [
+    extra-substituters = [
       "https://nix-community.cachix.org"
     ];
-    trusted-public-keys = [
+    extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
-    trusted-users = [
-      "root"
-      "panotaka"
-    ];
   };
 
   # Enable CUPS to print documents.