diff --git a/home/common/default.nix b/home/common/default.nix
index 9b17c8d..e81439f 100644
--- a/home/common/default.nix
+++ b/home/common/default.nix
@@ -1,6 +1,5 @@
 { config, pkgs, inputs, osConfig, outputs, ... }: {
   imports = [
-    inputs.nixvim.homeManagerModules.nixvim
     ./aerc.nix
     ./bash.nix
     ./btop.nix
@@ -15,8 +14,8 @@
     ./mail.nix
     ./mopidy.nix
     ./naviterm.nix
-    ./neovim.nix
     ./newsboat.nix
+    ./nixvim.nix
     ./ssh.nix
     ./taskwarrior.nix
     ./topgrade.nix
@@ -63,7 +62,6 @@
     lazygit
     links2
     liquidprompt
-    lunarvim
     lynx
     mdcat
     moreutils
@@ -84,6 +82,7 @@
     socat
     sqlite
     tailscale
+    termshark
     tig
     topgrade
     trippy
diff --git a/home/common/nixvim.nix b/home/common/nixvim.nix
new file mode 100644
index 0000000..d3a1877
--- /dev/null
+++ b/home/common/nixvim.nix
@@ -0,0 +1,50 @@
+{ config, pkgs, nixvim, ... }: {
+  programs = {
+    ripgrep.enable = true;
+    nixvim = {
+      enable = true;
+      defaultEditor = true;
+      colorschemes.dracula.enable = true;
+      plugins = {
+        airline.enable = true;
+        alpha = {
+          enable = true;
+          theme = "dashboard";
+        };
+        bufferline.enable = true;
+        cmp-buffer.enable = true;
+        cmp-nvim-lsp.enable = true;
+        cmp-path.enable = true;
+        cmp_luasnip.enable = true;
+        comment.enable = true;
+        friendly-snippets.enable = true;
+        gitsigns.enable = true;
+        indent-blankline.enable = true;
+        lazy.enable = true;
+        lazygit.enable = true;
+        lsp = {
+          servers = {
+            bashls.enable = true;
+            html.enable = true;
+            lua_ls.enable = true;
+            markdown_oxide.enable = true;
+            nixd.enable = true;
+            perlls.enable = true;
+            pylsp.enable = true;
+            vimls.enable = true;
+          };
+        };
+        lualine.enable = true;
+        luasnip.enable = true;
+        neo-tree.enable = true;
+        nix.enable = true;
+        none-ls.enable = true;
+        nvim-autopairs.enable = true;
+        nvim-cmp.enable = true;
+        nvim-tree.enable = true;
+        project-nvim.enable = true;
+        telescope.enable = true;
+      };
+    };
+  };
+}
diff --git a/home/default.nix b/home/default.nix
index 6be33ca..6cd41cb 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -10,7 +10,11 @@
     backupFileExtension = "home-manager-backup";
     users = {
       don = {
-        imports = [ inputs.catppuccin.homeModules.catppuccin ./common ];
+        imports = [
+          inputs.catppuccin.homeModules.catppuccin
+          inputs.nixvim.homeManagerModules.nixvim
+          ./common
+        ];
         home = {
           username = "don";
           homeDirectory = "/home/don";