From 961a213c3c3b2e802574641704bd263f1187d47d Mon Sep 17 00:00:00 2001
From: Nicolai Van der Storm <nicolai@nvds.be>
Date: Wed, 18 Oct 2023 10:30:41 +0200
Subject: [PATCH] made core options work in neovim

---
 nix/users/base/neovim/core/loader.lua |  1 -
 nix/users/base/neovim/default.nix     | 12 +++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 nix/users/base/neovim/core/loader.lua

diff --git a/nix/users/base/neovim/core/loader.lua b/nix/users/base/neovim/core/loader.lua
deleted file mode 100644
index f40df02..0000000
--- a/nix/users/base/neovim/core/loader.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.cmd("runtime! .lua")
\ No newline at end of file
diff --git a/nix/users/base/neovim/default.nix b/nix/users/base/neovim/default.nix
index b992486..300a822 100644
--- a/nix/users/base/neovim/default.nix
+++ b/nix/users/base/neovim/default.nix
@@ -42,10 +42,11 @@
         config = toLuaFile ./plugins/indent.lua;
       }
 
-      {
-        plugin = nvim-ts-autotag;
-        config = toLuaFile ./plugins/autotag.lua;
-      }
+      # TODO: enable this when treesitter is installed
+      # {
+      #   plugin = nvim-ts-autotag;
+      #   config = toLuaFile ./plugins/autotag.lua;
+      # }
 
       {
         plugin = nvim-colorizer-lua;
@@ -54,7 +55,8 @@
     ];
 
     extraLuaConfig = ''
-      vim.cmd("runtime! core/*.lua")
+      ${builtins.readFile ./core/colors.lua}
+      ${builtins.readFile ./core/options.lua}
     '';
 
     extraPackages = with pkgs; [