From e9b33b2f8684a23eb0e0d0408109d3acd8036f90 Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Wed, 5 Apr 2023 18:58:29 -0500
Subject: [PATCH] Lots of futzing about

---
 config/nvim/lazy-lock.json                    |  5 +++
 config/nvim/lua/config/plugins/lualine.lua    |  3 ++
 config/nvim/lua/config/plugins/neo-tree.lua   |  8 ++++
 .../nvim/lua/config/plugins/tree-sitter.lua   | 36 +++++++++++++++++
 config/nvim/lua/config/plugins/which-key.lua  | 10 +++++
 config/nvim/lua/plugins/lualine.lua           |  9 +++++
 config/nvim/lua/plugins/neo-tree.lua          | 11 +++++
 config/nvim/lua/plugins/neotree.lua           | 18 ---------
 config/nvim/lua/plugins/telescope.lua         |  1 +
 .../{treesitter.lua => tree-sitter.lua}       | 40 ++-----------------
 config/nvim/lua/plugins/which-key.lua         |  5 +++
 config/nvim/lua/plugins/whichkey.lua          | 13 ------
 12 files changed, 92 insertions(+), 67 deletions(-)
 create mode 100644 config/nvim/lua/config/plugins/lualine.lua
 create mode 100644 config/nvim/lua/config/plugins/neo-tree.lua
 create mode 100644 config/nvim/lua/config/plugins/tree-sitter.lua
 create mode 100644 config/nvim/lua/config/plugins/which-key.lua
 create mode 100644 config/nvim/lua/plugins/lualine.lua
 create mode 100644 config/nvim/lua/plugins/neo-tree.lua
 delete mode 100644 config/nvim/lua/plugins/neotree.lua
 rename config/nvim/lua/plugins/{treesitter.lua => tree-sitter.lua} (59%)
 create mode 100644 config/nvim/lua/plugins/which-key.lua
 delete mode 100644 config/nvim/lua/plugins/whichkey.lua

diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 7842cc9..d4dcc7d 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,6 +1,10 @@
 {
+  "gruvbox.nvim": { "branch": "main", "commit": "1a8ba635e511148801b55a1128aef933c296a301" },
+  "kanagawa.nvim": { "branch": "master", "commit": "5c4037432f0ae2d0b75d3a7b7cfa3022d7054e4d" },
   "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
+  "lualine.nvim": { "branch": "master", "commit": "c28a7427c3fb29322db136f0564ec58807b26747" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "2b2f74828eeb02cf29d6b21aa32eedadadc94ca7" },
+  "nordic.nvim": { "branch": "main", "commit": "fc7ea160bb441f9c0245c2719a3c7b8c22468178" },
   "nui.nvim": { "branch": "main", "commit": "1f43b13d133eb4b4f53a4485379d9afa58808389" },
   "nvim-treesitter": { "branch": "master", "commit": "411e771d511442ab81670701f5c830f6c74aadd7" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "b55fe6175f0001347a433c9df358c8cbf8a4e90f" },
@@ -8,5 +12,6 @@
   "onedark.nvim": { "branch": "master", "commit": "dd640f6cfb0e370cfd3db389f04b172508848bd3" },
   "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
   "telescope.nvim": { "branch": "master", "commit": "942fe5faef47b21241e970551eba407bc10d9547" },
+  "tokyonight.nvim": { "branch": "main", "commit": "1b0c88094548a62641ece1e668fa9a234e1c539e" },
   "which-key.nvim": { "branch": "main", "commit": "4b73390eec680b4c061ea175eb32c0ff3412271d" }
 }
\ No newline at end of file
diff --git a/config/nvim/lua/config/plugins/lualine.lua b/config/nvim/lua/config/plugins/lualine.lua
new file mode 100644
index 0000000..c8aecb8
--- /dev/null
+++ b/config/nvim/lua/config/plugins/lualine.lua
@@ -0,0 +1,3 @@
+return function()
+  require('lualine').setup()
+end
diff --git a/config/nvim/lua/config/plugins/neo-tree.lua b/config/nvim/lua/config/plugins/neo-tree.lua
new file mode 100644
index 0000000..1652f74
--- /dev/null
+++ b/config/nvim/lua/config/plugins/neo-tree.lua
@@ -0,0 +1,8 @@
+return function()
+  -- Unless you are still migrating, remove the deprecated commands from v1.x
+  vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
+
+  require("neo-tree").setup({
+    hijack_netrw_behavior = "open_default"
+  })
+end
diff --git a/config/nvim/lua/config/plugins/tree-sitter.lua b/config/nvim/lua/config/plugins/tree-sitter.lua
new file mode 100644
index 0000000..d5f70f5
--- /dev/null
+++ b/config/nvim/lua/config/plugins/tree-sitter.lua
@@ -0,0 +1,36 @@
+return {
+  highlight = { enable = true },
+  indent = { enable = true },
+  context_commentstring = { enable = true, enable_autocmd = false },
+  ensure_installed = {
+    "bash",
+    "c",
+    "css",
+    "dockerfile",
+    "eex",
+    "elixir",
+    "help",
+    "html",
+    "javascript",
+    "json",
+    "lua",
+    "luadoc",
+    "luap",
+    "markdown",
+    "markdown_inline",
+    "python",
+    "query",
+    "regex",
+    "ruby",
+    "rust",
+    "scss",
+    "sql",
+    "swift",
+    "toml",
+    "tsx",
+    "typescript",
+    "vim",
+    "vue",
+    "yaml",
+  },
+}
diff --git a/config/nvim/lua/config/plugins/which-key.lua b/config/nvim/lua/config/plugins/which-key.lua
new file mode 100644
index 0000000..a872790
--- /dev/null
+++ b/config/nvim/lua/config/plugins/which-key.lua
@@ -0,0 +1,10 @@
+return function()
+  vim.o.timeout = true
+  vim.o.timeoutlen = 300
+
+  require("which-key").setup({
+    -- your configuration comes here
+    -- or leave it empty to use the default settings
+    -- refer to the configuration section below
+  })
+end
diff --git a/config/nvim/lua/plugins/lualine.lua b/config/nvim/lua/plugins/lualine.lua
new file mode 100644
index 0000000..ef7c3a3
--- /dev/null
+++ b/config/nvim/lua/plugins/lualine.lua
@@ -0,0 +1,9 @@
+return {
+  "nvim-lualine/lualine.nvim",
+
+  dependencies = {
+    "nvim-tree/nvim-web-devicons",
+  },
+
+  config = require("config.plugins.lualine")
+}
diff --git a/config/nvim/lua/plugins/neo-tree.lua b/config/nvim/lua/plugins/neo-tree.lua
new file mode 100644
index 0000000..bbdf888
--- /dev/null
+++ b/config/nvim/lua/plugins/neo-tree.lua
@@ -0,0 +1,11 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+
+  dependencies = { 
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons",
+    "MunifTanjim/nui.nvim",
+  },
+
+  config = require("config.plugins.neo-tree")
+}
diff --git a/config/nvim/lua/plugins/neotree.lua b/config/nvim/lua/plugins/neotree.lua
deleted file mode 100644
index 0f5b281..0000000
--- a/config/nvim/lua/plugins/neotree.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-return {
-  "nvim-neo-tree/neo-tree.nvim",
-
-  dependencies = { 
-    "nvim-lua/plenary.nvim",
-    "nvim-tree/nvim-web-devicons",
-    "MunifTanjim/nui.nvim",
-  },
-
-  config = function ()
-    -- Unless you are still migrating, remove the deprecated commands from v1.x
-    vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
-
-    require("neo-tree").setup({
-      hijack_netrw_behavior = "open_default"
-    })
-  end
-}
diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
index 09f319f..0047910 100644
--- a/config/nvim/lua/plugins/telescope.lua
+++ b/config/nvim/lua/plugins/telescope.lua
@@ -1,4 +1,5 @@
 return {
   "nvim-telescope/telescope.nvim",
+
   dependencies = { "nvim-lua/plenary.nvim" }
 }
diff --git a/config/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/tree-sitter.lua
similarity index 59%
rename from config/nvim/lua/plugins/treesitter.lua
rename to config/nvim/lua/plugins/tree-sitter.lua
index a7f5ca1..fbffef3 100644
--- a/config/nvim/lua/plugins/treesitter.lua
+++ b/config/nvim/lua/plugins/tree-sitter.lua
@@ -1,8 +1,11 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
+
     build = ":TSUpdate",
+
     event = { "BufReadPost", "BufNewFile" },
+
     dependencies = {
       {
         "nvim-treesitter/nvim-treesitter-textobjects",
@@ -27,41 +30,6 @@ return {
     },
 
     ---@type TSConfig
-    opts = {
-      highlight = { enable = true },
-      indent = { enable = true },
-      context_commentstring = { enable = true, enable_autocmd = false },
-      ensure_installed = {
-        "bash",
-        "c",
-        "css",
-        "dockerfile",
-        "eex",
-        "elixir",
-        "help",
-        "html",
-        "javascript",
-        "json",
-        "lua",
-        "luadoc",
-        "luap",
-        "markdown",
-        "markdown_inline",
-        "python",
-        "query",
-        "regex",
-        "ruby",
-        "rust",
-        "scss",
-        "sql",
-        "swift",
-        "toml",
-        "tsx",
-        "typescript",
-        "vim",
-        "vue",
-        "yaml",
-      },
-    },
+    opts = require("config.plugins.tree-sitter")
   },
 }
diff --git a/config/nvim/lua/plugins/which-key.lua b/config/nvim/lua/plugins/which-key.lua
new file mode 100644
index 0000000..6f47e34
--- /dev/null
+++ b/config/nvim/lua/plugins/which-key.lua
@@ -0,0 +1,5 @@
+return {
+  "folke/which-key.nvim",
+
+  config = require("config.plugins.which-key")
+}
diff --git a/config/nvim/lua/plugins/whichkey.lua b/config/nvim/lua/plugins/whichkey.lua
deleted file mode 100644
index 4a28899..0000000
--- a/config/nvim/lua/plugins/whichkey.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-  "folke/which-key.nvim",
-
-  config = function()
-    vim.o.timeout = true
-    vim.o.timeoutlen = 300
-    require("which-key").setup({
-      -- your configuration comes here
-      -- or leave it empty to use the default settings
-      -- refer to the configuration section below
-    })
-  end,
-}