diff --git a/.vimrc.settings b/.vimrc.settings
index 6ee1a2d3..63178416 100755
--- a/.vimrc.settings
+++ b/.vimrc.settings
@@ -44,6 +44,21 @@ set noshowmode
 set showtabline=1 "only show tabline when more than 1 tab
 set updatetime=300
 
+" Don't pass messages to |ins-completion-menu|.
+set shortmess+=c
+
+" Give more space for displaying messages.
+set cmdheight=2
+
+" Always show the signcolumn, otherwise it would shift the text each time
+" diagnostics appear/become resolved.
+if has("nvim-0.5.0") || has("patch-8.1.1564")
+    " Recently vim can merge signcolumn and number column into one
+    set signcolumn=number
+else
+    set signcolumn=yes
+endif
+
 " exclude quickfix from the buffers list
 augroup qf
     autocmd!
diff --git a/flake.nix b/flake.nix
index 49234f49..821588d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,10 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.users.cyryl = import ./nixos/home-manager;
+          home-manager.users.cyryl = {
+            imports =  [ ./nixos/home-manager ];
+            _module.args.inputs = inputs;
+          };
         }
 
       ];
diff --git a/nixos/boxes/skinnyv/default.nix b/nixos/boxes/skinnyv/default.nix
index df708d58..3c3247d5 100644
--- a/nixos/boxes/skinnyv/default.nix
+++ b/nixos/boxes/skinnyv/default.nix
@@ -4,12 +4,12 @@
 
   imports = [
     ./hardware-configuration.nix
+    ./tailscale-skinnyv.nix
     ../../boot.nix
     ../../common.nix
     ../../gfx-intel.nix
     ../../i3
     ../../tailscale.nix
-    ./tailscale-skinnyv.nix
     ../../distributed-builds.nix
     ../../gui
     ../../git
diff --git a/nixos/common.nix b/nixos/common.nix
index a1eea032..cbfc1c4b 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 {
   imports =
     [
@@ -52,7 +52,6 @@
       '';
     };
 
-
     system = {
       stateVersion = "20.03";
     };
diff --git a/nixos/home-manager/default.nix b/nixos/home-manager/default.nix
index 94ad9dfd..ce29c17a 100644
--- a/nixos/home-manager/default.nix
+++ b/nixos/home-manager/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   home.sessionVariables = {
diff --git a/nixos/home-manager/programs/vim.nix b/nixos/home-manager/programs/vim.nix
index bfa476e6..cbe20536 100644
--- a/nixos/home-manager/programs/vim.nix
+++ b/nixos/home-manager/programs/vim.nix
@@ -1,49 +1,53 @@
-{ config, pkgs, ... }:
-{
-  home.file.".vimrc".source = ../../../.vimrc.nixos;
-  home.packages = with pkgs; [
-    ripgrep
-  ];
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-    withNodeJs = true;
-    withPython3 = true;
-    withRuby = true;
-
-    plugins = with pkgs.vimPlugins; [
-      ack-vim
-      coc-highlight
-      coc-nvim
-      coc-rust-analyzer
-      ctrlp-vim
-      editorconfig-vim
-      fzf-vim
-      quickfix-reflector-vim
-      rainbow
-      tabular
-      vim-airline
-      vim-airline-themes
-      vim-autoformat
-      vim-colors-solarized
-      vim-devicons
-      vim-dirdiff
-      vim-dispatch
-      vim-fugitive
-      vim-gitgutter
-      vim-markdown
-      vim-nix
-      vim-sensible
-      vim-startify
-      vim-surround
-      vim-toml
+{ config, pkgs, inputs, ... }:
+let
+  unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
+in
+  {
+    home.file.".vimrc".source = ../../../.vimrc.nixos;
+    home.packages = with pkgs; [
+      ripgrep
     ];
-    extraConfig = ''
-      if filereadable($HOME . "/.vimrc")
+    programs.neovim = {
+      enable = true;
+      viAlias = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      withNodeJs = true;
+      withPython3 = true;
+      withRuby = true;
+      package = unstable.neovim-unwrapped;
+
+      plugins = with pkgs.vimPlugins; [
+        ack-vim
+        coc-highlight
+        coc-nvim
+        coc-rust-analyzer
+        ctrlp-vim
+        editorconfig-vim
+        fzf-vim
+        quickfix-reflector-vim
+        rainbow
+        tabular
+        vim-airline
+        vim-airline-themes
+        vim-autoformat
+        vim-colors-solarized
+        vim-devicons
+        vim-dirdiff
+        vim-dispatch
+        vim-fugitive
+        vim-gitgutter
+        vim-markdown
+        vim-nix
+        vim-sensible
+        vim-startify
+        vim-surround
+        vim-toml
+      ];
+      extraConfig = ''
+        if filereadable($HOME . "/.vimrc")
         source $HOME/.vimrc
-      endif
-    '';
-  };
-}
+        endif
+      '';
+    };
+  }