From 21a75c46352fc447ba1e305962cdf8bea2adc4e5 Mon Sep 17 00:00:00 2001
From: ggdawson <37080130+ggdawson@users.noreply.github.com>
Date: Wed, 3 May 2023 10:26:28 -0600
Subject: [PATCH] fix: more tweaks

---
 after/plugin/defaults.lua   |  6 +++--
 init.lua                    |  4 ++--
 lua/custom/plugins/init.lua | 46 +++++++++++++++++++++++++++++++++----
 3 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/after/plugin/defaults.lua b/after/plugin/defaults.lua
index 3ec96904..969f1940 100644
--- a/after/plugin/defaults.lua
+++ b/after/plugin/defaults.lua
@@ -5,8 +5,6 @@ set.cursorline = true
 set.expandtab = true
 set.list = true
 set.shiftwidth = 2
--- set.spell = true
--- set.spelllang = 'en_us'
 set.splitbelow = true
 set.splitright = true
 set.swapfile = false
@@ -32,6 +30,10 @@ vim.keymap.set('v', '<C-j>', ":m '>+1<CR>gv=gv", { noremap = true, desc = 'Bubbl
 -- additional telescope triggers
 vim.keymap.set('n', '<C-t>', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
 vim.keymap.set('n', '<C-g>', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
+vim.keymap.set('n', '<leader>sj', require('telescope.builtin').jumplist, { desc = '[S]earch [J]umplist' })
+vim.keymap.set('n', '<leader>sj', require('telescope.builtin').jumplist, { desc = '[S]earch [J]umplist' })
+vim.keymap.set('n', '<leader>ss', require('telescope.builtin').git_status, { desc = '[S]earch [S]tatus' })
+vim.keymap.set('n', '<leader>sm', require('telescope.builtin').marks, { desc = '[S]earch [M]arks' })
 
 vim.diagnostic.config({
   severity_sort = true,
diff --git a/init.lua b/init.lua
index e10deec0..654c250e 100644
--- a/init.lua
+++ b/init.lua
@@ -139,7 +139,7 @@ require('lazy').setup({
   },
 
   -- "gc" to comment visual regions/lines
-  { 'numToStr/Comment.nvim',         opts = {} },
+  { 'numToStr/Comment.nvim', opts = { } },
 
   -- Fuzzy Finder (files, lsp, etc)
   { 'nvim-telescope/telescope.nvim', version = '*', dependencies = { 'nvim-lua/plenary.nvim' } },
@@ -412,7 +412,7 @@ end
 local servers = {
   clangd = {},
   cssls = {},
-  eslint = {},
+  -- eslint_d = {},
   gopls = {},
   pyright = {},
   rust_analyzer = {},
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index ef690820..bc7336cf 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -95,25 +95,32 @@ return {
 
   {
     "folke/trouble.nvim",
-    cond = false,
-    requires = "nvim-tree/nvim-web-devicons",
+    dependencies = {
+      "nvim-tree/nvim-web-devicons",
+    },
     config = function()
       require("trouble").setup {}
+
       vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>",
         { silent = true, noremap = true }
       )
+
       vim.keymap.set("n", "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<cr>",
         { silent = true, noremap = true }
       )
+
       vim.keymap.set("n", "<leader>xd", "<cmd>TroubleToggle document_diagnostics<cr>",
         { silent = true, noremap = true }
       )
+
       vim.keymap.set("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>",
         { silent = true, noremap = true }
       )
+
       vim.keymap.set("n", "<leader>xq", "<cmd>TroubleToggle quickfix<cr>",
         { silent = true, noremap = true }
       )
+
       vim.keymap.set("n", "gR", "<cmd>TroubleToggle lsp_references<cr>",
         { silent = true, noremap = true }
       )
@@ -131,7 +138,7 @@ return {
           null_ls.builtins.code_actions.eslint_d,
           null_ls.builtins.diagnostics.codespell,
           null_ls.builtins.diagnostics.eslint_d,
-          null_ls.builtins.formatting.eslint_d,
+          -- null_ls.builtins.formatting.eslint_d,
           null_ls.builtins.formatting.prettierd,
         },
       })
@@ -153,5 +160,36 @@ return {
         automatic_setup = false,
       })
     end,
-  }
+  },
+
+  {
+    'nvim-treesitter/nvim-treesitter',
+    dependencies = {
+      'JoosepAlviste/nvim-ts-context-commentstring',
+    },
+    config = function()
+      require('nvim-treesitter.configs').setup {
+        ensure_installed = {
+          'css',
+          'html',
+          'javascript',
+          'lua',
+          'python',
+          'scss',
+          'tsx',
+          'typescript',
+          'vim',
+        },
+
+        context_commentstring = {
+          enable = true,
+          enable_autocmd = false,
+        }
+      }
+
+      require('Comment').setup {
+        pre_hook = require('ts_context_commentstring.integrations.comment_nvim').create_pre_hook(),
+      }
+    end
+  },
 }