From 3849a1de9a28ed5434e864b8f2815c905a8d28ad Mon Sep 17 00:00:00 2001
From: dfangx <github.oxfrj2ct@bged98.anonaddy.com>
Date: Mon, 7 Nov 2022 10:59:10 -0500
Subject: [PATCH] Use init.lua instead of init.vim (#64)

* Use init.lua instead of init.vim

* fix standalone generation

Co-authored-by: cyrusng <cyrus.ng@protonmail.com>
Co-authored-by: Pedro Alves <pta2002@pta2002.com>
---
 modules/output.nix | 26 ++++++++++++++++----------
 tests/flake.lock   | 12 ++++++------
 wrappers/hm.nix    |  2 +-
 wrappers/nixos.nix |  2 +-
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/modules/output.nix b/modules/output.nix
index 40e2369e..3d7708e6 100644
--- a/modules/output.nix
+++ b/modules/output.nix
@@ -79,7 +79,7 @@ in
 
     initContent = mkOption {
       type = types.str;
-      description = "The content of the init.vim file";
+      description = "The content of the init.lua file";
       readOnly = true;
       visible = false;
     };
@@ -89,15 +89,16 @@ in
     let
       customRC =
         (optionalString (config.extraConfigLuaPre != "") ''
-          lua <<EOF
           ${config.extraConfigLuaPre}
-          EOF
         '') +
-        config.extraConfigVim + (optionalString (config.extraConfigLua != "" || config.extraConfigLuaPost != "") ''
-          lua <<EOF
+        (optionalString (config.extraConfigVim != "") ''
+          vim.cmd([[
+            ${config.extraConfigVim}
+          ]])
+        '') +
+        (optionalString (config.extraConfigLua != "" || config.extraConfigLuaPost != "") ''
           ${config.extraConfigLua}
           ${config.extraConfigLuaPost}
-          EOF
         '');
 
       defaultPlugin = {
@@ -109,7 +110,7 @@ in
       normalizedPlugins = map (x: defaultPlugin // (if x ? plugin then x else { plugin = x; })) config.extraPlugins;
 
       neovimConfig = pkgs.neovimUtils.makeNeovimConfig ({
-        inherit customRC;
+        # inherit customRC;
         plugins = normalizedPlugins;
       }
       # Necessary to make sure the runtime path is set properly in NixOS 22.05,
@@ -120,12 +121,17 @@ in
           { nixvim = { start = map (x: x.plugin) normalizedPlugins; opt = [ ]; }; };
       });
 
-      extraWrapperArgs = optionalString (config.extraPackages != [ ])
-        ''--prefix PATH : "${makeBinPath config.extraPackages}"'';
+      extraWrapperArgs = builtins.concatStringsSep " " (
+        (optional (config.extraPackages != [ ])
+          ''--prefix PATH : "${makeBinPath config.extraPackages}"'')
+        ++
+        (optional (config.wrapRc)
+          ''--add-flags -u --add-flags "${pkgs.writeText "init.lua" customRC}"'')
+      );
 
       wrappedNeovim = pkgs.wrapNeovimUnstable config.package (neovimConfig // {
         wrapperArgs = lib.escapeShellArgs neovimConfig.wrapperArgs + " " + extraWrapperArgs;
-        inherit (config) wrapRc;
+        wrapRc = false;
       });
     in
     {
diff --git a/tests/flake.lock b/tests/flake.lock
index 3b224d8c..d8bc57a1 100644
--- a/tests/flake.lock
+++ b/tests/flake.lock
@@ -97,12 +97,12 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-FTGR/AeBEZQeWqSQqbnR+3oW4NJvhwshJu8/mHDWwQ8=",
-        "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
+        "narHash": "sha256-p/xU46Ew3l56jrG0A+yeRLrOCxRMfAu3JBVvMP0bFUQ=",
+        "path": "/nix/store/h0ngn8s4pvbwifcc7b0waxmhrgkf5d62-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
+        "path": "/nix/store/h0ngn8s4pvbwifcc7b0waxmhrgkf5d62-source",
         "type": "path"
       }
     },
@@ -116,12 +116,12 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-FTGR/AeBEZQeWqSQqbnR+3oW4NJvhwshJu8/mHDWwQ8=",
-        "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
+        "narHash": "sha256-p/xU46Ew3l56jrG0A+yeRLrOCxRMfAu3JBVvMP0bFUQ=",
+        "path": "/nix/store/h0ngn8s4pvbwifcc7b0waxmhrgkf5d62-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
+        "path": "/nix/store/h0ngn8s4pvbwifcc7b0waxmhrgkf5d62-source",
         "type": "path"
       }
     },
diff --git a/wrappers/hm.nix b/wrappers/hm.nix
index 8d32e200..e10b63ca 100644
--- a/wrappers/hm.nix
+++ b/wrappers/hm.nix
@@ -27,7 +27,7 @@ in
     (mkMerge [
       { home.packages = [ cfg.finalPackage ]; }
       (mkIf (!cfg.wrapRc) {
-        xdg.configFile."nvim/init.vim".text = cfg.initContent;
+        xdg.configFile."nvim/init.lua".text = cfg.initContent;
       })
     ]);
 }
diff --git a/wrappers/nixos.nix b/wrappers/nixos.nix
index 0c6a807a..f0474eea 100644
--- a/wrappers/nixos.nix
+++ b/wrappers/nixos.nix
@@ -27,7 +27,7 @@ in
     (mkMerge [
       { environment.systemPackages = [ cfg.finalPackage ]; }
       (mkIf (!cfg.wrapRc) {
-        environment.etc."nvim/sysinit.vim".text = cfg.initContent;
+        environment.etc."nvim/sysinit.lua".text = cfg.initContent;
         environment.variables."VIM" = "/etc/nvim";
       })
     ]);