diff --git a/flake.lock b/flake.lock index 2a7d71b..92772a6 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1692225040, - "narHash": "sha256-jbQNvkgWGioiC6S39dZVyn6us8p/DlEvm5hQKEYkzDU=", + "lastModified": 1698258239, + "narHash": "sha256-qnhoYYIJ0L/P7H/f56lQUEvpzNlXh4sxuHpRERV+B44=", "owner": "zhaofengli", "repo": "attic", - "rev": "b43d12082e34bceb26038bdad0438fd68804cfcd", + "rev": "e9918bc6be268da6fa97af6ced15193d8a0421c0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 57dfb23..efbe20f 100644 --- 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 index d063f34..500f7c9 100644 --- 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 index f766951..dbbf535 100644 --- a/modules/profiles/core/caching.nix +++ b/modules/profiles/core/caching.nix @@ -1,5 +1,8 @@ -{ 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 = [ @@ -7,6 +10,7 @@ "https://numtide.cachix.org" "https://attic.e10.camp" ]; + trusted-public-keys = [ "e10.cachix.org-1:/++Tmo/ghEqnLwsQJdXn04c262agRCK5PaPYz8NcVfo=" "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="