chore: change ui configuration for nvim and add natural text in wezterm

miszo · Sep 26, 2024 · 1daa93e · 1daa93e
1 parent c336ac6
commit 1daa93e
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 9 deletions.
diff --git a/home/dot_config/exact_nvim/exact_lua/exact_plugins/colorscheme.lua b/home/dot_config/exact_nvim/exact_lua/exact_plugins/colorscheme.lua
@@ -5,24 +5,39 @@ return {
     name = 'catppuccin',
     priority = 1000,
     config = function(_, opts)
-      table.insert(opts.integrations, {
-        harpoon = true,
+      local colors = require('catppuccin.palettes').get_palette()
+      opts.flavour = 'mocha'
+      opts.transparent_background = true
+
+      opts.integrations = opts.integrations or {}
+      opts.integrations = vim.tbl_deep_extend('force', opts.integrations, {
+        cmp = true,
+        fidget = true,
         grug_far = true,
+        harpoon = true,
         neotree = true,
-        which_key = false,
+        navic = {
+          enabled = true,
+          custom_bg = colors.mantle,
+        },
         telescope = {
           enabled = true,
           style = 'nvchad',
         },
+        which_key = true,
       })
+
+      opts.highlight_overrides = opts.highlight_overrides or {}
       opts.highlight_overrides = {
-        mocha = function(mocha)
+        all = function(c)
           return {
-            PackageInfoOutdatedVersion = { fg = mocha.peach },
-            PackageInfoUptodateVersion = { fg = mocha.green },
+            TelescopeSelection = { bg = c.surface0 },
+            PackageInfoOutdatedVersion = { fg = c.peach },
+            PackageInfoUptodateVersion = { fg = c.green },
           }
         end,
       }
+
       require('catppuccin').setup(opts)
       vim.cmd.colorscheme('catppuccin-mocha')
     end,

diff --git a/home/dot_config/exact_nvim/exact_lua/exact_plugins/ui.lua b/home/dot_config/exact_nvim/exact_lua/exact_plugins/ui.lua
@@ -59,15 +59,15 @@ return {
     event = 'BufReadPre',
     priority = 1200,
     config = function()
-      local colors = require('catppuccin.palettes').get_palette('mocha')
+      local colors = require('catppuccin.palettes').get_palette()
       require('incline').setup({
         highlight = {
           groups = {
             InclineNormal = { guibg = colors.surface0, guifg = colors.lavender },
-            InclineNormalNC = { guibg = 'none', guifg = colors.overlay2 },
+            InclineNormalNC = { guibg = colors.none, guifg = colors.overlay2 },
           },
         },
-        window = { margin = { vertical = 0, horizontal = 1 } },
+        window = { margin = { vertical = 0, horizontal = 0 } },
         hide = {
           cursorline = true,
         },
@@ -86,14 +86,31 @@ return {
   -- buffer line
   {
     'akinsho/bufferline.nvim',
+    dependencies = { 'catppuccin/nvim' },
     event = 'VeryLazy',
     opts = function(_, opts)
+      opts.options = opts.options or {}
       opts.options = vim.tbl_extend('force', opts.options, {
         show_buffer_close_icons = false,
         show_close_icon = false,
         separator_style = 'slant',
         always_show_bufferline = true,
       })
+
+      opts.highlights = opts.highlights or {}
+      local colors = require('catppuccin.palettes').get_palette()
+      local separator_fg = colors.surface0
+      opts.highlights = require('catppuccin.groups.integrations.bufferline').get({
+        custom = {
+          all = {
+            fill = { fg = colors.overlay2, bg = colors.surface0 },
+            separator = { fg = separator_fg, bg = colors.none },
+            separator_visible = { fg = separator_fg, bg = colors.none },
+            separator_selected = { fg = separator_fg, bg = colors.none },
+            offset_separator = { fg = separator_fg, bg = colors.none },
+          },
+        },
+      })
     end,
   },
 

diff --git a/home/dot_config/exact_wezterm/exact_config/keys.lua b/home/dot_config/exact_wezterm/exact_config/keys.lua
@@ -78,6 +78,13 @@ function M.setup(config)
     { key = 'j', mods = 'CTRL', action = act.EmitEvent('ActivatePaneDown') },
     { key = 'k', mods = 'CTRL', action = act.EmitEvent('ActivatePaneUp') },
     { key = 'l', mods = 'CTRL', action = act.EmitEvent('ActivatePaneRight') },
+
+    { mods = 'OPT', key = 'LeftArrow', action = act.SendString('\x1b\x62') },
+    { mods = 'OPT', key = 'RightArrow', action = act.SendString('\x1b\x66') },
+    { mods = 'OPT', key = 'Backspace', action = act.SendString('\x17') },
+    { mods = 'CMD', key = 'LeftArrow', action = act.SendString('\x1bOH') },
+    { mods = 'CMD', key = 'RightArrow', action = act.SendString('\x1bOF') },
+    { mods = 'CMD', key = 'Backspace', action = act.SendString('\x15') },
   }
 end
 

diff --git a/home/dot_config/exact_wezterm/wezterm.lua b/home/dot_config/exact_wezterm/wezterm.lua
@@ -34,6 +34,9 @@ config.window_padding = {
 config.window_decorations = 'RESIZE'
 config.window_close_confirmation = 'AlwaysPrompt'
 
+config.window_background_opacity = 0.9
+config.macos_window_background_blur = 80
+
 config.mouse_bindings = {
   -- Ctrl-click will open the link under the mouse cursor
   {