diff --git a/flake.lock b/flake.lock
index a43ea0f..0dab586 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1612191125,
-        "narHash": "sha256-sqeVW5mIpxcbGL5od8kGxH5gAkimOEJjss2ZvsW9mLQ=",
+        "lastModified": 1612396114,
+        "narHash": "sha256-W9B49pT2/Zzjd5GsGmjxCHcWdmBDTUVKdLrocGxA/Sc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0fa2b16a0714e35f472d17dc707ee130a269123f",
+        "rev": "3f2f7f8efa57cb820d947b07a5a513764a45b462",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1611383797,
-        "narHash": "sha256-FIpG2f4+d9UsXCogBTswoPjD/aWZ3dvV5TZjqlL4gyM=",
+        "lastModified": 1612300919,
+        "narHash": "sha256-+R4qzU4y/pK7LAg+MSd6JxHxbEqCXOuk8Y3xhOWWmmE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a0d8383c422f85f37fccee5af74b1cb4b52287d9",
+        "rev": "d6a123118152f766cb87983ed60b9a0094fa4306",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1612105129,
-        "narHash": "sha256-F8vlMh3lnadePP4gcdqxGNfvP2jRqDxwZamVhPfD0Zk=",
+        "lastModified": 1612369752,
+        "narHash": "sha256-JtncDAt+qqUvdaIEpXmLXveu/AeXOPOYGDbpPoG2zgA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ff6700bb824a6d824fa021550a5596f6c3f64e7",
+        "rev": "7cbec40a09533dd9c525d6ab94dddfe77768101a",
         "type": "github"
       },
       "original": {
diff --git a/home/init.vim b/home/init.vim
index 3e2f62e..0cb4b79 100644
--- a/home/init.vim
+++ b/home/init.vim
@@ -8,13 +8,11 @@
  set ignorecase
  set incsearch
  set laststatus=2
- set modelines=0
  set mouse=a
  set nocompatible
  set noswapfile
  set number relativenumber
  set pastetoggle=<F3>
- set ruler
  set shiftwidth=2
  set showcmd
  set showmode
@@ -29,12 +27,13 @@
  " Search down into subfolders
  " Provides tab-completion for all file-related tasks
  set path+=**
+
  filetype plugin indent on
 
  " Enable folding with the spacebar
  nnoremap <space> za
 
- " replace visually selected
+ " Replace visually selected
  vnoremap <C-r> "hy:%s/<C-r>h//g<left><left>
 
  " Custom Commands
@@ -53,7 +52,7 @@
  noremap <Leader>y "+y
  noremap <Leader>p "+p
 
- " yaml indentation
+ " Indent YAML
  au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
 
  " Python indentation
@@ -62,11 +61,11 @@
  syntax on
  colorscheme gruvbox
 
- " highlight red lines
+ " Highlight whitespace
  highlight ExtraWhitespace ctermbg=red guibg=red
  match ExtraWhitespace /\s\+$/
 
- " groovy syntax
+ " Groovy syntax
  au BufNewFile,BufRead *.groovy set tabstop=2 shiftwidth=2 expandtab
  au BufNewFile,BufRead Jenkinsfile setf groovy
  au BufNewFile,BufRead Jenkinsfile set tabstop=2 shiftwidth=2 expandtab
@@ -93,9 +92,8 @@
  let g:go_highlight_variable_assignments = 1
  let g:go_highlight_variable_declarations = 1
  let g:go_rename_command = 'gopls'
- " golangcli-lint is currently not working
- " let g:go_metalinter_autosave=1
- " let g:go_metalinter_autosave_enabled=['golint', 'govet']
+ let g:go_metalinter_autosave=1
+ let g:go_metalinter_autosave_enabled=['golint', 'govet']
 
  " vim-terraform
  let g:terraform_align=1