diff --git a/hosts/home.nix b/hosts/home.nix
index 5affe64..62e094b 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -19,7 +19,7 @@
 
 { 
   imports =                                   # Home Manager Modules
-#    (import ../modules/editors) ++
+    (import ../modules/editors) ++
     (import ../modules/programs) ++
     (import ../modules/services) ++
     (import ../modules/shell);
diff --git a/modules/editors/nvim/default.nix b/modules/editors/nvim/default.nix
index 59fa5d8..8ec1b7b 100644
--- a/modules/editors/nvim/default.nix
+++ b/modules/editors/nvim/default.nix
@@ -10,7 +10,7 @@
       enable = true;
       viAlias = true;
       vimAlias = true;
-#      defaultEditor = true;
+      vimdiffAlias = true;
 
       plugins = with pkgs.vimPlugins; [
 
@@ -34,8 +34,7 @@
         indent-blankline-nvim # Indentation lines
       ];
 
-      configure = {
-        customRC = ''
+      extraConfig = ''
           syntax enable                             " Syntax highlighting
           colorscheme srcery                        " Color scheme text
           let g:lightline = {
@@ -46,8 +45,10 @@
           
           set number                                " Set numbers
           nmap <F6> :NERDTreeToggle<CR>             " F6 opens NERDTree
-        '';
-       };
+          set expandtab
+          set shiftwidth=4
+          set tabstop=4
+      '';
     };
   };
 }