diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index 9c38b985..862ee142 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -11,38 +11,6 @@
         globals.mapleader = " ";
         globals.maplocalleader = " ";
 
-        keymaps = let
-            map = mode: key: action: { mode = mode; key = key; action = action; };
-            nmap = key: action: map [ "n" ] key action;
-            nvmap = key: action: map [ "n" "v" ] key action;
-            imap = key: action: map [ "i" ] key action;
-            desc = d: { options.desc = d; };
-            silent = { options.silent = true; };
-            expr = { options.expr = true; };
-        in [
-            # Unmap keys that aren't useful, or that we want to use for different things
-            (nvmap "<Space>" "<Nop>" // silent)
-            (nvmap "<Cr>" "<Nop>" // silent)
-            (nvmap "s" "<Nop>" // silent)
-            # Leave insert mode by pressing j and k simultaneously
-            (imap "jk" "<Esc>")
-            (imap "kj" "<Esc>")
-            # Redo
-            (nmap "R" "<C-r>")
-            # Copy and paste
-            (nvmap "<leader>y" "\"+y" // desc "Cop[y] to clipboard")
-            (nvmap "<leader>p" "\"+p" // desc "[P]aste from clipboard")
-            # Jump to start/end of line
-            (nvmap "H" "0")
-            (nvmap "L" "$")
-            # Navigate up and down word wrapped text as if it were not word wrapped
-            (nmap "k" "v:count == 0 ? 'gk' : 'k'" // silent // expr)
-            (nmap "j" "v:count == 0 ? 'gj' : 'j'" // silent // expr)
-            # Center cursor when jumping foward or back
-            (nmap "<C-o>" "<C-o>zz")
-            (nmap "<C-i>" "<C-i>zz")
-        ];
-
         options = {
             number = true;
             shiftwidth = 2;
@@ -50,16 +18,16 @@
             breakindent = true;
             colorcolumn = "100";
             # This is the default value. `:help cot` to see the available options.
-            # completeopt = "menu,preview";
+            completeopt = "menu,preview";
             cursorline = true;
         };
         plugins = {
             treesitter.enable = true;
             lualine.enable = true;
-            # luasnip.enable = true;
-            # nix.enable = true;
-            # nix-develop.enable = true;
-            # bufferline.enable = true;
+            luasnip.enable = true;
+            nix.enable = true;
+            nix-develop.enable = true;
+            bufferline.enable = true;
             which-key.enable = true;
             intellitab.enable = true;
             # illuminate.enable = true;