neovim: use more functions from neovimUtils

adomixaszvers · Jan 14, 2025 · 6e5196d · 6e5196d
1 parent 524d42f
commit 6e5196d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/profiles/cli/neovim/customRc.nix b/profiles/cli/neovim/customRc.nix
@@ -1,8 +1,8 @@
-# vim
+# lua
 ''
-  luafile ${./nvim-treesitter.lua}
-  luafile ${./lspconfig.lua}
-  luafile ${./cmp.lua}
-  luafile ${./playground.lua}
-  luafile ${./init.lua}
+  dofile '${./nvim-treesitter.lua}'
+  dofile '${./lspconfig.lua}'
+  dofile '${./cmp.lua}'
+  dofile '${./playground.lua}'
+  dofile '${./init.lua}'
 ''
diff --git a/profiles/cli/neovim/default.nix b/profiles/cli/neovim/default.nix
@@ -4,7 +4,7 @@
     enable = true;
     package = pkgs.neovim-unwrapped;
     plugins = import ./plugins.nix pkgs;
-    extraConfig = import ./customRc.nix;
+    extraLuaConfig = import ./customRc.nix;
     extraPackages = with pkgs; [ lua-language-server ];
   };
 }
diff --git a/profiles/cli/neovim/nvim-nix.nix b/profiles/cli/neovim/nvim-nix.nix
@@ -48,11 +48,9 @@ let
       which-key-nvim
     ]
     ++ telescope-dependencies;
+  normalizedPlugins = neovimUtils.normalizePlugins plugins;
   moduleConfigure = {
-    packages.neovim-nix = {
-      start = plugins;
-      opt = [ ];
-    };
+    packages.neovim-nix = neovimUtils.normalizedPluginsToVimPackage normalizedPlugins;
     beforePlugins = "";
   };
 
@@ -62,10 +60,10 @@ let
     withNode = false;
     withRuby = false;
     configure = moduleConfigure;
-    customRC = # vim
+    luaRcContent = # lua
       ''
-        luafile ${./nvim-treesitter.lua}
-        luafile ${./init.lua}
+        dofile '${./nvim-treesitter.lua}'
+        dofile '${./init.lua}'
       '';
   };
   extraWrapperArgs =

diff --git a/profiles/cli/neovim/package.nix b/profiles/cli/neovim/package.nix
@@ -6,22 +6,16 @@
 }:
 let
   plugins = import ./plugins.nix pkgs;
+  normalizedPlugins = neovimUtils.normalizePlugins plugins;
   moduleConfigure = {
-    packages.home-manager =
-      let
-        ps = builtins.partition (x: x.optional or false) (map (x: x.plugin or x) plugins);
-      in
-      {
-        start = ps.wrong;
-        opt = ps.right;
-      };
+    packages.home-manager = neovimUtils.normalizedPluginsToVimPackage normalizedPlugins;
     beforePlugins = "";
   };
 
   neovimConfig = neovimUtils.makeNeovimConfig {
     inherit plugins;
     configure = moduleConfigure;
-    customRC = import ./customRc.nix;
+    luaRcContent = import ./customRc.nix;
   };
 in
 wrapNeovimUnstable neovim-unwrapped neovimConfig