wip

lua/plugins/common.lua

@@ -31,7 +31,6 @@ return {
       -- require('mini.colors').setup()
     end,
   },
-
   {
     'folke/which-key.nvim',
     event = 'VimEnter',

lua/plugins/git.lua

@@ -2,7 +2,7 @@ return {
   {
     'tpope/vim-fugitive',
     keys = {
-      { '<leader>gs', '<cmd>Git<cr>', desc = '[s]tatus' },
+      { '<leader>gs', '<cmd>vert Git<cr>', desc = '[s]tatus' },
     },
   },
   {

lua/plugins/harpoon.lua

@@ -0,0 +1,38 @@
+return {
+  'ThePrimeagen/harpoon',
+  branch = 'harpoon2',
+  dependencies = { 'nvim-lua/plenary.nvim' },
+  config = function()
+    local harpoon = require 'harpoon'
+
+    harpoon:setup()
+
+    vim.keymap.set('n', '<leader>ha', function()
+      harpoon:list():add()
+    end, { desc = '[a]dd' })
+    vim.keymap.set('n', '<leader>hh', function()
+      harpoon.ui:toggle_quick_menu(harpoon:list())
+    end, { desc = '[q]uick menu' })
+
+    vim.keymap.set('n', '<C-h>', function()
+      harpoon:list():select(1)
+    end)
+    vim.keymap.set('n', '<C-t>', function()
+      harpoon:list():select(2)
+    end)
+    vim.keymap.set('n', '<C-n>', function()
+      harpoon:list():select(3)
+    end)
+    vim.keymap.set('n', '<C-s>', function()
+      harpoon:list():select(4)
+    end)
+
+    -- Toggle previous & next buffers stored within Harpoon list
+    vim.keymap.set('n', '<C-S-P>', function()
+      harpoon:list():prev()
+    end)
+    vim.keymap.set('n', '<C-S-N>', function()
+      harpoon:list():next()
+    end)
+  end,
+}

lua/plugins/lsp.lua

@@ -139,6 +139,7 @@ return {
           lua = { 'stylua' },
           javascript = { { 'eslint_d', 'prettier' } },
           javascriptreact = { { 'eslint_d', 'prettier' } },
+          json = { { 'eslint_d', 'prettier' } },
           typescript = { { 'eslint_d', 'prettier' } },
           typescriptreact = { { 'eslint_d', 'prettier' } },
           ['_'] = { 'trim_whitespace' },

lua/plugins/orgmode.lua

@@ -7,13 +7,14 @@ return {
     require('orgmode').setup {
       org_agenda_files = '~/org/**/*',
       org_default_notes_file = '~/org/refile.org',
+      org_todo_keywords = { 'TODO', 'WAITING', '|', 'DONE', 'DELEGATED' },
     }
 
     -- NOTE: If you are using nvim-treesitter with `ensure_installed = "all"` option
     -- add `org` to ignore_install
-    -- require('nvim-treesitter.configs').setup({
-    --   ensure_installed = 'all',
-    --   ignore_install = { 'org' },
-    -- })
+    require('nvim-treesitter.configs').setup {
+      ensure_installed = 'all',
+      ignore_install = { 'org' },
+    }
   end,
 }

lua/plugins/telescope.lua

@@ -85,6 +85,7 @@ return { -- Fuzzy Finder (files, lsp, etc)
     vim.keymap.set('n', '<leader>*', builtin.grep_string, { desc = '[F]ind current [W]ord' })
     vim.keymap.set('n', '<leader>/', builtin.live_grep, { desc = '[F]ind by [G]rep' })
     vim.keymap.set('n', '<leader>fd', builtin.diagnostics, { desc = '[F]ind [D]iagnostics' })
+    vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = '[F]ind [B]uffer' })
 
     vim.keymap.set('n', '<leader>fr', builtin.resume, { desc = '[F]ind [R]esume' })
     vim.keymap.set('n', '<leader>fo', builtin.oldfiles, { desc = '[F]ind Recent Files ("." for repeat)' })