Update nvim config.

3 files changed, 31 insertions, 20 deletions

diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua
index fe67aa4..10601be 100644
--- a/configs/nvim/init.lua
+++ b/configs/nvim/init.lua
@@ -22,10 +22,10 @@ vim.opt.number = true;
 vim.keymap.set('t', '<esc>', [[<C-\><C-n>]])
 
 if vim.g.neovide then
-    vim.opt.guifont = "FiraCodeNerdFont";
+    vim.opt.guifont = "FiraCode Nerd Font";
     vim.g.neovide_transparency = 0.95;
     vim.g.neovide_input_ime = false;
-    vim.g.neovide_cursor_vfx_mode = "railgun";
+    vim.g.neovide_cursor_vfx_mode = "ripple";
 end
 
 -- Init lazy.nvim
@@ -48,6 +48,15 @@ require("lazy").setup("plugins")
 -- setup nvim-tree
 require("nvim-tree").setup()
 
+local nvim_tree_api = require("nvim-tree.api")
+vim.keymap.set('n', '<leader>t', nvim_tree_api.tree.toggle, {})
+vim.api.nvim_create_autocmd("DirChanged", {
+    pattern = "global",
+    callback = function(args)
+        nvim_tree_api.tree.change_root(args.file)
+    end
+})
+
 -- setup lualine
 require('lualine').setup()
 
@@ -69,7 +78,10 @@ require("bufferline").setup {
 require('gitsigns').setup()
 
 -- setup toggleterm
-require("toggleterm").setup()
+require("toggleterm").setup {
+    open_mapping = "<C-`>",
+    start_in_insert = false,
+}
 
 -- setup autopairs
 require("nvim-autopairs").setup {}
@@ -222,10 +234,10 @@ require("trouble").setup()
 
 -- setup keymap for telescope
 local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+vim.keymap.set('n', '<leader>f', builtin.find_files, {})
+vim.keymap.set('n', '<leader>g', builtin.live_grep, {})
+vim.keymap.set('n', '<leader>b', builtin.buffers, {})
+vim.keymap.set('n', '<leader>h', builtin.help_tags, {})
 
 -- setup keymap fnamemodifyfor lsp
 
@@ -267,15 +279,9 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end,
 })
 
--- My keymaps
-vim.keymap.set('n', '<C-`>', '<cmd>ToggleTerm<CR>', {})
+require("catppuccin").setup{
+    flavour = "mocha"
+}
 
-local nvim_tree_api = require("nvim-tree.api")
-vim.keymap.set('n', '<leader>t', nvim_tree_api.tree.toggle, {})
-vim.api.nvim_create_autocmd("DirChanged", {
-    pattern = "global",
-    callback = function(args)
-        nvim_tree_api.tree.change_root(args.file)
-    end
-})
+vim.cmd.colorscheme "catppuccin"
 
diff --git a/configs/nvim/lazy-lock.json b/configs/nvim/lazy-lock.json
index fd7f936..5697abb 100644
--- a/configs/nvim/lazy-lock.json
+++ b/configs/nvim/lazy-lock.json
@@ -1,6 +1,7 @@
 {

   "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" },

   "bufferline.nvim": { "branch": "main", "commit": "9961d87bb3ec008213c46ba14b3f384a5f520eb5" },

+  "catppuccin": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" },

   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },

   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },

   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },

@@ -19,7 +20,5 @@
   "plenary.nvim": { "branch": "master", "commit": "a56bf0071bf63d35274fdc4738bb1e8821cfd2ea" },

   "telescope.nvim": { "branch": "master", "commit": "3d8e051c8c479c1e6e347bd9b1d3bdafdc4d5c5d" },

   "toggleterm.nvim": { "branch": "main", "commit": "f2c720746238bc3ec620fe4bf92b58368317c266" },

-  "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" },

-  "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },

-  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }

+  "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" }

 }
\ No newline at end of file
diff --git a/configs/nvim/lua/plugins/catppuccin-nvim.lua b/configs/nvim/lua/plugins/catppuccin-nvim.lua
new file mode 100644
index 0000000..87782a9
--- /dev/null
+++ b/configs/nvim/lua/plugins/catppuccin-nvim.lua
@@ -0,0 +1,6 @@
+return {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    priority = 1000
+}
+