diff --git a/home-manager/features/neovim/config/ftplugin/lua.vim b/home-manager/features/neovim/config/ftplugin/lua.vim
deleted file mode 100644
index 22f747d..0000000
--- a/home-manager/features/neovim/config/ftplugin/lua.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set shiftwidth=4
-set tabstop=4
-set softtabstop=4
diff --git a/home-manager/features/neovim/config/lua/config/keymaps.lua b/home-manager/features/neovim/config/lua/config/keymaps.lua
index 2c134f7..8b66959 100644
--- a/home-manager/features/neovim/config/lua/config/keymaps.lua
+++ b/home-manager/features/neovim/config/lua/config/keymaps.lua
@@ -1,3 +1,8 @@
 -- Keymaps are automatically loaded on the VeryLazy event
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
+
+vim.keymap.set("n", "<C-up>", "<C-w>k", { noremap = true, silent = true })
+vim.keymap.set("n", "<C-down>", "<C-w>j", { noremap = true, silent = true })
+vim.keymap.set("n", "<C-left>", "<C-w>h", { noremap = true, silent = true })
+vim.keymap.set("n", "<C-right>", "<C-w>l", { noremap = true, silent = true })
diff --git a/home-manager/features/neovim/config/lua/plugins/mini.lua b/home-manager/features/neovim/config/lua/plugins/mini.lua
new file mode 100644
index 0000000..e4e0518
--- /dev/null
+++ b/home-manager/features/neovim/config/lua/plugins/mini.lua
@@ -0,0 +1,10 @@
+return {
+  {
+    "echasnovski/mini.surround",
+    enable = true,
+  },
+  {
+    "echasnovski/mini.comment",
+    enable = true,
+  },
+}