Integrate Darwin branch features into integration branch

- Add AeroSpace window manager configuration and file setup
- Add LazyVim setup with gh-addressed plugin
- Add Darwin-specific secrets (work key + work-wg.age)
- Reorganize kitty config into separate profile
- Make Linux-only packages conditional (iputils, strace, vim-tidal)
- Fix nix-darwin compatibility (remove deprecated options, add primaryUser)
- Update font packages to new nerd-fonts structure
- Add platform-aware nrb alias (detects Darwin vs Linux)
- Use shared tmux config instead of Darwin-specific duplicate
- Update Darwin host config (disable yabai, enable AeroSpace)
- Fix sketchybar permissions and gitignore .direnv tracking

Integration branch now works on both Darwin and Linux with all Darwin improvements.

Amp-Thread-ID: https://ampcode.com/threads/T-9427454f-2ecb-40ef-998b-0f33f0950105
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Anish Lakhwara
2025-09-16 13:52:30 -07:00
parent 2ca6feff4d
commit 440ed69398
33 changed files with 949 additions and 31 deletions
+12 -4
View File
@@ -11,7 +11,6 @@
bottom
gptfdisk
starship
iputils
jq
manix
moreutils
@@ -42,7 +41,6 @@
file
lsof
atool
strace
zip
unzip
rsync
@@ -147,6 +145,10 @@
disconnect_keyboard
'')
] ++ lib.optionals pkgs.stdenv.isLinux [
# Linux-only packages
iputils
strace
];
programs.zsh = {
@@ -227,7 +229,7 @@
enableZshIntegration = true;
};
services.kdeconnect.enable = true;
services.kdeconnect.enable = pkgs.stdenv.isLinux;
home.shellAliases = {
# quick cd
@@ -299,7 +301,13 @@
nepl = "n repl '<nixpkgs>'";
srch = "ns nixpkgs";
orch = "ns override";
nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/home/anish/usr/helm#curve'; cd $OLDPWD";
nrb = ''
if [[ "$OSTYPE" == "darwin"* ]]; then
cd ~/usr/helm && sudo darwin-rebuild switch --flake ".#Anishs-MacBook-Pro" && cd $OLDPWD
else
cd /tmp && sudo nixos-rebuild switch --flake '/home/anish/usr/helm#curve' && cd $OLDPWD
fi
'';
nrt = "cd /tmp; sudo nixos-rebuild test --flake '/home/anish/usr/helm#curve'; cd $OLDPWD";
ned = "cd /home/anish/usr/helm; vim; cd $OLDPWD";
ncd = "cd /home/anish/usr/helm";