Add cachix nix config

.devcontainer.json

@@ -10,7 +10,6 @@
         "streetsidesoftware.code-spell-checker",
         "eamodio.gitlens",
         "tamasfe.even-better-toml",
-        "jnoortheen.nix-ide",
         "1password.op-vscode",
         "ibecker.treefmt-vscode",
         "jnoortheen.nix-ide"

.github/workflows/binary-cache.yaml

@@ -22,4 +22,4 @@ jobs:
     - name: Build dev shell
       run: |
         export NIXPKGS_ALLOW_UNFREE=1
-        nix develop --impure --accept-flake-config --build
+        nix develop --impure --accept-flake-config --accept-flake-config --build

.github/workflows/template-darwin-system.yaml

@@ -6,7 +6,7 @@ on:
       - templates/darwin-system/*
 
 jobs:
-  binary-cache:
+  template-test:
     permissions:
       contents: write
     runs-on: macos-latest
@@ -20,5 +20,6 @@ jobs:
     - name: Build packages
       run: |
         export NIXPKGS_ALLOW_UNFREE=1
-        nix flake new -t .#darwin-system darwin-system
-        nix run --flake ./darwin-system#activate
+        nix flake new --accept-flake-config -t .#darwin-system darwin-system
+        sudo rm -rf ~/.nix-defexpr
+        sudo nix run --accept-flake-config path:"$(pwd)/darwin-system"#activate --show-trace

config/default-packages.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }:
 let
@@ -39,7 +40,7 @@ let
       ;
   };
 
-  allDefaultPackages = cliTools // (if pkgs.stdlib.isDarwin then macUtilities else { });
+  allDefaultPackages = cliTools // (if pkgs.stdenv.isDarwin then macUtilities else { });
 in
 {
   options.dotfiles = {
@@ -53,8 +54,6 @@ in
   };
 
   config = {
-    home.packages = (
-      with builtins; attrValues (removeAttrs allDefaultPackages config.dotfiles.disabledDefaultPackages)
-    );
+    home.packages = attrValues (removeAttrs allDefaultPackages config.dotfiles.disabledDefaultPackages);
   };
 }

config/wezterm/home.nix

@@ -9,7 +9,11 @@
     enable = true;
 
     extraConfig = builtins.replaceStrings [ "@multiplexingName@" ] [
-      (lib.toLower ("${osConfig.networking.hostName or "wezterm"}_${config.home.username}"))
+      (lib.toLower (
+        "${
+          (if osConfig.networking.hostName != null then osConfig.networking.hostName else "wezterm")
+        }_${config.home.username}"
+      ))
     ] (builtins.readFile ./config.lua);
   };
 }

flake.nix

@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin";
     flake-parts.url = "github:hercules-ci/flake-parts";
     devenv-root = {
       url = "file+file:///dev/null";

templates/darwin-system/configuration.nix

@@ -12,14 +12,17 @@ in
     modules = [
       (dotfiles.lib.configureOsModules {
         osModules = attrValues dotfiles.modules.darwin;
-        homeModules = attrValues dotfiles.modules.homeModules;
+        homeModules = dotfiles.lib.homeModulesWithDisabled [ "default-apps" ];
       })
       (
         let
           username = "luke";
         in
-        { ... }:
+        { lib, ... }:
         {
+          # This can be removed for multi-user Nix installs
+          nix.gc.user = username;
+
           users = {
             knownUsers = [ username ];
 

templates/darwin-system/flake.nix

@@ -51,4 +51,11 @@
             };
         };
     };
+
+  nixConfig = {
+    extra-substituters = [ "https://luke-channings.cachix.org" ];
+    extra-trusted-public-keys = [
+      "luke-channings.cachix.org-1:ETsZ3R5ue9QOwO4spg8aGJMwMU6k5tQIaHWnTakGHjo="
+    ];
+  };
 }

templates/devenv/flake.nix

@@ -39,4 +39,11 @@
         "aarch64-linux"
       ];
     };
+
+  nixConfig = {
+    extra-substituters = [ "https://luke-channings.cachix.org" ];
+    extra-trusted-public-keys = [
+      "luke-channings.cachix.org-1:ETsZ3R5ue9QOwO4spg8aGJMwMU6k5tQIaHWnTakGHjo="
+    ];
+  };
 }