diff options
| author | Simen A. W. Olsen <hello@simenandre.no> | 2026-08-15 00:34:17 +0200 |
|---|---|---|
| committer | Simen A. W. Olsen <hello@simenandre.no> | 2026-08-15 00:34:17 +0200 |
| commit | 80d848cfa3731ff7f4b79e95bd73999fcc8dcb46 (patch) | |
| tree | a5da330233466fd77d082c02ff9875b36c29cb4c /modules | |
| parent | fbb23720db6cda7cabf07ea831accc1b1a8456e0 (diff) | |
| download | dotfiles-80d848cfa3731ff7f4b79e95bd73999fcc8dcb46.tar.gz dotfiles-80d848cfa3731ff7f4b79e95bd73999fcc8dcb46.zip | |
feat(darwin): add makkie host config and parameterize per-machine settings
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/darwin/default.nix | 3 | ||||
| -rw-r--r-- | modules/home/zsh.nix | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index b4b81a8..90f9ab2 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -16,9 +16,6 @@ # System state version – do not change after first installation system.stateVersion = 5; - # Primary user for system defaults and homebrew - system.primaryUser = "cobraz"; - # Enable Touch ID for sudo security.pam.services.sudo_local.touchIdAuth = true; diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index a7817f9..1c114b2 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, lib, flakeAttr, ... }: let # Pinned to commits, not branch names: a branch ref keeps moving while the @@ -117,8 +117,8 @@ in alias ls='ls --color' '' + (if pkgs.stdenv.isDarwin then '' alias tailscale='/Applications/Tailscale.app/Contents/MacOS/Tailscale' - alias rebuild='sudo darwin-rebuild switch --flake ~/ghq/simenandre.no/dotfiles#default' - alias update='nix flake update --flake ~/ghq/simenandre.no/dotfiles && sudo darwin-rebuild switch --flake ~/ghq/simenandre.no/dotfiles#default' + alias rebuild='sudo darwin-rebuild switch --flake ~/ghq/simenandre.no/dotfiles#${flakeAttr}' + alias update='nix flake update --flake ~/ghq/simenandre.no/dotfiles && sudo darwin-rebuild switch --flake ~/ghq/simenandre.no/dotfiles#${flakeAttr}' alias nix-gc='sudo nix-collect-garbage --delete-older-than 14d && nix-collect-garbage --delete-older-than 14d && nix store gc' '' else "") + '' |