darwin fixed ghostty, homebrew, vscode

This commit is contained in:
2025-08-20 12:14:14 -07:00
parent f807d29276
commit d1d97fdac9
5 changed files with 21 additions and 3 deletions

View File

@@ -29,6 +29,7 @@
curl curl
dig dig
dust dust
fd
ffmpeg-full ffmpeg-full
fzf fzf
gemini-cli gemini-cli

View File

@@ -11,7 +11,8 @@
shellAliases = { shellAliases = {
cd = "z"; cd = "z";
cat = "bat"; cat = "bat";
catp = "bat -p"; catp = "bat -pP";
find = "fd";
grep = "rg"; grep = "rg";
lg = "lazygit"; lg = "lazygit";
ll = "eza -la"; ll = "eza -la";
@@ -20,7 +21,11 @@
open = "xdg-open"; open = "xdg-open";
locate = "sudo plocate"; locate = "sudo plocate";
tulpn = "sudo netstat -tulpn"; tulpn = "sudo netstat -tulpn";
rebuild = "sudo nixos-rebuild switch --flake /etc/nixos#$(uname -n)"; rebuild = if hostname == "eva-02"
then
"sudo darwin-rebuild switch --flake .#eva-02"
else
"sudo nixos-rebuild switch --flake /etc/nixos#$(uname -n)";
}; };
# profileExtra = '' # profileExtra = ''

View File

@@ -1,6 +1,12 @@
{
hostname,
lib,
...
}:
{ {
programs.ghostty = { programs.ghostty = {
enable = true; enable = true;
package = lib.mkIf (hostname == "eva-02") null;
enableZshIntegration = true; enableZshIntegration = true;
settings = { settings = {
# Use explicit theme instead of relying on system theme detection # Use explicit theme instead of relying on system theme detection

View File

@@ -8,6 +8,9 @@
./hypr/hyprland.nix ./hypr/hyprland.nix
./hypr/hyprlock.nix ./hypr/hyprlock.nix
#./hypr/waybar.nix #./hypr/waybar.nix
]
++ lib.optionals (hostname == "eva-02") [
./ghostty/ghostty.nix
]; ];
home.packages = home.packages =
@@ -66,7 +69,7 @@
calibre calibre
] ]
++ lib.optionals (hostname == "eva-02") [ ++ lib.optionals (hostname == "eva-02") [
vscode vscode
] ]

View File

@@ -76,6 +76,7 @@
"1password" "1password"
"1password-cli" "1password-cli"
"docker" "docker"
"ghostty"
]; ];
}; };
@@ -127,7 +128,9 @@
tailscale tailscale
unzip unzip
vim vim
];
fonts.packages = with pkgs; [
nerd-fonts.hack nerd-fonts.hack
nerd-fonts.fira-code nerd-fonts.fira-code
]; ];