From 058b3be4feb7eda3810172537039c48ac36441a5 Mon Sep 17 00:00:00 2001
From: Hunt <lizhunt@amazon.com>
Date: Sat, 7 Jun 2025 17:33:01 -0700
Subject: Fix theming stuff

---
 context.json                                      |  6 +++
 dots/nvim/.config/nvim/lua/plugins/lualine.lua.j2 | 47 ++++++++---------------
 dots/nvim/.config/nvim/lua/plugins/theme.lua.j2   |  2 +-
 dots/tmux/.config/tmux/tmux.conf                  | 31 ---------------
 dots/tmux/.config/tmux/tmux.conf.j2               | 31 +++++++++++++++
 dots/zed/.config/zed/settings.json.j2             |  4 +-
 6 files changed, 56 insertions(+), 65 deletions(-)
 delete mode 100644 dots/tmux/.config/tmux/tmux.conf
 create mode 100644 dots/tmux/.config/tmux/tmux.conf.j2

diff --git a/context.json b/context.json
index 15f48f3..5effa4f 100644
--- a/context.json
+++ b/context.json
@@ -62,6 +62,12 @@
             }
         },
         "theme": {
+            "tmux": {
+                "plugin": {
+                    "line": "set -g @plugin 'egel/tmux-gruvbox'",
+                    "conf": "set -g @tmux-gruvbox 'dark'"
+                }
+            },
             "nvim": {
                 "lualine_theme": "gruvbox",
                 "light_colorscheme": "gruvbox",
diff --git a/dots/nvim/.config/nvim/lua/plugins/lualine.lua.j2 b/dots/nvim/.config/nvim/lua/plugins/lualine.lua.j2
index dd44249..437620b 100644
--- a/dots/nvim/.config/nvim/lua/plugins/lualine.lua.j2
+++ b/dots/nvim/.config/nvim/lua/plugins/lualine.lua.j2
@@ -1,35 +1,20 @@
 return {
-    {
-        'nvim-lualine/lualine.nvim',
-        event = 'VeryLazy',
-        opts = function()
-            return {
-                options = {
-                    icons_enabled = true,
-                    theme = '{{ theme.nvim.lualine_theme }}',
-                    component_separators = { left = '', right = ''},
-                    section_separators = { left = '', right = ''},
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    opts = function()
+        return {
+            options = {
+                icons_enabled = true,
+                theme = "{{ theme.nvim.lualine_theme }}",
+                component_separators = { left = "", right = ""},
+                section_separators = { left = "", right = ""},
+            },
+            sections = {
+                lualine_c = {
+                    { "filename", path = 1 },
                 },
-                sections = {
-                    lualine_c = {
-                        { 'filename', path = 1 },
-                    },
-                    lualine_y = {
-                        {
-                            require('tmux-status').tmux_windows,
-                            cond = require('tmux-status').show,
-                            padding = { left = 1, right = 1 },
-                        },
-                    }
-                },
-            }
-        end,
-    },
-
-    {
-        "christopher-francisco/tmux-status.nvim",
-        -- lazy = true,
-        opts = {},
-    },
+            },
+        }
+    end
 }
 
diff --git a/dots/nvim/.config/nvim/lua/plugins/theme.lua.j2 b/dots/nvim/.config/nvim/lua/plugins/theme.lua.j2
index dd47aee..3b41dbe 100644
--- a/dots/nvim/.config/nvim/lua/plugins/theme.lua.j2
+++ b/dots/nvim/.config/nvim/lua/plugins/theme.lua.j2
@@ -2,7 +2,7 @@ return {
     {
 	    "ellisonleao/gruvbox.nvim",
 	    opts = {
-	    	transparent_mode = true,
+	    	-- transparent_mode = true,
 	    }
     },
 
diff --git a/dots/tmux/.config/tmux/tmux.conf b/dots/tmux/.config/tmux/tmux.conf
deleted file mode 100644
index 7a1fab5..0000000
--- a/dots/tmux/.config/tmux/tmux.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#-- <keybinds> --
-set -g prefix C-s
-
-set -g mode-keys vi
-bind-key -T copy-mode-vi 'v' send -X begin-selection
-bind-key -T copy-mode-vi 'C-v' send -X rectangle-toggle
-bind-key -T copy-mode-vi 'y' send -X copy-selection
-
-unbind r
-bind r source-file ~/.config/tmux/tmux.conf
-
-bind-key h select-pane -L
-bind-key j select-pane -D
-bind-key k select-pane -U
-bind-key l select-pane -R
-#-- </keybinds> --
-
-#-- <plugins> --
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-#-- </plugins> --
-
-#-- <theme> --
-set -g @plugin 'egel/tmux-gruvbox'
-set -g @tmux-gruvbox 'dark'
-#-- </theme> --
-
-#-- <tpm> --
-# keep at bottom
-run '~/.tmux/plugins/tpm/tpm'
-#-- </tpm> --
diff --git a/dots/tmux/.config/tmux/tmux.conf.j2 b/dots/tmux/.config/tmux/tmux.conf.j2
new file mode 100644
index 0000000..0794694
--- /dev/null
+++ b/dots/tmux/.config/tmux/tmux.conf.j2
@@ -0,0 +1,31 @@
+#-- <keybinds> --
+set -g prefix C-s
+
+set -g mode-keys vi
+bind-key -T copy-mode-vi 'v' send -X begin-selection
+bind-key -T copy-mode-vi 'C-v' send -X rectangle-toggle
+bind-key -T copy-mode-vi 'y' send -X copy-selection
+
+unbind r
+bind r source-file ~/.config/tmux/tmux.conf
+
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
+#-- </keybinds> --
+
+#-- <plugins> --
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+#-- </plugins> --
+
+#-- <theme> --
+{{ theme.tmux.plugin.line }}
+{{ theme.tmux.plugin.conf }}
+#-- </theme> --
+
+#-- <tpm> --
+# keep at bottom
+run '~/.tmux/plugins/tpm/tpm'
+#-- </tpm> --
diff --git a/dots/zed/.config/zed/settings.json.j2 b/dots/zed/.config/zed/settings.json.j2
index 231dedf..e438a5f 100644
--- a/dots/zed/.config/zed/settings.json.j2
+++ b/dots/zed/.config/zed/settings.json.j2
@@ -15,8 +15,8 @@
     "ui_font_size": {{ theme.zed.font.size }},
     "tab_size": {{ editorconfig.tab_width }},
     "buffer_font_size": {{ theme.zed.font.size }},
-    "ui_font_family": "{{ theme.zed.font }}",
-    "buffer_font_family": "{{ theme.zed.font }}",
+    "ui_font_family": "{{ theme.zed.font.name }}",
+    "buffer_font_family": "{{ theme.zed.font.name }}",
     // -- </text> --
 
     // -- <theme> --
-- 
cgit v1.2.3-70-g09d2