programs.neovim: use extraConfig instead of directly changing init.vim (

#58)

Changing init.vim does not work any longer because HM 22.11 has moved to using lua by default, so the file no longer exists.

modules/programs/neovim/default.nix

@@ -14,41 +14,26 @@ in
       includeKeyboardLayout = true;
       includeTheme = true;
       extraOptions = {
+
         extraConfig = mkOption {
           type = types.lines;
           default = "";
           example = ''
-            set nocompatible
             set nobackup
           '';
           description = ''
             Custom vimrc lines.
           '';
         };
 
-        rcheader = mkOption {
+        extraLuaConfig = mkOption {
           type = types.lines;
           default = "";
-          description = ''
-            Lines added to the top of the rc file.
-          '';
-          apply = lines: ''
-            " rcheader {{{
-            ${lines}
-            " }}}
+          example = ''
+            vim.opt.nobackup = true
           '';
-        };
-
-        rcfooter = mkOption {
-          type = types.lines;
-          default = "";
           description = ''
-            Lines added to the bottom of the rc file.
-          '';
-          apply = lines: ''
-            " rcfooter {{{
-            ${lines}
-            " }}}
+            Custom lua lines.
           '';
         };
 
@@ -83,14 +68,6 @@ in
   };
 
   config = mkIf cfg.enable (mkMerge [
-    # make a snippet in the header for the mapleader
-    (mkIf (cfg.mapleader != null) {
-      soxin.programs.neovim.rcheader = ''
-        " set the mapleader globally
-        let mapleader = "${cfg.mapleader}"
-      '';
-    })
-
     # add all plugins installed by themes
     { soxin.programs.neovim.plugins = cfg.theme.plugins; }
 
@@ -127,7 +104,11 @@ in
 
       programs.neovim = {
         enable = true;
-        inherit (cfg) extraConfig plugins;
+        inherit (cfg) extraLuaConfig plugins;
+
+        extraConfig = ""
+          + (optionalString (cfg.mapleader != null) ''let mapleader = "${cfg.mapleader}"'')
+          + cfg.extraConfig;
 
         # Add the Python's neovim plugin
         extraPython3Packages = ps: with ps; [ pynvim ];
@@ -136,12 +117,6 @@ in
       // (genAttrs [ "viAlias" "vimAlias" "vimdiffAlias" ] (name: true))
       # Add support for NodeJS, Python 2 and 3 as well as Ruby
       // (genAttrs [ "withNodeJs" "withPython3" "withRuby" ] (name: true));
-
-      # inject the header/footer to the rcfile on home-manager
-      xdg.configFile."nvim/init.vim".text = mkMerge [
-        (mkBefore cfg.rcheader)
-        (mkAfter cfg.rcfooter)
-      ];
     })
   ]);
 }