kanagawa

lazy-lock.json

@@ -4,9 +4,10 @@
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" },
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "grug-far.nvim": { "branch": "main", "commit": "b7c2b28e49d55ff71cd9bb3ad19a2021316510d8" },
-  "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
+  "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" },
   "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "mini.ai": { "branch": "main", "commit": "40e380a589d07ec2c856940c6422aafe5d949a0d" },
@@ -14,9 +15,9 @@
   "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d78f318d71d504b183ea9db26907eab740e06dd6" },
+  "nvim-lspconfig": { "branch": "master", "commit": "dcf511d53fae9675c6fde4241d94b2daaa5e0cd5" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "7821feb7e7d55a76b7ffeeb6b0bfb7b8f499ce94" },
+  "nvim-treesitter": { "branch": "master", "commit": "4f04fb7027ce786ac4adfd1c629ca40aea96ffec" },
   "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },

lua/plugins/editing.lua

@@ -69,8 +69,8 @@ return {
             vim.keymap.set('n', '<leader>cr', builtin.lsp_references, { desc = 'Telescope lsp references' })
             vim.keymap.set('n', '<leader>cs', builtin.treesitter, { desc = 'Telescope treesitter' })
 
-            vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
-            vim.keymap.set('n', '<leader>fb', function()
+            vim.keymap.set('n', '<leader>fp', builtin.find_files, { desc = 'Telescope find in project' })
+            vim.keymap.set('n', '<leader>ff', function()
                 builtin.find_files({ cwd = utils.buffer_dir() })
             end, { desc = 'Telescope find in buffer dir' })
 

lua/plugins/tsdev.lua

@@ -15,7 +15,8 @@ return {
             "hrsh7th/cmp-path",
         },
         config = function()
-            require('cmp').setup({
+            local cmp = require('cmp')
+            cmp.setup({
                 completion = {
                     keyword_length = 1,
                     max_item_count = 6
@@ -24,6 +25,11 @@ return {
                     { name = "nvim_lsp", keyword_length = 1, max_item_count = 6 },
                     { name = "buffer",   keyword_length = 1, max_item_count = 6 },
                     { name = "path",     keyword_length = 1, max_item_count = 6 },
+                },
+                mapping = {
+                    ['<C-n>'] = cmp.mapping(cmp.mapping.select_next_item(), {'i', 'c'}),
+                    ['<C-p>'] = cmp.mapping(cmp.mapping.select_prev_item(), {'i', 'c'}),
+                    ['<CR>'] = cmp.mapping.confirm({ select = true }), -- accept currently selected item
                 }
             })
         end
@@ -40,6 +46,38 @@ return {
                 indent = { enable = true },  
             })
         end
-    }
+    },
+    {
+        'stevearc/conform.nvim',
+        opts = {},
+        config = function()
+            local conform = require('conform')
+            conform.setup({
+                formatters_by_ft = {
+                    -- lua = { "stylua" },
+                    -- Conform will run multiple formatters sequentially
+                    -- python = { "isort", "black" },
+                    -- You can customize some of the format options for the filetype (:help conform.format)
+                    -- rust = { "rustfmt", lsp_format = "fallback" },
+                    -- Conform will run the first available formatter
+                    javascript = { "prettierd" },
+                    typescript = { "prettierd" },
+                    css = { "prettierd" },
+                    less = { "prettierd" },
+                    html = { "prettierd" },
+                },
+            })
+
+            vim.keymap.set("n", "==", function()
+                conform.format({async = true, lsp_format = "fallback"})
+            end, { desc = "Conform format" })
+
+            vim.keymap.set("v", "=", function()
+                conform.format({async = true, lsp_format = "fallback"})
+                vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<Esc>", true, false, true), "n", true)
+            end, { desc = "Conform format" })
+        end
+    }
+
 }
 

lua/plugins/visuals.lua

@@ -1,11 +1,16 @@
 return {
+    -- {
+    --     "ellisonleao/gruvbox.nvim",
+    --     config = function()
+    --         vim.cmd([[colorscheme gruvbox]])
+    --     end
+    -- },
     {
-        "ellisonleao/gruvbox.nvim",
+        "rebelot/kanagawa.nvim",
         config = function()
-            vim.cmd([[colorscheme gruvbox]])
+            vim.cmd [[colorscheme kanagawa]]
         end
-    },
-    {
+    }, {
         'akinsho/bufferline.nvim',
         version = "*",
         dependencies = 'nvim-tree/nvim-web-devicons',