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
+4 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:
let
customPlugins = {
vim-zettel = pkgs.vimUtils.buildVimPlugin {
@@ -1081,7 +1081,6 @@ in
vim-sexp-mappings-for-regular-people
fennel-vim
vim-tidal
# experimental
nvim-luapad
scnvim
@@ -1093,6 +1092,9 @@ in
yuck-vim
nvim-parinfer
# vim-processing
] ++ lib.optionals pkgs.stdenv.isLinux [
# Linux-only plugins
vim-tidal # requires SuperCollider which is Linux-only
];
withPython3 = true;
extraPython3Packages = pkgs: with pkgs; [ tasklib six packaging ];