From 5a01031a102cada7cae2405a000af947ab1fa340 Mon Sep 17 00:00:00 2001
From: Michael Mandl <michael.mandl@horsch.com>
Date: Mon, 29 Jul 2024 11:16:26 +0200
Subject: [PATCH] refactor(nvim): use extraLuaConfig instead of wrapped lua

---
 neovim/default.nix | 66 ++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/neovim/default.nix b/neovim/default.nix
index 5e1506d..5bc4137 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -137,45 +137,43 @@
         luaPackages.pathlib-nvim
       ];
 
-      extraConfig = ''
-        lua << EOF
-            ${builtins.readFile ./keymaps.lua }
-            ${builtins.readFile ./options.lua }
-            ${builtins.readFile ./commands.lua }
-            ${builtins.readFile ./treesitter.lua }
-            ${builtins.readFile ./lspconfig.lua }
-            ${builtins.readFile ./auto-session.lua }
-            ${builtins.readFile ./toggleterm.lua }
-            ${builtins.readFile ./notify.lua }
-            ${builtins.readFile ./comment.lua }
-            ${builtins.readFile ./lualine.lua }
-            ${builtins.readFile ./tabline.lua }
-            ${builtins.readFile ./indent-blankline.lua }
-            ${builtins.readFile ./gitsigns.lua }
-            ${builtins.readFile ./luasnip.lua }
-            ${builtins.readFile ./nvim-cmp.lua }
-            ${builtins.readFile ./telescope.lua }
+      extraLuaConfig = ''
+        ${builtins.readFile ./keymaps.lua }
+        ${builtins.readFile ./options.lua }
+        ${builtins.readFile ./commands.lua }
+        ${builtins.readFile ./treesitter.lua }
+        ${builtins.readFile ./lspconfig.lua }
+        ${builtins.readFile ./auto-session.lua }
+        ${builtins.readFile ./toggleterm.lua }
+        ${builtins.readFile ./notify.lua }
+        ${builtins.readFile ./comment.lua }
+        ${builtins.readFile ./lualine.lua }
+        ${builtins.readFile ./tabline.lua }
+        ${builtins.readFile ./indent-blankline.lua }
+        ${builtins.readFile ./gitsigns.lua }
+        ${builtins.readFile ./luasnip.lua }
+        ${builtins.readFile ./nvim-cmp.lua }
+        ${builtins.readFile ./telescope.lua }
 
-            do
-              local vim_theme = "${theme}";
-              ${builtins.readFile ./themes.lua }
-            end
+        do
+          local vim_theme = "${theme}";
+          ${builtins.readFile ./themes.lua }
+        end
 
-            ${builtins.readFile ./project-nvim.lua }
-            ${builtins.readFile ./dap.lua }
-            ${builtins.readFile ./illuminate.lua }
-            ${builtins.readFile ./wilder.lua }
+        ${builtins.readFile ./project-nvim.lua }
+        ${builtins.readFile ./dap.lua }
+        ${builtins.readFile ./illuminate.lua }
+        ${builtins.readFile ./wilder.lua }
 
-            do
-              local vimwiki_path = "${vimwikiPath}"
-              ${builtins.readFile ./vimwiki.lua }
-            end
+        do
+          local vimwiki_path = "${vimwikiPath}"
+          ${builtins.readFile ./vimwiki.lua }
+        end
 
-            vim.g.gitblame_date_format = "%r"
+        vim.g.gitblame_date_format = "%r"
 
-            require("nvim-autopairs").setup({})
-            require("neogen").setup({ snippet_engine = "luasnip" })
-        EOF
+        require("nvim-autopairs").setup({})
+        require("neogen").setup({ snippet_engine = "luasnip" })
       '';
     };
   };