From 120bcc56e06242c1f262bbe27ee6f89c246b412d Mon Sep 17 00:00:00 2001 From: Matthew Ess Date: Fri, 3 Jan 2020 01:05:19 -0500 Subject: [PATCH] Add cachix --- cachix.nix | 13 +++++++++++++ cachix/hercules-ci.nix | 12 ++++++++++++ cachix/hie-nix.nix | 12 ++++++++++++ cachix/matthewess.nix | 12 ++++++++++++ cachix/nix-tools.nix | 12 ++++++++++++ configuration.nix | 9 +++++++-- 6 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 cachix.nix create mode 100644 cachix/hercules-ci.nix create mode 100644 cachix/hie-nix.nix create mode 100644 cachix/matthewess.nix create mode 100644 cachix/nix-tools.nix diff --git a/cachix.nix b/cachix.nix new file mode 100644 index 0000000..64734c3 --- /dev/null +++ b/cachix.nix @@ -0,0 +1,13 @@ +# WARN: this file will get overwritten by $ cachix use +{ pkgs, lib, ... }: + +let + folder = ./cachix; + toImport = name: value: folder + ("/" + name); + filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key; + imports = lib.mapAttrsToList toImport + (lib.filterAttrs filterCaches (builtins.readDir folder)); +in { + inherit imports; + nix.binaryCaches = [ "https://cache.nixos.org/" ]; +} diff --git a/cachix/hercules-ci.nix b/cachix/hercules-ci.nix new file mode 100644 index 0000000..a925aa3 --- /dev/null +++ b/cachix/hercules-ci.nix @@ -0,0 +1,12 @@ + +{ + nix = { + binaryCaches = [ + "https://hercules-ci.cachix.org" + ]; + binaryCachePublicKeys = [ + "hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0=" + ]; + }; +} + \ No newline at end of file diff --git a/cachix/hie-nix.nix b/cachix/hie-nix.nix new file mode 100644 index 0000000..827d0a3 --- /dev/null +++ b/cachix/hie-nix.nix @@ -0,0 +1,12 @@ + +{ + nix = { + binaryCaches = [ + "https://hie-nix.cachix.org" + ]; + binaryCachePublicKeys = [ + "hie-nix.cachix.org-1:EjBSHzF6VmDnzqlldGXbi0RM3HdjfTU3yDRi9Pd0jTY=" + ]; + }; +} + \ No newline at end of file diff --git a/cachix/matthewess.nix b/cachix/matthewess.nix new file mode 100644 index 0000000..f12a820 --- /dev/null +++ b/cachix/matthewess.nix @@ -0,0 +1,12 @@ + +{ + nix = { + binaryCaches = [ + "https://matthewess.cachix.org" + ]; + binaryCachePublicKeys = [ + "matthewess.cachix.org-1:dlcWfdyp8KTqlWXYIupL2+GM3hkWAojTl+WOBqGt/X0=" + ]; + }; +} + \ No newline at end of file diff --git a/cachix/nix-tools.nix b/cachix/nix-tools.nix new file mode 100644 index 0000000..6a22eb7 --- /dev/null +++ b/cachix/nix-tools.nix @@ -0,0 +1,12 @@ + +{ + nix = { + binaryCaches = [ + "https://nix-tools.cachix.org" + ]; + binaryCachePublicKeys = [ + "nix-tools.cachix.org-1:ebBEBZLogLxcCvipq2MTvuHlP7ZRdkazFSQsbs0Px1A=" + ]; + }; +} + \ No newline at end of file diff --git a/configuration.nix b/configuration.nix index 56b5176..d5d4aa7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,8 +5,11 @@ { config, pkgs, ... }: { - imports = [ # Include the results of the hardware scan. + imports = [ + # Include the results of the hardware scan. ./hardware-configuration.nix + # Cachix caches + ./cachix.nix # Overlays ]; @@ -85,8 +88,10 @@ programs = { fish.enable = true; - seahorse.enable = true; light.enable = true; + nm-applet.enable = true; + seahorse.enable = true; + ssh = { startAgent = true; }; }; # List services that you want to enable: