CHANGE neovim integration to neovim.nix module

ADD Nextcloud desktop config

hosts/dell-5590/nixos/configuration.nix

@@ -33,8 +33,8 @@
       shellAliases = {
         ll = "ls -l";
         ls = "lsd";
-        vi = "nvim";
+        #vi = "nvim";
-        vim = "nvim";
+        #vim = "nvim";
         cat = "bat";
         sysrs = "sudo nixos-rebuild switch";
         sysup = "sudo nixos-rebuild switch --upgrade";

hosts/dell-5590/nixpkgs/home.nix

@@ -12,7 +12,7 @@
     ./bat.nix
     ./kdeconnect.nix
 #    ./redshift.nix
-#    ../../../modules/neovim.nix
+    ../../../modules/neovim.nix
     ../../../modules/rust.nix
     ../../../modules/tmux.nix
   ];

hosts/dell-5590/nixpkgs/packages.nix

@@ -45,7 +45,6 @@
     exa
     bat
     vimPlugins.vim-markdown-composer
-    neovim
     python3
     mtr
     powertop

modules/common.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ...}:
 {
-  environment.variables.EDITOR = "nvim";
+  #environment.variables.EDITOR = "nvim";
   environment.systemPackages = with pkgs; [
     gitAndTools.gitFull
     unzip
@@ -8,7 +8,7 @@
     tmux
     lshw
     bc
-    neovim
+    #neovim
     ncdu
     nixos-option
     bat

modules/neovim.nix

@@ -1,14 +1,15 @@
-{ lib, config, pkgs, ... }:
+{ pkgs, ... }: {
-let
+programs.neovim = {
-  # […]
+  enable = true ;
-  nix-nvim = builtins.fetchGit {
+  viAlias = true;
-#    url = "https://git.atlanticaweb.fr/alexandre/nix-nvim.git";
+  vimAlias = true;
-#    ref = "main";
+  vimdiffAlias = true;
-#    rev = "fc0cf4d36b3872f80a931ed05993f2d5755b26da";
+  plugins = with pkgs.vimPlugins;[
-    url = "https://framagit.org/vegaelle/nix-nvim.git";
+    nvim-lspconfig
-    ref = "main";
+    nvim-treesitter.withAllGrammars
+    plenary-nvim
+    gruvbox-material
+    mini-nvim
+    ];
   };
-in
-{
-  imports = [ (import "${nix-nvim}") ];
 }

modules/users.nix

@@ -28,8 +28,8 @@
   programs.fish.shellAliases = {
 	ll = "ls -l";
 	ls = "lsd";
-	vi = "nvim";
+#	vi = "nvim";
-	vim = "nvim";
+#	vim = "nvim";
   };
   security.sudo = {
 	enable = true;