More configuration of nvim

6 files changed, 23 insertions, 21 deletions

diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua
index 045dba1..1da43a0 100644
--- a/.config/nvim/after/plugin/lsp.lua
+++ b/.config/nvim/after/plugin/lsp.lua
@@ -5,10 +5,13 @@ lsp.preset("recommended")
 lsp.ensure_installed({
     "cssls",
     "dockerls",
+    "eslint",
     "html",
     "jsonls",
-    "phpactor",
     "lua_ls",
+    "marksman",
+    "phpactor",
+    "rust_analyzer",
     "tailwindcss",
 })
 
diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua
index 0be7a8f..a70b39a 100644
--- a/.config/nvim/after/plugin/treesitter.lua
+++ b/.config/nvim/after/plugin/treesitter.lua
@@ -6,13 +6,14 @@ require("nvim-treesitter.configs").setup {
         "css",
         "dockerfile",
         "gitignore",
-        "help",
         "html",
         "javascript",
         "json",
         "lua",
         "markdown",
         "php",
+        "rust",
+        "toml",
         "typescript",
         "yaml",
     },
diff --git a/.config/nvim/lua/dts/init.lua b/.config/nvim/lua/dts/init.lua
index dab3d06..9b9a433 100644
--- a/.config/nvim/lua/dts/init.lua
+++ b/.config/nvim/lua/dts/init.lua
@@ -1,3 +1,3 @@
--- require("dts.packer")
+require("dts.packer")
 require("dts.set")
 require("dts.remap")
diff --git a/.config/nvim/lua/dts/packer.lua b/.config/nvim/lua/dts/packer.lua
index 739fb79..c6f61ed 100644
--- a/.config/nvim/lua/dts/packer.lua
+++ b/.config/nvim/lua/dts/packer.lua
@@ -84,8 +84,5 @@ return require("packer").startup(function(use)
         tag = "v3.*",
         requires = {"nvim-tree/nvim-web-devicons"},
     }
-
-    -- Mappings for [b and other handy ones.
-    use "tpope/vim-unimpaired"
 end)
 
diff --git a/.config/nvim/lua/dts/remap.lua b/.config/nvim/lua/dts/remap.lua
index 42691bb..d9885de 100644
--- a/.config/nvim/lua/dts/remap.lua
+++ b/.config/nvim/lua/dts/remap.lua
@@ -56,9 +56,15 @@ vim.keymap.set("n", "<leader>l", function()
 end)
 
 -- Move between buffers
-vim.keymap.set("n", "<A-,>", ":bprevious<CR>")
-vim.keymap.set("n", "<A-.>", ":bnext<CR>")
-vim.keymap.set("n", "<A-/>", ":bdelete<CR>")
-vim.keymap.set("i", "<A-,>", "<Esc>:bprevious<CR>")
-vim.keymap.set("i", "<A-.>", "<Esc>:bnext<CR>")
-vim.keymap.set("i", "<A-/>", "<Esc>:bdelete<CR>")
+vim.keymap.set("n", "[b", ":bprevious<CR>")
+vim.keymap.set("n", "]b", ":bnext<CR>")
+-- Close current buffer.
+vim.keymap.set("n", "<leader>c", ":bdelete<CR>")
+vim.keymap.set("n", ">b", function()
+    require("dts.utils.buffer").move(vim.v.count > 0 and vim.v.count or 1)
+end)
+vim.keymap.set("n", "<b", function()
+    require("dts.utils.buffer").move(-(vim.v.count > 0 and vim.v.count or 1))
+end)
+ -- Force close current buffer.
+vim.keymap.set("n", "<leader>C", ":bdelete!<CR>")
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index 28c49d8..55ed774 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -196,11 +196,6 @@ _G.packer_plugins = {
     path = "/home/david/.local/share/nvim/site/pack/packer/start/vim-pasta",
     url = "https://github.com/sickill/vim-pasta"
   },
-  ["vim-unimpaired"] = {
-    loaded = true,
-    path = "/home/david/.local/share/nvim/site/pack/packer/start/vim-unimpaired",
-    url = "https://github.com/tpope/vim-unimpaired"
-  },
   ["vim-visual-star-search"] = {
     loaded = true,
     path = "/home/david/.local/share/nvim/site/pack/packer/start/vim-visual-star-search",
@@ -209,14 +204,14 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: nvim-autopairs
-time([[Config for nvim-autopairs]], true)
-try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
-time([[Config for nvim-autopairs]], false)
 -- Config for: splitjoin.vim
 time([[Config for splitjoin.vim]], true)
 try_loadstring("\27LJ\2\n¨\1\0\0\2\0\5\0\r6\0\0\0009\0\1\0)\1\1\0=\1\2\0006\0\0\0009\0\1\0)\1\1\0=\1\3\0006\0\0\0009\0\1\0)\1\1\0=\1\4\0K\0\1\0$splitjoin_php_method_chain_full\29splitjoin_trailing_comma2splitjoin_html_attributes_bracket_on_new_line\6g\bvim\0", "config", "splitjoin.vim")
 time([[Config for splitjoin.vim]], false)
+-- Config for: nvim-autopairs
+time([[Config for nvim-autopairs]], true)
+try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
+time([[Config for nvim-autopairs]], false)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then