vim: nouvelle façon d'appeler les plugins, reorga du code

applications/terminal/default-applications.nix

@@ -29,7 +29,6 @@ mkIf true {
       tmux          # nécessaire pour byobu
       tree          # affiche une arborescence de fichiers et dossiers
       usbutils
-      (import ./vim.nix)
       wget          # client HTTP console
       which         # pour connaitre le chemin d'un exécutable
   ];
@@ -70,6 +69,5 @@ mkIf true {
       };
       lfs.enable = true;
     };
-    };
   };
 }

applications/terminal/default.nix

@@ -27,6 +27,7 @@ in
     ./edition-video.nix         # modifier les vidéos
     ./jeux.nix                  # jouer, tout simplement ;)
     ./radio.nix                 # outils pour faire de la radio SDR
+    ./vim.nix                   # vim avec plugins
 
     ## if isDesktop
     ./adminsys.nix              # pour gérer le système dans son ensemble et les services

applications/terminal/vim.nix

@@ -1,22 +1,28 @@
-with import <nixpkgs> {};
+{pkgs, ... }:
 
-vim_configurable.customize {
+let
-  # Specifies the vim binary name.
+  myVim = pkgs.vim_configurable.customize {
-  # E.g. set this to "my-vim" and you need to type "my-vim" to open this vim
+    # Specifies the vim binary name.
-  # This allows to have multiple vim packages installed (e.g. with a different set of plugins)
+    # E.g. set this to "my-vim" and you need to type "my-vim" to open this vim
-  name = "vim";
+    # This allows to have multiple vim packages installed (e.g. with a different set of plugins)
-  vimrcConfig.customRC = builtins.readFile ./vimrc;
+    name = "vim";
-  vimrcConfig.vam.knownPlugins = pkgs.vimPlugins;
+    vimrcConfig.customRC = builtins.readFile ./vimrc;
-  vimrcConfig.vam.pluginDictionaries = [
+    vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
-    { names = [
+      start = [
-      # Here you can place all your vim plugins
+        wombat256-vim
-      # They are installed managed by `vam` (a vim plugin manager)
+      ];
-      #"vim-addon-nix"
+      opt = [
-      "elm-vim"
+        elm-vim
-      "vim-fish"
+        vim-fish
-      "vim-nix"
+        vim-nix
-      "wombat256-vim"
+        vimwiki
-      "vimwiki"
+      ];
-    ]; }
+    };
-  ];
+  };
+
+in {
+  programs.vim = {
+    defaultEditor = true;
+    package = myVim;
+  };
 }

applications/terminal/vimrc

@@ -2,6 +2,8 @@
 " This must be first, because it changes other options as a side effect.
 set nocompatible
 
+syntax on
+
 " allow backspacing over everything in insert mode
 set backspace=indent,eol,start