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:
@@ -22,6 +22,7 @@
|
||||
"wireshark"
|
||||
"1password"
|
||||
"orbstack"
|
||||
# "aerospace"
|
||||
|
||||
# Communication Tools
|
||||
# Already installed manually
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{
|
||||
imports = [
|
||||
./sketchybar
|
||||
./yabai
|
||||
# ./yabai # Now using aerospace
|
||||
# ./casks
|
||||
# ../../modules/darwin/home-manager.nix
|
||||
# ../../modules/shared
|
||||
@@ -45,7 +45,7 @@
|
||||
};
|
||||
|
||||
# Auto upgrade nix package and the daemon service.
|
||||
services.nix-daemon.enable = true;
|
||||
# services.nix-daemon.enable = true; # removed in newer nix-darwin
|
||||
nixpkgs.hostPlatform = "aarch64-darwin";
|
||||
programs.zsh.enable = true;
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
settings.trusted-users = [ "@admin" "anishlakhwara" ];
|
||||
|
||||
gc = {
|
||||
user = "root";
|
||||
# user = "root"; # removed in newer nix-darwin
|
||||
automatic = true;
|
||||
interval = { Weekday = 0; Hour = 2; Minute = 0; };
|
||||
options = "--delete-older-than 30d";
|
||||
@@ -85,11 +85,14 @@
|
||||
siji
|
||||
font-awesome
|
||||
proggyfonts
|
||||
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Iosevka" ]; })
|
||||
nerd-fonts.fira-code
|
||||
nerd-fonts.droid-sans-mono
|
||||
nerd-fonts.iosevka
|
||||
];
|
||||
|
||||
system = {
|
||||
stateVersion = 4;
|
||||
primaryUser = "anishlakhwara"; # required for newer nix-darwin
|
||||
|
||||
keyboard = {
|
||||
enableKeyMapping = true;
|
||||
|
||||
Reference in New Issue
Block a user