From 852ecf0b9111704c8b28e869fb1dced11e56c4d9 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Mon, 17 Mar 2025 11:00:14 -0400
Subject: [PATCH] tweaks for ghostty, helix, zed

---
 .../modules/nmasur/presets/fonts.nix          |   1 +
 .../nmasur/presets/programs/ghostty.nix       |   2 +-
 .../modules/nmasur/presets/programs/helix.nix | 205 ++++++++++++++++++
 .../nmasur/presets/programs/zed-editor.nix    |   5 +-
 .../Spoons/MoveWindow.spoon/worklayout.lua    |   1 +
 .../modules/nmasur/profiles/experimental.nix  |   2 +-
 6 files changed, 213 insertions(+), 3 deletions(-)
 create mode 100644 platforms/home-manager/modules/nmasur/presets/programs/helix.nix

diff --git a/platforms/home-manager/modules/nmasur/presets/fonts.nix b/platforms/home-manager/modules/nmasur/presets/fonts.nix
index a2c45c7..2f3a73a 100644
--- a/platforms/home-manager/modules/nmasur/presets/fonts.nix
+++ b/platforms/home-manager/modules/nmasur/presets/fonts.nix
@@ -33,6 +33,7 @@ in
     programs.alacritty.settings.font.normal.family = "VictorMono";
     programs.kitty.font.name = "VictorMono Nerd Font Mono";
     nmasur.presets.programs.wezterm.font = "VictorMono Nerd Font Mono";
+    programs.ghostty.settings.font-family = "VictorMono Nerd Font Mono";
     services.dunst.settings.global.font = "Hack Nerd Font 14";
   };
 }
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix b/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix
index 6a40a5c..691dc5b 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix
@@ -22,7 +22,7 @@ in
       enableFishIntegration = true;
       enableBashIntegration = true;
       enableZshIntegration = true;
-      installBatSyntax = true;
+      installBatSyntax = false; # The file doesn't seem to exist in the pkg
       settings = {
         theme = config.theme.name;
         font-size = 16;
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
new file mode 100644
index 0000000..a07c623
--- /dev/null
+++ b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
@@ -0,0 +1,205 @@
+{ config, lib, ... }:
+
+let
+  cfg = config.nmasur.presets.programs.helix;
+in
+
+{
+
+  options.nmasur.presets.programs.helix.enable = lib.mkEnableOption "Helix text editor";
+
+  config = lib.mkIf cfg.enable {
+
+    programs.helix = {
+
+      enable = true;
+
+      settings = {
+        theme = "base16";
+      };
+
+      themes."${config.programs.helix.settings.theme}" = {
+        "attributes" = config.theme.colors.base09;
+        "comment" = {
+          fg = config.theme.colors.base03;
+          modifiers = [ "italic" ];
+        };
+        "constant" = config.theme.colors.base09;
+        "constant.character.escape" = config.theme.colors.base0C;
+        "constant.numeric" = config.theme.colors.base09;
+        "constructor" = config.theme.colors.base0D;
+        "debug" = config.theme.colors.base03;
+        "diagnostic" = {
+          modifiers = [ "underlined" ];
+        };
+        "diff.delta" = config.theme.colors.base09;
+        "diff.minus" = config.theme.colors.base08;
+        "diff.plus" = config.theme.colors.base0B;
+        "error" = config.theme.colors.base08;
+        "function" = config.theme.colors.base0D;
+        "hint" = config.theme.colors.base03;
+        "info" = config.theme.colors.base0D;
+        "keyword" = config.theme.colors.base0E;
+        "label" = config.theme.colors.base0E;
+        "namespace" = config.theme.colors.base0E;
+        "operator" = config.theme.colors.base05;
+        "special" = config.theme.colors.base0D;
+        "string" = config.theme.colors.base0B;
+        "type" = config.theme.colors.base0A;
+        "variable" = config.theme.colors.base08;
+        "variable.other.member" = config.theme.colors.base0B;
+        "warning" = config.theme.colors.base09;
+        "markup.bold" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "bold" ];
+        };
+        "markup.heading" = config.theme.colors.base0D;
+        "markup.italic" = {
+          fg = config.theme.colors.base0E;
+          modifiers = [ "italic" ];
+        };
+        "markup.link.text" = config.theme.colors.base08;
+        "markup.link.url" = {
+          fg = config.theme.colors.base09;
+          modifiers = [ "underlined" ];
+        };
+        "markup.list" = config.theme.colors.base08;
+        "markup.quote" = config.theme.colors.base0C;
+        "markup.raw" = config.theme.colors.base0B;
+        "markup.strikethrough" = {
+          modifiers = [ "crossed_out" ];
+        };
+        "diagnostic.hint" = {
+          underline = {
+            style = "curl";
+          };
+        };
+        "diagnostic.info" = {
+          underline = {
+            style = "curl";
+          };
+        };
+        "diagnostic.warning" = {
+          underline = {
+            style = "curl";
+          };
+        };
+        "diagnostic.error" = {
+          underline = {
+            style = "curl";
+          };
+        };
+        "ui.background" = {
+          bg = config.theme.colors.base00;
+        };
+        "ui.bufferline.active" = {
+          fg = config.theme.colors.base00;
+          bg = config.theme.colors.base03;
+          modifiers = [ "bold" ];
+        };
+        "ui.bufferline" = {
+          fg = config.theme.colors.base04;
+          bg = config.theme.colors.base00;
+        };
+        "ui.cursor" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "reversed" ];
+        };
+        "ui.cursor.insert" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "reversed" ];
+        };
+        "ui.cursorline.primary" = {
+          fg = config.theme.colors.base05;
+          bg = config.theme.colors.base01;
+        };
+        "ui.cursor.match" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "reversed" ];
+        };
+        "ui.cursor.select" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "reversed" ];
+        };
+        "ui.gutter" = {
+          bg = config.theme.colors.base00;
+        };
+        "ui.help" = {
+          fg = config.theme.colors.base06;
+          bg = config.theme.colors.base01;
+        };
+        "ui.linenr" = {
+          fg = config.theme.colors.base03;
+          bg = config.theme.colors.base00;
+        };
+        "ui.linenr.selected" = {
+          fg = config.theme.colors.base04;
+          bg = config.theme.colors.base01;
+          modifiers = [ "bold" ];
+        };
+        "ui.menu" = {
+          fg = config.theme.colors.base05;
+          bg = config.theme.colors.base01;
+        };
+        "ui.menu.scroll" = {
+          fg = config.theme.colors.base03;
+          bg = config.theme.colors.base01;
+        };
+        "ui.menu.selected" = {
+          fg = config.theme.colors.base01;
+          bg = config.theme.colors.base04;
+        };
+        "ui.popup" = {
+          bg = config.theme.colors.base01;
+        };
+        "ui.selection" = {
+          bg = config.theme.colors.base02;
+        };
+        "ui.selection.primary" = {
+          bg = config.theme.colors.base02;
+        };
+        "ui.statusline" = {
+          fg = config.theme.colors.base04;
+          bg = config.theme.colors.base01;
+        };
+        "ui.statusline.inactive" = {
+          bg = config.theme.colors.base01;
+          fg = config.theme.colors.base03;
+        };
+        "ui.statusline.insert" = {
+          fg = config.theme.colors.base00;
+          bg = config.theme.colors.base0B;
+        };
+        "ui.statusline.normal" = {
+          fg = config.theme.colors.base00;
+          bg = config.theme.colors.base03;
+        };
+        "ui.statusline.select" = {
+          fg = config.theme.colors.base00;
+          bg = config.theme.colors.base0F;
+        };
+        "ui.text" = config.theme.colors.base05;
+        "ui.text.focus" = config.theme.colors.base05;
+        "ui.virtual.indent-guide" = {
+          fg = config.theme.colors.base03;
+        };
+        "ui.virtual.inlay-hint" = {
+          fg = config.theme.colors.base03;
+        };
+        "ui.virtual.ruler" = {
+          bg = config.theme.colors.base01;
+        };
+        "ui.virtual.jump-label" = {
+          fg = config.theme.colors.base0A;
+          modifiers = [ "bold" ];
+        };
+        "ui.window" = {
+          bg = config.theme.colors.base01;
+        };
+      };
+
+    };
+
+  };
+
+}
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/zed-editor.nix b/platforms/home-manager/modules/nmasur/presets/programs/zed-editor.nix
index 9d7ec66..1c70d50 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/zed-editor.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/zed-editor.nix
@@ -17,7 +17,10 @@ in
     programs.zed-editor = {
       enable = true;
 
-      extensions = [ "nix" ];
+      extensions = [
+        "nix"
+        "rust"
+      ];
 
       extraPackages = [ pkgs.nixd ];
 
diff --git a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
index 7bdeb89..20c9903 100644
--- a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
+++ b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
@@ -42,6 +42,7 @@ local function worklayout()
         -- set the layout
         local left = {
             { "WezTerm", nil, WORK_ONLY_MONITOR, u(0, 0, 1 / 2, 1), nil, nil, visible = true },
+            { "Ghostty", nil, WORK_ONLY_MONITOR, u(0, 0, 1 / 2, 1), nil, nil, visible = true },
         }
         local right = {
             { "Slack", nil, WORK_ONLY_MONITOR, u(1 / 2, 0, 1 / 2, 1), nil, nil, visible = true },
diff --git a/platforms/home-manager/modules/nmasur/profiles/experimental.nix b/platforms/home-manager/modules/nmasur/profiles/experimental.nix
index f39b35f..d381138 100644
--- a/platforms/home-manager/modules/nmasur/profiles/experimental.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/experimental.nix
@@ -18,6 +18,7 @@ in
     nmasur.presets.programs = {
       zed-editor.enable = lib.mkDefault true;
       ghostty.enable = lib.mkDefault true;
+      helix.enable = lib.mkDefault true;
     };
 
     home.packages = [
@@ -32,7 +33,6 @@ in
     ];
 
     programs.gh-dash.enable = lib.mkDefault true;
-    programs.helix.enable = lib.mkDefault true;
     programs.himalaya.enable = lib.mkDefault true;
 
   };