From 3b111bf252d35c030b23b8545df5ab1ac995b3cf Mon Sep 17 00:00:00 2001
From: Charles Danesi <charles@charlesdanesi.net>
Date: Wed, 25 Jun 2025 18:53:39 -0400
Subject: [PATCH] chore: cleaning up (remove and rename files, refactor config,
 fix errors)

---
 .config/.editorconfig                         |  4 +-
 .config/nvim/lua/core/lazy.lua                |  1 -
 .config/nvim/lua/plugins/cmp-gitmoji.lua      |  7 ---
 .config/nvim/lua/plugins/lsp/mason-lsp.lua    |  7 ---
 .config/nvim/lua/plugins/{lsp => }/mason.lua  |  0
 .../{lsp/lspconfig.lua => nvim-lspconfig.lua} |  0
 .../lua/plugins/treesitter/treesitter.lua     | 61 ++++++++-----------
 .../plugins/treesitter/ts-commentstring.lua   |  9 +++
 8 files changed, 39 insertions(+), 50 deletions(-)
 delete mode 100644 .config/nvim/lua/plugins/cmp-gitmoji.lua
 delete mode 100644 .config/nvim/lua/plugins/lsp/mason-lsp.lua
 rename .config/nvim/lua/plugins/{lsp => }/mason.lua (100%)
 rename .config/nvim/lua/plugins/{lsp/lspconfig.lua => nvim-lspconfig.lua} (100%)
 create mode 100644 .config/nvim/lua/plugins/treesitter/ts-commentstring.lua

diff --git a/.config/.editorconfig b/.config/.editorconfig
index 79f8bfc..574d9af 100644
--- a/.config/.editorconfig
+++ b/.config/.editorconfig
@@ -12,6 +12,7 @@ tab_width = 3
 
 [*.lua]
 max_line_length = 120
+insert_final_newline = false
 
 [{*.yaml,*.yml}]
 indent_size = 2
@@ -23,4 +24,5 @@ indent_style = tab
 
 [*.md]
 indent_size = 4
-trim_trailing_whitespace = false
\ No newline at end of file
+trim_trailing_whitespace = false
+insert_final_newline = true
\ No newline at end of file
diff --git a/.config/nvim/lua/core/lazy.lua b/.config/nvim/lua/core/lazy.lua
index 5f74582..97d302b 100644
--- a/.config/nvim/lua/core/lazy.lua
+++ b/.config/nvim/lua/core/lazy.lua
@@ -17,7 +17,6 @@ require('lazy').setup({
    { import = 'core.colorscheme' },
    { import = 'plugins' },
    { import = 'plugins.treesitter' },
-   { import = 'plugins.lsp' },
 }, {
    install = {
       colorscheme = { 'nord' },
diff --git a/.config/nvim/lua/plugins/cmp-gitmoji.lua b/.config/nvim/lua/plugins/cmp-gitmoji.lua
deleted file mode 100644
index 4fd7ea8..0000000
--- a/.config/nvim/lua/plugins/cmp-gitmoji.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
-   'Dynge/gitmoji.nvim',
-   dependencies = {
-      'hrsh7th/nvim-cmp',
-   },
-   ft = 'gitcommit',
-}
diff --git a/.config/nvim/lua/plugins/lsp/mason-lsp.lua b/.config/nvim/lua/plugins/lsp/mason-lsp.lua
deleted file mode 100644
index 38f857d..0000000
--- a/.config/nvim/lua/plugins/lsp/mason-lsp.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
-   'williamboman/mason-lspconfig.nvim',
-   dependencies = {
-      'williamboman/mason.nvim',
-   },
-   lazy = true,
-}
diff --git a/.config/nvim/lua/plugins/lsp/mason.lua b/.config/nvim/lua/plugins/mason.lua
similarity index 100%
rename from .config/nvim/lua/plugins/lsp/mason.lua
rename to .config/nvim/lua/plugins/mason.lua
diff --git a/.config/nvim/lua/plugins/lsp/lspconfig.lua b/.config/nvim/lua/plugins/nvim-lspconfig.lua
similarity index 100%
rename from .config/nvim/lua/plugins/lsp/lspconfig.lua
rename to .config/nvim/lua/plugins/nvim-lspconfig.lua
diff --git a/.config/nvim/lua/plugins/treesitter/treesitter.lua b/.config/nvim/lua/plugins/treesitter/treesitter.lua
index 0fb6e16..12cf719 100644
--- a/.config/nvim/lua/plugins/treesitter/treesitter.lua
+++ b/.config/nvim/lua/plugins/treesitter/treesitter.lua
@@ -1,45 +1,34 @@
 return {
    'nvim-treesitter/nvim-treesitter',
-   -- event = { "BufReadPre", "BufNewFile" },
-   lazy = true,
-   cmd = { 'TSUpdateSync', 'TSUpdate', 'TSInstall' },
+   branch = 'master',
+   lazy = false,
    build = ':TSUpdate',
+
    opts = {
+      sync_install = true,
+      auto_install = true,
+      ensure_installed = {
+         'lua',
+         'markdown',
+         'markdown_inline',
+         'css',
+         'html',
+         'javascript',
+         'json',
+         'xml',
+         'toml',
+         'yaml',
+         'python',
+         'bash',
+         'diff',
+         'regex',
+         'sql',
+      },
       highlight = {
          enable = true,
          additional_vim_regex_highlighting = false,
       },
       indent = { enable = true, disable = {} },
-      ensure_installed = {
-         'bash',
-         'css',
-         'diff',
-         'dockerfile',
-         'git_config',
-         'git_rebase',
-         'gitcommit',
-         'gitignore',
-         'graphql',
-         'html',
-         'javascript',
-         'json',
-         'lua',
-         'markdown',
-         'markdown_inline',
-         'python',
-         'regex',
-         'sql',
-         'todotxt',
-         'vim',
-         'vimdoc',
-         'xml',
-         'tmux',
-         'toml',
-         'yaml',
-      },
-      ignore_install = {},
-      sync_install = true,
-      auto_install = true,
       incremental_selection = {
          enable = true,
          keymaps = {
@@ -50,4 +39,8 @@ return {
          },
       },
    },
-}
+
+   config = function(_, opts)
+      require('nvim-treesitter.configs').setup(opts)
+   end,
+}
\ No newline at end of file
diff --git a/.config/nvim/lua/plugins/treesitter/ts-commentstring.lua b/.config/nvim/lua/plugins/treesitter/ts-commentstring.lua
new file mode 100644
index 0000000..25629a3
--- /dev/null
+++ b/.config/nvim/lua/plugins/treesitter/ts-commentstring.lua
@@ -0,0 +1,9 @@
+return {
+   'JoosepAlviste/nvim-ts-context-commentstring',
+   enabled = true,
+   dependencies = { 'numToStr/Comment.nvim' },
+   event = 'VeryLazy',
+   opts = {
+      enable_autocmd = false,
+   },
+}