Fix(hm/conf/neovim/plugins): Move raw plugins to their config dirs

5 files changed, 39 insertions, 13 deletions

diff --git a/home-manager/soispha/config/neovim/nixvim/files/default.nix b/home-manager/soispha/config/neovim/nixvim/files/default.nix
index f8445563..5045eb9f 100644
--- a/home-manager/soispha/config/neovim/nixvim/files/default.nix
+++ b/home-manager/soispha/config/neovim/nixvim/files/default.nix
@@ -1,5 +1,12 @@
-{lib, ...}: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
   programs.nixvim = {
+    extraPlugins = [
+      pkgs.vimExtraPlugins.gruvbox
+    ];
     extraFiles = {
       path = "ftplugin/tex.lua";
       content = ''
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/default.nix b/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/default.nix
index 9864c5cf..db8fde1c 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/default.nix
+++ b/home-manager/soispha/config/neovim/nixvim/plugins/colorscheme/default.nix
@@ -1,9 +1,16 @@
-{lib, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs.nixvim = {
     # TODO package nightfox though a module
     extraConfigLuaPost = ''
       ${lib.strings.fileContents ./lua/nightfox.lua}
     '';
     colorscheme = "duskfox";
+    extraPlugins = [
+      pkgs.vimExtraPlugins.nightfox-nvim
+    ];
   };
 }
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/default.nix b/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/default.nix
index a42c6f33..37686779 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/default.nix
+++ b/home-manager/soispha/config/neovim/nixvim/plugins/lf-nvim/default.nix
@@ -1,8 +1,18 @@
-{lib, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs.nixvim = {
     # TODO package lf-nvim though a module
+    # FIXME change the nvim path, when I change the path with lf
     extraConfigLuaPost = ''
       ${lib.strings.fileContents ./lua/lf-nvim.lua}
     '';
+    extraPlugins = [
+      pkgs.vimExtraPlugins.lf-nvim
+
+      pkgs.vimExtraPlugins.nvim-toggleterm-lua # required by lf-nvim
+    ];
   };
 }
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/default.nix b/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/default.nix
index c55efacc..60f7b715 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/default.nix
+++ b/home-manager/soispha/config/neovim/nixvim/plugins/nvim-lint/default.nix
@@ -1,8 +1,15 @@
-{lib, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs.nixvim = {
     # TODO package nvim-lint though a module
     extraConfigLuaPost = ''
       ${lib.strings.fileContents ./lua/nvim-lint.lua}
     '';
+    extraPlugins = [
+      pkgs.vimExtraPlugins.nvim-lint
+    ];
   };
 }
diff --git a/home-manager/soispha/config/neovim/nixvim/plugins/raw_plugins/default.nix b/home-manager/soispha/config/neovim/nixvim/plugins/raw_plugins/default.nix
index 28944ff9..941cb7cb 100644
--- a/home-manager/soispha/config/neovim/nixvim/plugins/raw_plugins/default.nix
+++ b/home-manager/soispha/config/neovim/nixvim/plugins/raw_plugins/default.nix
@@ -1,16 +1,11 @@
-{pkgs, ...}: {
+{...}: {
   programs.nixvim = {
     # Not all plugins have own modules
     # You can add missing plugins here
     # `pkgs.vimExtraPlugins` is added by the overlay you added at the beginning
-    # For a list of available plugins, look here: [available plugins](https://github.com/jooooscha/nixpkgs-vim-extra-plugins/blob/main/plugins.md)
-    extraPlugins = with pkgs.vimExtraPlugins; [
-      nightfox-nvim
-      nvim-lint
-      lf-nvim
-      gruvbox
-
-      nvim-toggleterm-lua # required by lf-nvim
+    # For a list of available plugins, look here:
+    # https://github.com/jooooscha/nixpkgs-vim-extra-plugins/blob/main/plugins.md
+    extraPlugins = [
     ];
   };
 }