diff --git a/home/common/default.nix b/home/common/default.nix
index 1a850ed..4f02d05 100644
--- a/home/common/default.nix
+++ b/home/common/default.nix
@@ -55,7 +55,7 @@
     lazygit
     links2
     liquidprompt
-    # lunarvim
+    lunarvim
     mdcat
     moreutils
     mosh
diff --git a/home/common/neovim.nix b/home/common/neovim.nix
index d9b5593..95db5a4 100644
--- a/home/common/neovim.nix
+++ b/home/common/neovim.nix
@@ -1,37 +1,63 @@
 { config, pkgs, ... }: {
-  programs.nixvim = {
+  programs.neovim = {
     enable = true;
-    defaultEditor = true;
+    defaultEditor = false;
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
-    colorschemes.dracula.enable = true;
-    plugins = {
-      # LazyVim.enable = true;
-      # ansible-vim.enable = true;
-      # aurora.enable = true;
-      # vim-airline-themes.enable = true;
-      # vim-github-dashboard.enable = true;
-      # vim-misc.enable = true;
-      # vimwiki.enable = true;
-      airline.enable = true;
-      bufferline.enable = true;
-      fugitive.enable = true;
-      gitgutter.enable = true;
-      lazygit.enable = true;
-      nix.enable = true;
-      tmux-navigator.enable = true;
-      vimux.enable = true;
-      # extraPlugins = with pkgs.vimPlugins [
-        # CheckAttach
-        # Recover-vim.enable
-        # Shade-nvim.enable
-        # SpaceCamp.enable
-        # ale.enable
-        # vim-markdown.enable
-        # vim-tmux.enable
-      # ];
-    };
+    extraConfig = ''
+      colorscheme dracula
+      set backspace="indent,eol,start"
+      set autoindent
+      set expandtab
+      set tabstop=2
+      set shiftwidth=2
+      set history=50
+      set ruler
+      set showcmd
+      set incsearch
+      set hlsearch
+      set nospell
+      set modeline
+      set wildmode=longest:full
+      set wildmenu
+      set scrolloff=2
+      set number
+      set list
+      "set listchars="eol:⏎,tab:␉·,trail:␠,nbsp:⎵"
+      set background=dark
+      set laststatus=2
+      set t_Co=256
+      let g:ale_linters = { 'nix': ['statix']}
+      let g:vimwiki_list = [{'path': '~/org/', 'syntax': 'markdown', 'ext': '.md'}]
+      let g:vimwiki_global_ext = 0
+      let g:vimwiki_fold_blank_lines = 0
+    '';
+    plugins = with pkgs.vimPlugins; [
+      CheckAttach
+      Recover-vim
+      Shade-nvim # color
+      SpaceCamp # color
+      #YouCompleteMe
+      ale
+      ansible-vim
+      aurora # color
+      dracula-nvim
+      lazygit-nvim
+      vim-airline
+      vim-airline-themes
+      vim-bufferline
+      vim-fugitive
+      vim-gitgutter
+      vim-github-dashboard
+      vim-markdown
+      vim-misc
+      vim-nix
+      vim-tmux
+      vim-tmux-navigator
+      vimwiki
+      vimux
+    ];
   };
   imports = [ ./bufferline.nix ];
 }