From 02aab19a9b1c4381a65f242101ba3fd0369d3dfd Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 25 Dec 2024 13:27:52 +1100 Subject: [PATCH] 29 papercuts --- CHANGELOG.md | 2 ++ hosts/hermes/darwin-configuration.nix | 2 +- modules/base.nix | 1 + modules/ghostty.nix | 48 +++++++++++++++++++++++++++ modules/vscode.nix | 1 + 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 modules/ghostty.nix diff --git a/CHANGELOG.md b/CHANGELOG.md index f2fdc9e..a059382 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +- Use `ghostty` on `hermes-macos` +- Use Go VSCode extension - Use `clan.lol` as a remote builder for `hermes-macos` - Added `phi-nixos` to `clan` - Changed `nixpkgs.hostPlatform` to be automatically set by `mkConfiguration` rather than `hardware-configuration.nix` and passed as `system` to `nixpkgs.lib.nixosSystem` diff --git a/hosts/hermes/darwin-configuration.nix b/hosts/hermes/darwin-configuration.nix index 29a4a48..1456bfd 100644 --- a/hosts/hermes/darwin-configuration.nix +++ b/hosts/hermes/darwin-configuration.nix @@ -22,7 +22,7 @@ # Update this when firefox-bin-unwrapped is merged (assert pkgs.firefox.meta.unsupported && pkgs.firefox-bin.meta.unsupported; "/Applications/Firefox.app") - "/System/Applications/Utilities/Terminal.app" + "/Applications/Ghostty.app" "/Applications/1Password.app" "${pkgs.vscode}/Applications/Visual Studio Code.app" "${pkgs.spotify}/Applications/Spotify.app" diff --git a/modules/base.nix b/modules/base.nix index afdad93..38249e1 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -81,6 +81,7 @@ in { "builder" "cache" "flakes" + "ghostty" "kitty" "syncthing" "termite" diff --git a/modules/ghostty.nix b/modules/ghostty.nix new file mode 100644 index 0000000..ff3e34b --- /dev/null +++ b/modules/ghostty.nix @@ -0,0 +1,48 @@ +{ + homeModule = { options, pkgs, lib, ... }: { + xdg.configFile."ghostty/config".text = + assert !options.programs ? ghostty; '' + theme = hybrid-krompus + bold-is-bright = true + ''; + + xdg.configFile."ghostty/themes/hybrid-krompus".text = + assert !options.programs ? ghostty; '' + # black + palette = 0=#0a0a0a + palette = 8=#73645d + + # red + palette = 1=#e61f00 + palette = 9=#ff3f3d + + # green + palette = 2=#6dd200 + palette = 10=#c1ff05 + + # yellow + palette = 3=#fa6800 + palette = 11=#ffa726 + + # blue + palette = 4=#255ae4 + palette = 12=#00ccff + + # magenta + palette = 5=#ff0084 + palette = 13=#ff65a0 + + # cyan + palette = 6=#36fcd3 + palette = 14=#96ffe3 + + # white + palette = 7=#b6afab + palette = 15=#fff5ed + + background = 0d0c0c + foreground = fff5ed + cursor-color = 00ccff + ''; + }; +} diff --git a/modules/vscode.nix b/modules/vscode.nix index abcf816..9357c91 100644 --- a/modules/vscode.nix +++ b/modules/vscode.nix @@ -39,6 +39,7 @@ pkgs.vscode-extensions.jnoortheen.nix-ide pkgs.vscode-extensions.xadillax.viml pkgs.vscode-extensions.nefrob.vscode-just-syntax + pkgs.vscode-extensions.golang.go ] ++ lib.optionals (hostPlatform.isx86_64 || hostPlatform.isDarwin) [ (pkgs.vscode-extensions.ms-python.python.override { pythonUseFixed = true;