update neovim

.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!

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;
+          };
         }
 
       ];

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

nixos/common.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 {
   imports =
     [
@@ -52,7 +52,6 @@
       '';
     };
 
-
     system = {
       stateVersion = "20.03";
     };

nixos/home-manager/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   home.sessionVariables = {

nixos/home-manager/programs/vim.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
-{
+let
+  unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
+in
+  {
     home.file.".vimrc".source = ../../../.vimrc.nixos;
     home.packages = with pkgs; [
       ripgrep
@@ -12,6 +15,7 @@
       withNodeJs = true;
       withPython3 = true;
       withRuby = true;
+      package = unstable.neovim-unwrapped;
 
       plugins = with pkgs.vimPlugins; [
         ack-vim
@@ -46,4 +50,4 @@
         endif
       '';
     };
-}
+  }