From c8bbebcb6ee2b9b90b0b30bd684225a44f2ac3d9 Mon Sep 17 00:00:00 2001
From: Maciej Jur <maciej@kamoshi.org>
Date: Thu, 29 Feb 2024 17:36:00 +0100
Subject: [PATCH] nvim: refactor config

---
 nvim/lazy-lock.json         |  10 ++--
 nvim/lua/config/keymaps.lua |   1 +
 nvim/lua/config/plugins.lua | 113 +++++++++++++++---------------------
 3 files changed, 52 insertions(+), 72 deletions(-)

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 4e7be90..f9b9b1b 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -9,24 +9,24 @@
   "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
   "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
   "haskell-tools.nvim": { "branch": "master", "commit": "217cb7958ebbebf360f7c43efd5129e66d748042" },
-  "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" },
+  "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" },
   "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
   "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
   "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "f3941c57ec85d7bdb44fa53fd858fd80f159018f" },
-  "neodev.nvim": { "branch": "main", "commit": "3157f2e876fd6223d36cfa76bee4709247d62fa5" },
+  "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
   "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" },
   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
   "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" },
   "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
   "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" },
   "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
-  "nvim-treesitter": { "branch": "master", "commit": "18aa5ae3fd7245137bc41b5348102fe254405509" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" },
+  "nvim-treesitter": { "branch": "master", "commit": "62b0bb4f24ad09f535efe44cc9d088f90dcd2498" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" },
   "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" },
   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
   "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" },
diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua
index b084f14..29a9fb7 100644
--- a/nvim/lua/config/keymaps.lua
+++ b/nvim/lua/config/keymaps.lua
@@ -43,6 +43,7 @@ local function insert_date()
 end
 
 n '<Leader>xd' (insert_date) 'Execute: full date'
+v '<Leader>xs' ':sort<CR>'   'Execute: sort'
 
 
 -- Meta
diff --git a/nvim/lua/config/plugins.lua b/nvim/lua/config/plugins.lua
index 260d85c..1908e62 100644
--- a/nvim/lua/config/plugins.lua
+++ b/nvim/lua/config/plugins.lua
@@ -25,18 +25,10 @@ return {
     dependencies = {
       'nvim-tree/nvim-web-devicons',
     },
-    config = function()
-      local lualine = require 'lualine'
-
-      lualine.setup {
-        tabline = {
-          lualine_a = { 'buffers' },
-        }
-      }
-    end
+    config = true,
   },
 
-  -- Telescope
+  -- Fuzzy search
   {
     'nvim-telescope/telescope.nvim',
     enabled = is 'standalone',
@@ -120,10 +112,8 @@ return {
         incremental_selection = {
           enable = true,
           keymaps = {
-            init_selection    = '<CR>',
-            scope_incremental = '<CR>',
-            node_incremental  = '<TAB>',
-            node_decremental  = '<S-TAB>',
+            node_incremental  = 'v',
+            node_decremental  = 'V',
           },
         },
         textobjects = {
@@ -156,6 +146,32 @@ return {
     end,
   },
 
+  -- Keymap hints
+  {
+    'folke/which-key.nvim',
+    enabled = is 'standalone',
+    init = function()
+      vim.o.timeout = true
+      vim.o.timeoutlen = 300
+    end,
+    config = true
+  },
+
+  -- Notifications
+  {
+    'rcarriga/nvim-notify',
+    enabled = is 'standalone',
+    config = function()
+      vim.notify = require 'notify'
+    end
+  },
+
+  -- Comments
+  {
+    'numToStr/Comment.nvim',
+    config = true,
+  },
+
   -- Git - file hunks
   {
     'lewis6991/gitsigns.nvim',
@@ -203,64 +219,27 @@ return {
     end
   },
 
-  {
-    dir = '~/Desktop/disasm.nvim',
-    ft = { 'c' },
-    config = function()
-      local disasm = require 'disasm'
-
-      n '<Leader>a'  (disasm.disassemble)       'Disasm: Disassemble'
-      n '<Leader>Af' (disasm.disassemble_full)  'Disasm: Disassemble full'
-      n '<Leader>Ac' (disasm.reconfigure)       'Disasm: Configure'
-      n '<Leader>AC' (disasm.save_config)       'Disasm: Save config'
-
-      disasm.setup()
-    end
-  },
-
-  -- Comments
-  {
-    'numToStr/Comment.nvim',
-    config = true,
-  },
-
+  -- Color hints
   {
     'NvChad/nvim-colorizer.lua',
+    ft = { 'css', 'scss' },
     config = true,
   },
 
-  -- Shortcut hints
-  {
-    'folke/which-key.nvim',
-    enabled = is 'standalone',
-    event = 'VeryLazy',
-    init = function()
-      vim.o.timeout = true
-      vim.o.timeoutlen = 300
-    end,
-    opts = {}
-  },
-
-  -- Notifications
-  {
-    'rcarriga/nvim-notify',
-    enabled = is 'standalone',
-    config = function()
-      vim.notify = require 'notify'
-    end
-  },
-
-  -- File tree
-  {
-    'nvim-neo-tree/neo-tree.nvim',
-    enabled = is 'standalone',
-    branch = 'v3.x',
-    dependencies = {
-      'nvim-lua/plenary.nvim',
-      'nvim-tree/nvim-web-devicons',
-      'MunifTanjim/nui.nvim',
-    },
-  },
+  -- {
+  --   dir = '~/Desktop/disasm.nvim',
+  --   ft = { 'c' },
+  --   config = function()
+  --     local disasm = require 'disasm'
+  --
+  --     n '<Leader>a'  (disasm.disassemble)       'Disasm: Disassemble'
+  --     n '<Leader>Af' (disasm.disassemble_full)  'Disasm: Disassemble full'
+  --     n '<Leader>Ac' (disasm.reconfigure)       'Disasm: Configure'
+  --     n '<Leader>AC' (disasm.save_config)       'Disasm: Save config'
+  --
+  --     disasm.setup()
+  --   end
+  -- },
 
   -- Snippet engine
   {