diff --git a/nix/darwin.nix b/nix/darwin.nix index b3e09df..c6305e1 100644 --- a/nix/darwin.nix +++ b/nix/darwin.nix @@ -1,4 +1,4 @@ -{ self, pkgs, pkgs-unstable, ... }: { +{ self, lib, pkgs, pkgs-unstable, ... }: { # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = @@ -54,12 +54,13 @@ # reference: https://gist.github.com/echo-dave/0d1ee6951c4e3bf00d738e84868e7d59 ssh-use-keychain = { serviceConfig = { - Label = "sshusekeychain"; - ProgramArguments = [ "bash" "-c" "ssh-add" "--apple-load-keychain" ]; + Label = "me.boltless.usekeychain"; + # ProgramArguments = [ "bash" "-c" "ssh-add" "--apple-load-keychain" ]; + ProgramArguments = [ "/bin/echo" "hello" ]; RunAtLoad = true; KeepAlive = false; StandardOutPath = "/var/log/usekeychain.log"; - StandardErrorPath = "/var/log/usekeychain.log"; + StandardErrorPath = "/var/log/usekeychain.err"; }; }; }; @@ -74,9 +75,9 @@ nix.linux-builder = { enable = true; - maxJobs = 6; + maxJobs = lib.mkDefault 4; config.virtualisation = { - cores = 8; + cores = lib.mkDefault 6; }; }; diff --git a/nix/flake.nix b/nix/flake.nix index 028db78..007b1cf 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -32,8 +32,8 @@ in { # Build darwin flake using: - # $ darwin-rebuild build --flake ~/.config/nix - # $ darwin-rebuild switch --flake ~/.config/nix + # $ sudo darwin-rebuild build --flake ~/.config/nix + # $ sudo darwin-rebuild switch --flake ~/.config/nix darwinConfigurations."boltless-MacBook-Air" = nix-darwin.lib.darwinSystem { modules = [ ./darwin.nix @@ -45,6 +45,10 @@ darwinConfigurations."boltless-Studio" = nix-darwin.lib.darwinSystem { modules = [ ./darwin.nix + # ({ lib, ... }: { + # nix.linux-builder.maxJobs = 6; + # nix.linux-builder.config.virtualisation.cores = 8; + # }) ]; specialArgs = { inherit self pkgs-unstable; @@ -79,7 +83,7 @@ pkgs.mprocs pkgs.nil pkgs.nixfmt-classic - pkgs.nodejs_24 + pkgs.nodejs_20 pkgs.pandoc pkgs.qmk pkgs.ripgrep @@ -91,6 +95,7 @@ pkgs.typst pkgs.unixtools.watch pkgs.vim + pkgs.pnpm pkgs.zellij pkgs.llvmPackages.clang-tools pkgs-unstable.jujutsu