From b8c45bf82dbcf6044ae1353558d6fe1952f41956 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 31 Jul 2020 18:54:48 -0400
Subject: [PATCH] Use cachix

---
 default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/default.nix b/default.nix
index 351d5f73..9be56d44 100644
--- a/default.nix
+++ b/default.nix
@@ -17,7 +17,9 @@ device: username:
   imports = [
     ./modules
     "${./hosts}/${device}"
-  ];
+  ] ++ (if builtins.pathExists(/etc/nixos/cachix.nix) then [
+    /etc/nixos/cachix.nix
+  ] else []);
 
   ### NixOS
   nix.autoOptimiseStore = true;
@@ -44,10 +46,14 @@ device: username:
 
     gnumake               # for our own makefile
     my.cached-nix-shell   # for instant nix-shell scripts
+    cachix                # less time buildin' mo time nixin'
+    (writeScriptBin "nix-shell" ''
+      #!${stdenv.shell}
+      NIX_PATH="nixpkgs-overlays=/etc/dotfiles/packages/default.nix:$NIX_PATH" ${nix}/bin/nix-shell "$@"
+    '')
   ];
   environment.shellAliases = {
     nix-env = "NIXPKGS_ALLOW_UNFREE=1 nix-env";
-    nix-shell = ''NIX_PATH="nixpkgs-overlays=/etc/dotfiles/packages/default.nix:$NIX_PATH" nix-shell'';
     nsh = "nix-shell";
     nen = "nix-env";
     dots = "make -C ~/.dotfiles";