diff --git a/home/code.nix b/home/code.nix
index b5950fb..abc6f60 100644
--- a/home/code.nix
+++ b/home/code.nix
@@ -22,9 +22,9 @@
       set wildmode=longest:full,full
 
       " remapping popup menu (command autocompletion)
-      cnoremap <expr> <up> pumvisible() ? "<C-p>" : "<up>
-      cnoremap <expr> <down> pumvisible() ? "<C-n>" : "<down>"
-      cnoremap <expr> <CR> pumvisible()? "<C-e>":"<CR>"
+"      cnoremap <expr> <up> pumvisible() ? "<C-p>" : "<up>
+"      cnoremap <expr> <down> pumvisible() ? "<C-n>" : "<down>"
+"      cnoremap <expr> <CR> pumvisible() ? "<C-e>":"<CR>"
       " set line numbers
       set number
 
@@ -61,6 +61,10 @@
       " Highlight row and column
       set cul
       set cuc
+
+      " Fix for code not being aligned if between comment blocks
+      set cindent cinkeys-=0#
+      set expandtab shiftwidth=4 tabstop=4 softtabstop=4
     '';
 
     viAlias  = true;
@@ -76,6 +80,9 @@
       vim-signify 
       nerdtree
       vim-easy-align
+      vim-fugitive
+      vim-yaml
+      vim-autoformat
     ];
   };