Enable nixConfig, add cachix to all host machines (#17)

ethnt · Dec 21, 2023 · c8bc9db · c8bc9db
1 parent c3aa0be
commit c8bc9db
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,20 +1,21 @@
 {
   description = "e10";
 
-  # nixConfig = {
-  #   extra-substituters = [
-  #     "https://nix-community.cachix.org"
-  #     "https://e10.cachix.org"
-  #     "https://numtide.cachix.org"
-  #     "https://attic.e10.camp"
-  #   ];
-  #   extra-trusted-public-keys = [
-  #     "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-  #     "e10.cachix.org-1:/++Tmo/ghEqnLwsQJdXn04c262agRCK5PaPYz8NcVfo="
-  #     "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
-  #     "attic.e10.camp-e10:GRxL2EezM+0vZXpa9fePFqTM1qstxiV56tc5K3eDugk="
-  #   ];
-  # };
+  nixConfig = {
+    extra-substituters = [
+      "https://nix-community.cachix.org"
+      "https://e10.cachix.org"
+      "https://numtide.cachix.org"
+      "https://attic.e10.camp/e10"
+    ];
+
+    extra-trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "e10.cachix.org-1:/++Tmo/ghEqnLwsQJdXn04c262agRCK5PaPYz8NcVfo="
+      "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
+      "attic.e10.camp-e10:GRxL2EezM+0vZXpa9fePFqTM1qstxiV56tc5K3eDugk="
+    ];
+  };
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

diff --git a/modules/development/shell.nix b/modules/development/shell.nix
@@ -20,6 +20,7 @@
         '';
 
         packages = with pkgs; [
+          cachix
           deadnix
           just
           statix

diff --git a/modules/profiles/core/caching.nix b/modules/profiles/core/caching.nix
@@ -1,12 +1,16 @@
-{ inputs, ... }: {
-  environment.systemPackages = [ inputs.attic.packages.x86_64-linux.attic ];
+{ inputs, pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    inputs.attic.packages.x86_64-linux.attic
+    cachix
+  ];
 
   nix.settings = {
     substituters = [
       "https://e10.cachix.org"
       "https://numtide.cachix.org"
       "https://attic.e10.camp"
     ];
+
     trusted-public-keys = [
       "e10.cachix.org-1:/++Tmo/ghEqnLwsQJdXn04c262agRCK5PaPYz8NcVfo="
       "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ @@
             '';
             packages = with pkgs; [
+              cachix
               deadnix
               just
               statix
@@ Expand Down @@