4 files changed, 26 insertions, 12 deletions
diff --git a/dot_config/nvim/init.lua.tmpl b/dot_config/nvim/init.lua.tmpl
index 2f6aa79..b395c97 100644
--- a/dot_config/nvim/init.lua.tmpl
+++ b/dot_config/nvim/init.lua.tmpl
@@ -59,10 +59,10 @@ local function smart_move(direction, vim_cmd)
   end
 end
 
-vim.keymap.set('n', '<D-h>', smart_move("left", "h"), { noremap = true, silent = false, desc = "Move to left windows" });
-vim.keymap.set('n', '<D-l>', smart_move("right", "l"), { noremap = true, silent = false, desc = "Move to right windows" });
-vim.keymap.set('n', '<D-j>', smart_move("down", "j"), { noremap = true, silent = false, desc = "Move to down window" });
-vim.keymap.set('n', '<D-k>', smart_move("up", "k"), { noremap = true, silent = false, desc = "Move to up window" });
+vim.keymap.set({ 'n', 'i', 'v' }, '<D-h>', smart_move("left", "h"), { noremap = true, silent = false, desc = "Move to left windows" });
+vim.keymap.set({ 'n', 'i', 'v' }, '<D-l>', smart_move("right", "l"), { noremap = true, silent = false, desc = "Move to right windows" });
+vim.keymap.set({ 'n', 'i', 'v' }, '<D-j>', smart_move("down", "j"), { noremap = true, silent = false, desc = "Move to down window" });
+vim.keymap.set({ 'n', 'i', 'v' }, '<D-k>', smart_move("up", "k"), { noremap = true, silent = false, desc = "Move to up window" });
 
 {{ end }}
 
diff --git a/dot_config/nvim/lua/plugins/catppuccin.lua b/dot_config/nvim/lua/plugins/catppuccin.lua
index b60a0e4..86af49a 100644
--- a/dot_config/nvim/lua/plugins/catppuccin.lua
+++ b/dot_config/nvim/lua/plugins/catppuccin.lua
@@ -6,7 +6,21 @@ return
   lazy = false,
   config = function()
     require("catppuccin").setup({
-      transparent_background = true,
+      transparent_background = false,
+
+      custom_highlights = function(colors)
+        return {
+          Normal = { bg = colors.base },
+          NormalNC = { bg = colors.mantle },
+
+          WinSeparator = { fg = colors.surface1, bg = colors.mantle },
+
+          StatusLine = { fg = colors.text, bg = colors.surface0 },
+          StatusLineNC = { fg = colors.overlay0, bg = colors.mantle },
+
+          CursorLine = { bg = colors.surface0 },
+        }
+      end
     })
 
     vim.cmd.colorscheme "catppuccin"
diff --git a/dot_config/nvim/lua/plugins/lualine.lua b/dot_config/nvim/lua/plugins/lualine.lua
index 71522da..588b264 100644
--- a/dot_config/nvim/lua/plugins/lualine.lua
+++ b/dot_config/nvim/lua/plugins/lualine.lua
@@ -3,9 +3,9 @@ return {
   dependencies = { 'nvim-tree/nvim-web-devicons' },
   config = function()
     require('lualine').setup({
-      -- options = {
-      --   theme = 'catppuccin'
-      -- },
+      options = {
+        theme = 'catppuccin-mocha'
+      },
     })
   end
 }
diff --git a/dot_config/nvim/lua/vim-options.lua b/dot_config/nvim/lua/vim-options.lua
index 60bc802..5b6e097 100644
--- a/dot_config/nvim/lua/vim-options.lua
+++ b/dot_config/nvim/lua/vim-options.lua
@@ -7,10 +7,10 @@ vim.opt.expandtab = true
 
 vim.opt.clipboard:append("unnamedplus")
 
-vim.cmd("highlight Normal guibg=none")
-vim.cmd("highlight NonText guibg=none")
-vim.cmd("highlight Normal ctermbg=none")
-vim.cmd("highlight NonText ctermbg=none")
+-- vim.cmd("highlight Normal guibg=none")
+-- vim.cmd("highlight NonText guibg=none")
+-- vim.cmd("highlight Normal ctermbg=none")
+-- vim.cmd("highlight NonText ctermbg=none")
 
 vim.o.winborder = 'rounded'