nvim: refactors and many new plugins

common/nvim/lua/cc/packer.lua

@@ -5,21 +5,22 @@ local packer = require("packer")
 return packer.startup(function(use)
   use("wbthomason/packer.nvim")
 
-  use({
-    "nvim-telescope/telescope.nvim",
-    tag = "0.1.1",
-    requires = {
-      {"nvim-lua/plenary.nvim"},
-    },
-  })
+  -- {{{ color scheme
+  use("owozsh/amora")
+  -- }}}
+
+  -- {{{ treesitter
   use(
     "nvim-treesitter/nvim-treesitter",
     {run = ":TSUpdate"}
   )
+  use("nvim-treesitter/playground")
   use("nvim-treesitter/nvim-treesitter-context")
-  use("mbbill/undotree")
-  use("tpope/vim-fugitive")
+  use("windwp/nvim-ts-autotag")
+  use("m-demare/hlargs.nvim")
+  -- }}}
 
+  -- {{{ lsp
   use({
     "VonHeikemen/lsp-zero.nvim",
     branch = "v2.x",
@@ -40,17 +41,100 @@ return packer.startup(function(use)
       {"L3MON4D3/LuaSnip"},     -- Required
     },
   })
-
-  use("lukas-reineke/indent-blankline.nvim")
-  use("romgrk/barbar.nvim")
-  use("ntpeters/vim-better-whitespace")
-  use("nvim-tree/nvim-tree.lua")
-  use("andweeb/presence.nvim")
-
   use("jose-elias-alvarez/null-ls.nvim")
   use("MunifTanjim/prettier.nvim")
+  use("ray-x/lsp_signature.nvim")
+  -- }}}
 
+  -- {{{ misc
+  use({
+    "tpope/vim-fugitive",
+    config = function()
+      vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
+    end
+  })
+  use("lukas-reineke/indent-blankline.nvim")
+  use({
+    "ntpeters/vim-better-whitespace",
+    config = function()
+      vim.g.better_whitespace_enable = true
+      vim.g.strip_whitespace_on_save = true
+    end
+  })
+  use({
+    "andweeb/presence.nvim",
+    config = function()
+      vim.g.presence_buttons = false
+    end
+  })
+  use({
+    "NvChad/nvim-colorizer.lua",
+    config = function()
+      require("colorizer").setup()
+    end
+  })
+  use({
+    "yamatsum/nvim-cursorline",
+    config = function()
+      require("nvim-cursorline").setup({
+        cursorline = {
+          enable = false,
+        },
+        cursorword = {
+          enable = true,
+        },
+      })
+    end
+  })
+  use({
+    "sunjon/shade.nvim",
+    config = function()
+      require("shade").setup({
+        overlay_opacity = 25,
+      })
+    end
+  })
+  use({
+    "windwp/nvim-autopairs",
+    config = function()
+      require("nvim-autopairs").setup()
+    end
+  })
+  use("jghauser/mkdir.nvim")
+  use({
+    "kylechui/nvim-surround",
+    config = function()
+      require("nvim-surround").setup()
+    end
+  })
+  -- }}}
+
+  -- {{{ ui
+  use({
+    "nvim-telescope/telescope.nvim",
+    tag = "0.1.1",
+    requires = {
+      {"nvim-lua/plenary.nvim"},
+    },
+  })
+  use({
+    "mbbill/undotree",
+    config = function()
+      vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
+    end
+  })
+  use("romgrk/barbar.nvim")
+  use("nvim-tree/nvim-tree.lua")
   use("nvim-lualine/lualine.nvim")
+  use({
+    "folke/which-key.nvim",
+    config = function()
+      vim.o.timeout = true
+      vim.o.timeoutlen = 300
+      require("which-key").setup()
+    end
+  })
+  -- }}}
 
   -- this is only here to shut up the message on startup
   require("barbar").setup({

common/nvim/lua/cc/remap.lua

@@ -2,15 +2,18 @@ vim.g.mapleader = " "
 
 vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
 
-vim.keymap.set("!", "<C-f>", "<C-i>")
-vim.keymap.set("!", "<C-g>", "<C-d>")
-vim.keymap.set({"i", "v"}, "<Tab>", "<Esc>")
-vim.keymap.set("c", "<Tab>", "<C-c>")
+vim.keymap.set("i", "<C-f>", "<C-i>", {silent = true})
+vim.keymap.set("i", "<C-g>", "<C-d>", {silent = true})
+vim.keymap.set({"i", "v"}, "<Tab>", "<Esc>", {remap = true})
 
-vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
-vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-vim.keymap.set("v", "<S-Down>", ":m '>+1<CR>gv=gv")
-vim.keymap.set("v", "<S-Up>", ":m '<-2<CR>gv=gv")
+vim.keymap.set("v", "<S-Down>", ":m '>+1<CR>gv=gv", {silent = true})
+vim.keymap.set("v", "<S-Up>", ":m '<-2<CR>gv=gv", {silent = true})
+
+vim.keymap.set("i", "<S-Down>", "<Esc>:m+<CR>", {silent = true})
+vim.keymap.set("i", "<S-Up>", "<Esc>:m-2<CR>", {silent = true})
+
+vim.keymap.set("n", "<S-Down>", ":m+<CR>", {silent = true})
+vim.keymap.set("n", "<S-Up>", ":m-2<CR>", {silent = true})
 
 vim.keymap.set("n", "J", "mzJ`z")
 vim.keymap.set("n", "<C-d>", "<C-d>zz")
@@ -25,7 +28,8 @@ vim.keymap.set({"n", "v"}, "<leader>d", "\"_d")
 
 vim.keymap.set("n", "Q", "<nop>")
 
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<leader>s", [[:s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<leader>S", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
 
 vim.keymap.set("n", "<leader><leader>", function()
     vim.cmd("so")