From bad525d5757ed30275f05a653ea86d22f007803e Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 30 May 2024 12:29:43 +0200
Subject: [PATCH] refactor: update neovim config to new home-manager options

---
 home-manager/neovim/default.nix | 69 ++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index cd30a2a..26ed782 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -1,45 +1,18 @@
-{ config, lib, pkgs, user, theme, ... }:
-
+{ pkgs, theme, ... }:
+let
+  pkg_src = pkgs.unstable;
+in
 {
-  home.packages = with pkgs.unstable; [
-    xclip
-
-    # language servers
-    lua-language-server
-    terraform-ls
-    tflint
-    nodejs
-    nodePackages.bash-language-server
-    nodePackages.yaml-language-server
-    nodePackages.prettier
-    nodePackages.eslint_d
-    nodePackages.typescript-language-server
-    nodePackages.typescript
-    nodePackages.dockerfile-language-server-nodejs
-    nodePackages.vscode-langservers-extracted
-    nodePackages.volar
-    lldb
-    vscode-extensions.vadimcn.vscode-lldb
-    marksman
-    clang-tools
-    cmake-language-server
-    texlab
-    nixd
-    nixpkgs-fmt
-  ];
 
   # symlink for a stable path 
-  home.file.".vscode-extensions/vscode-lldb".source = pkgs.unstable.vscode-extensions.vadimcn.vscode-lldb;
-
-  home.sessionVariables = {
-    EDITOR = "nvim";
-  };
+  home.file.".vscode-extensions/vscode-lldb".source = pkg_src.vscode-extensions.vadimcn.vscode-lldb;
 
   programs = {
     neovim = {
       enable = true;
-      package = pkgs.unstable.neovim-unwrapped;
-      plugins = with pkgs.unstable.vimPlugins; [
+      package = pkg_src.neovim-unwrapped;
+      defaultEditor = true;
+      plugins = with pkg_src.vimPlugins; [
         # theme
         nvim-solarized-lua
 
@@ -113,6 +86,32 @@
         nvim-dap-ui
       ];
 
+      withNodeJs = true;
+
+      extraPackages = with pkg_src; [
+        # language servers
+        lua-language-server
+        terraform-ls
+        tflint
+        nodePackages.bash-language-server
+        nodePackages.yaml-language-server
+        nodePackages.prettier
+        nodePackages.eslint_d
+        nodePackages.typescript-language-server
+        nodePackages.typescript
+        nodePackages.dockerfile-language-server-nodejs
+        nodePackages.vscode-langservers-extracted
+        nodePackages.volar
+        lldb
+        vscode-extensions.vadimcn.vscode-lldb
+        marksman
+        clang-tools
+        cmake-language-server
+        texlab
+        nixd
+        nixpkgs-fmt
+      ];
+
       extraConfig = ''
         lua << EOF
             vim.o.guifont = "DejaVu Sans Mono:h10"