3 files changed, 13 insertions, 10 deletions
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>")