From 2a6179e708dc4550815f930368b21a3af297c6ea Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 13 Feb 2023 23:33:09 +0100 Subject: [PATCH] feat(flake): cachix go brr --- flake.lock | 30 +++++++++++++++--------------- flake.nix | 2 ++ machines/common.nix | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 machines/common.nix diff --git a/flake.lock b/flake.lock index 868220d..bdbd809 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -189,11 +189,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1676254866, - "narHash": "sha256-5WNiCgi3lPQn4KvKTAiB/hQfbifport0SjH+sKlZgXA=", + "lastModified": 1676255131, + "narHash": "sha256-jzhKpaBsiQVUU+Ts0XVuafWg2r+3kc60YVxTdEYvBZM=", "owner": "nekowinston", "repo": "nur", - "rev": "ad26229468091d9e1c73ed65febb62186e3f2f1d", + "rev": "3850740fc65e52715cefb1c3eb02dd6e7e5c1a62", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "lastModified": 1676150441, + "narHash": "sha256-Nfeua9Ua/dGHOQpzOjLtkyMyW/ysQCvZJ9Dd74QQSNk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "6d87734c880d704f6ee13e5c0fe835b98918c34e", "type": "github" }, "original": { @@ -348,11 +348,11 @@ }, "nur": { "locked": { - "lastModified": 1676251563, - "narHash": "sha256-itLKR2Haeh5wQ6dxkuZ8L5gwp3+CAggpN+w2e7cLQPg=", + "lastModified": 1676324777, + "narHash": "sha256-NaCIUq5Kcl/6LwvDnpNkb98qb1rthZMDNEvHYL2PU9w=", "owner": "nix-community", "repo": "NUR", - "rev": "9a8b28a9d6611f6af9f7abb3e690fc755d6906fe", + "rev": "d486bbbd3974a134d414f815f078e72558d7a985", "type": "github" }, "original": { @@ -370,11 +370,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1676233402, - "narHash": "sha256-43JNeMD1g4skb5xhq4w6atlIHe7Fb0UOgVNSsif1RVU=", + "lastModified": 1676279938, + "narHash": "sha256-RDyvVdituVQQZtGA7DNaJruJLDz/pfkREpUcI4ZQvsk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "15f2da96967d4c828ae678af50f75214372fd3ce", + "rev": "1583077009b6ef4236d1899c0f43cf1ce1db8085", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0437c6c..2ae21a7 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,7 @@ system = "x86_64-linux"; modules = [ home-manager.nixosModules.home-manager + ./machines/common.nix ./machines/futomaki ({config, ...}: { @@ -95,6 +96,7 @@ modules = [ home-manager.darwinModules.home-manager + ./machines/common.nix ./machines/sashimi/darwin.nix ({config, ...}: { diff --git a/machines/common.nix b/machines/common.nix new file mode 100644 index 0000000..26fdbaf --- /dev/null +++ b/machines/common.nix @@ -0,0 +1,20 @@ +{ + nix.settings = { + substituters = [ + "https://catppuccin.cachix.org" + "https://hyprland.cachix.org" + "https://mic92.cachix.org" + "https://nekowinston.cachix.org" + "https://nix-community.cachix.org" + "https://pre-commit-hooks.cachix.org" + ]; + trusted-public-keys = [ + "catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ=" + "nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" + ]; + }; +}