From 67b33c6287ab79b49f87e6da9320b2a7a699fd82 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sun, 18 Jul 2021 22:37:24 -0400
Subject: [PATCH] Fix twilight-nvim by using tokyonight theme which uses
 treesitter

---
 home/default.nix    |  2 +-
 home/nvim/init.vim  |  2 --
 home/nvim/init2.lua | 12 +++++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index de108ff..710a73a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -301,9 +301,9 @@ in
       extraConfig = builtins.readFile ./nvim/init.vim;
       plugins = with pkgs.vimPlugins; [
         completion-nvim
-        gruvbox
         # gruvbox-nvim # TODO: Not working for some reason?
         # lush-nvim # required by gruvbox-nvim
+        tokyonight-nvim
         lualine-nvim
         nerdtree
         nvim-lspconfig
diff --git a/home/nvim/init.vim b/home/nvim/init.vim
index eae2540..6582489 100644
--- a/home/nvim/init.vim
+++ b/home/nvim/init.vim
@@ -57,8 +57,6 @@ au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
 au BufNewFile,BufRead *.py set tabstop=4 softtabstop=4 shiftwidth=4 textwidth=79 expandtab autoindent fileformat=unix
 let python_highlight_all=1
 
-colorscheme gruvbox
-
 " Highlight whitespace
 highlight ExtraWhitespace ctermbg=red guibg=red
 match ExtraWhitespace /\s\+$/
diff --git a/home/nvim/init2.lua b/home/nvim/init2.lua
index 4538bf1..0c2280c 100644
--- a/home/nvim/init2.lua
+++ b/home/nvim/init2.lua
@@ -1,5 +1,14 @@
+-- colours
+vim.cmd[[colorscheme tokyonight]]
+vim.g.tokyonight_style = "night"
+vim.g.tokyonight_italic_functions = true
+
 -- status line
-require('lualine').setup()
+require('lualine').setup {
+  options = {
+    theme = 'tokyonight'
+  }
+}
 
 -- lsp
 require'lspconfig'.bashls.setup{}
@@ -51,6 +60,7 @@ require("twilight").setup {
   },
   exclude = {}, -- exclude these filetypes
 }
+vim.cmd[[autocmd BufEnter * :TwilightEnable]]
 
 vim.api.nvim_exec([[
     set foldmethod=expr