From 7781e87271fba6f60b099b0972ace9cb88558faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.dev>
Date: Sat, 15 Oct 2022 09:39:12 +0100
Subject: [PATCH] newer nvim

---
 .vimrc.plugins-settings             |  1 +
 nixos/home-manager/programs/vim.nix | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.vimrc.plugins-settings b/.vimrc.plugins-settings
index 9c93ae08..3ce35ec6 100644
--- a/.vimrc.plugins-settings
+++ b/.vimrc.plugins-settings
@@ -2,6 +2,7 @@
 let g:bufferline_echo = 0
 let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#coc#enabled = 1
 
 au BufWrite * :Autoformat
 " let g:autoformat_verbosemode=1
diff --git a/nixos/home-manager/programs/vim.nix b/nixos/home-manager/programs/vim.nix
index 1fee233a..e0b73e1b 100644
--- a/nixos/home-manager/programs/vim.nix
+++ b/nixos/home-manager/programs/vim.nix
@@ -5,6 +5,8 @@ in {
   home.packages = with pkgs; [ ripgrep ];
   programs.neovim = {
     enable = true;
+    package =
+      inputs.nixpkgs-nixos-unstable.legacyPackages."${system}".neovim-unwrapped;
     coc = {
       enable = true;
       package = pkgs.vimUtils.buildVimPluginFrom2Nix {
@@ -18,17 +20,15 @@ in {
         };
         meta.homepage = "https://github.com/neoclide/coc.nvim/";
       };
-      settings = ''
-        {
-          "languageserver": {
-            "nix": {
-              "command": "${nil}/bin/nil",
-              "filetypes": ["nix"],
-              "rootPatterns":  ["flake.nix"]
-            }
-          }
-        }
-      '';
+      settings = {
+        languageserver = {
+          nix = {
+            command = "${nil}/bin/nil";
+            rootPatterns = [ "flake.nix" ];
+            filetypes = [ "nix" ];
+          };
+        };
+      };
 
     };
     viAlias = true;
@@ -93,7 +93,7 @@ in {
       ];
     extraConfig = ''
       if filereadable($HOME . "/.vimrc")
-        source $HOME/.vimrc
+      source $HOME/.vimrc
       endif
     '';
   };