From 80aaec012e83eda86a85990193ebfc6a8541c8c9 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 4 Jun 2023 10:45:20 +0100
Subject: [PATCH] Set nvim config fully within nvim submodule

---
 home/tui/config/nvim/init.lua | 36 -----------------------------------
 home/tui/neovim.nix           |  1 -
 nvim                          |  2 +-
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 home/tui/config/nvim/init.lua

diff --git a/home/tui/config/nvim/init.lua b/home/tui/config/nvim/init.lua
deleted file mode 100644
index 72f33999..00000000
--- a/home/tui/config/nvim/init.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-require "common"
-require("lazy").setup {
-    spec = "plugins",
-    install = { colorscheme = { "tokyonight" } },
-    ui = {
-        border = "rounded",
-        icons = { lazy = " " },
-    },
-    diff = { cmd = "diffview.nvim" },
-    checker = { enabled = true, frequency = 3600 },
-    performance = {
-        rtp = {
-            disabled_plugins = {
-                "gzip",
-                "matchit",
-                "matchparen",
-                "netrwPlugin",
-                "tarPlugin",
-                "tohtml",
-                "tutor",
-                "zipPlugin",
-            },
-        },
-    },
-}
-require "ui.fillchars"
-
-vim.g.loaded_perl_provider = 0
-
-if vim.g.neovide then
-    require "ui.neovide"
-elseif vim.g.vscode then
-    require "ui.vscode"
-end
-
-vim.cmd [[colorscheme tokyonight]]
diff --git a/home/tui/neovim.nix b/home/tui/neovim.nix
index 7c61899e..bbcabf9b 100644
--- a/home/tui/neovim.nix
+++ b/home/tui/neovim.nix
@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   programs.neovim = {
     enable = true;
-    extraLuaConfig = builtins.readFile ./config/nvim/init.lua;
     defaultEditor = true;
     viAlias = true;
     vimAlias = true;
diff --git a/nvim b/nvim
index 1fca7741..2dd99138 160000
--- a/nvim
+++ b/nvim
@@ -1 +1 @@
-Subproject commit 1fca774106e7d361ec797dedb10562fa619924bf
+Subproject commit 2dd9913802b80890673f7a9f864a5cf55b311c35