Fix theming stuff

5 files changed, 27 insertions, 36 deletions

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.j2
index 7a1fab5..0794694 100644
--- a/dots/tmux/.config/tmux/tmux.conf
+++ b/dots/tmux/.config/tmux/tmux.conf.j2
@@ -21,8 +21,8 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
 #-- </plugins> --
 
 #-- <theme> --
-set -g @plugin 'egel/tmux-gruvbox'
-set -g @tmux-gruvbox 'dark'
+{{ theme.tmux.plugin.line }}
+{{ theme.tmux.plugin.conf }}
 #-- </theme> --
 
 #-- <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> --