10 files changed, 38 insertions, 39 deletions
diff --git a/hm/default.nix b/hm/default.nix
index 0d3e702b..292c7251 100644
--- a/hm/default.nix
+++ b/hm/default.nix
@@ -15,10 +15,8 @@
   flake_update,
   # external deps
   user_js,
-  neovim_config,
   # modules
   impermanence,
-  nixNeovim,
   nixVim,
 }: {
   home-manager = {
@@ -46,11 +44,9 @@
         # external deps
         
         user_js
-        neovim_config
         # modules
         
         impermanence
-        nixNeovim
         nixVim
         ;
     };
diff --git a/hm/soispha/conf/nvim/plgs/colorscheme/default.nix b/hm/soispha/conf/nvim/plgs/colorscheme/default.nix
index c5b3db66..11357f77 100644
--- a/hm/soispha/conf/nvim/plgs/colorscheme/default.nix
+++ b/hm/soispha/conf/nvim/plgs/colorscheme/default.nix
@@ -11,7 +11,7 @@
     '';
     colorscheme = "carbonfox";
     extraPlugins = [
-      pkgs.vimExtraPlugins.nightfox-nvim
+      pkgs.vimPlugins.nightfox-nvim
     ];
   };
 }
diff --git a/hm/soispha/conf/nvim/plgs/default.nix b/hm/soispha/conf/nvim/plgs/default.nix
index c3c36da0..4f1f2172 100644
--- a/hm/soispha/conf/nvim/plgs/default.nix
+++ b/hm/soispha/conf/nvim/plgs/default.nix
@@ -1,28 +1,33 @@
 {...}: {
-  imports = [
-    ./colorscheme
-    ./comment-nvim
-    ./debugprint
-    ./femaco
-    ./flatten-nvim
-    ./goto-preview
-    ./harpoon
-    ./leap
-    ./lf-nvim
-    ./lsp
-    #./lsp-progress-nvim
-    ./lspkind
-    ./ltex_extra
-    ./lualine
-    ./luasnip
-    ./neorg
-    ./nvim-cmp
-    ./nvim-lint
-    ./raw_plugins
-    ./telescope
-    ./todo-comments
-    ./treesitter
-    ./vim-tex
-    ./which-key
-  ];
+  imports =
+    [
+      # Plugins not yet packaged in nixpkgs
+      ./debugprint
+      ./lf-nvim
+      # ./lsp-progress-nvim
+    ]
+    ++ [
+      # Already packaged in nixpkgs
+      ./colorscheme
+      ./comment-nvim
+      ./femaco
+      ./flatten-nvim
+      ./goto-preview
+      ./harpoon
+      ./leap
+      ./lsp
+      ./lspkind
+      ./ltex_extra
+      ./lualine
+      ./luasnip
+      ./neorg
+      ./nvim-cmp
+      ./nvim-lint
+      ./raw_plugins
+      ./telescope
+      ./todo-comments
+      ./treesitter
+      ./vim-tex
+      ./which-key
+    ];
 }
diff --git a/hm/soispha/conf/nvim/plgs/femaco/default.nix b/hm/soispha/conf/nvim/plgs/femaco/default.nix
index be8723ce..0b4f7937 100644
--- a/hm/soispha/conf/nvim/plgs/femaco/default.nix
+++ b/hm/soispha/conf/nvim/plgs/femaco/default.nix
@@ -9,7 +9,7 @@
       ${lib.strings.fileContents ./lua/femaco.lua}
     '';
     extraPlugins = [
-      pkgs.vimExtraPlugins.nvim-FeMaco-lua
+      pkgs.vimPlugins.nvim-FeMaco-lua
     ];
     keymaps = [
       {
diff --git a/hm/soispha/conf/nvim/plgs/flatten-nvim/default.nix b/hm/soispha/conf/nvim/plgs/flatten-nvim/default.nix
index 4fc009ae..cd6f8bcc 100644
--- a/hm/soispha/conf/nvim/plgs/flatten-nvim/default.nix
+++ b/hm/soispha/conf/nvim/plgs/flatten-nvim/default.nix
@@ -14,7 +14,7 @@
       end
     '';
     extraPlugins = [
-      pkgs.vimExtraPlugins.flatten-nvim
+      pkgs.vimPlugins.flatten-nvim
     ];
   };
 }
diff --git a/hm/soispha/conf/nvim/plgs/goto-preview/default.nix b/hm/soispha/conf/nvim/plgs/goto-preview/default.nix
index 70527b93..13a26212 100644
--- a/hm/soispha/conf/nvim/plgs/goto-preview/default.nix
+++ b/hm/soispha/conf/nvim/plgs/goto-preview/default.nix
@@ -9,7 +9,7 @@
       ${lib.strings.fileContents ./lua/goto-preview.lua}
     '';
     extraPlugins = [
-      pkgs.vimExtraPlugins.goto-preview
+      pkgs.vimPlugins.goto-preview
     ];
     keymaps = [
       {
diff --git a/hm/soispha/conf/nvim/plgs/lf-nvim/default.nix b/hm/soispha/conf/nvim/plgs/lf-nvim/default.nix
index c562f400..11ad2807 100644
--- a/hm/soispha/conf/nvim/plgs/lf-nvim/default.nix
+++ b/hm/soispha/conf/nvim/plgs/lf-nvim/default.nix
@@ -12,7 +12,7 @@
     extraPlugins = [
       pkgs.vimExtraPlugins.lf-nvim
 
-      pkgs.vimExtraPlugins.nvim-toggleterm-lua # required by lf-nvim
+      pkgs.vimPlugins.toggleterm-nvim # required by lf-nvim
     ];
   };
 }
diff --git a/hm/soispha/conf/nvim/plgs/ltex_extra/default.nix b/hm/soispha/conf/nvim/plgs/ltex_extra/default.nix
index 3d1c60fc..af78c7a5 100644
--- a/hm/soispha/conf/nvim/plgs/ltex_extra/default.nix
+++ b/hm/soispha/conf/nvim/plgs/ltex_extra/default.nix
@@ -2,7 +2,7 @@
   programs.nixvim = {
     # TODO: package ltex_extra though a module
     extraPlugins = [
-      pkgs.vimExtraPlugins.ltex-extra-nvim
+      pkgs.vimPlugins.ltex_extra-nvim
     ];
     plugins.lsp.servers.ltex.onAttach.function = builtins.readFile ./lua/ltex_extra.lua;
   };
diff --git a/hm/soispha/conf/nvim/plgs/nvim-lint/default.nix b/hm/soispha/conf/nvim/plgs/nvim-lint/default.nix
index c583ebf6..f5cb9acf 100644
--- a/hm/soispha/conf/nvim/plgs/nvim-lint/default.nix
+++ b/hm/soispha/conf/nvim/plgs/nvim-lint/default.nix
@@ -9,7 +9,7 @@
       ${lib.strings.fileContents ./lua/nvim-lint.lua}
     '';
     extraPlugins = [
-      pkgs.vimExtraPlugins.nvim-lint
+      pkgs.vimPlugins.nvim-lint
     ];
   };
 }
diff --git a/hm/soispha/default.nix b/hm/soispha/default.nix
index b6a00038..2dfb5b95 100644
--- a/hm/soispha/default.nix
+++ b/hm/soispha/default.nix
@@ -1,6 +1,5 @@
 {
   impermanence,
-  nixNeovim,
   nixVim,
   ...
 }: let
@@ -24,7 +23,6 @@ in {
     ./wms
 
     impermanence.nixosModules.home-manager.impermanence
-    nixNeovim.nixosModules.default
     nixVim.homeManagerModules.nixvim
   ];