indentation fix, linting, terminal toggleable

Author: JPHarding

.markdownlint.yaml

@@ -0,0 +1,3 @@
+# https://github.com/DavidAnson/markdownlint/blob/main/schema/.markdownlint.yaml
+default: true
+MD013: false

init.lua

@@ -681,17 +681,31 @@ require('lazy').setup({
         --    https://github.com/pmizio/typescript-tools.nvim
         --
         -- But for many setups, the LSP (`ts_ls`) will work just fine
+
+        -- LSPs
         ts_ls = {},
-        ruff = {},
         csharp_ls = {},
-        debugpy = {},
         intelephense = {},
         html = {},
         cssls = {},
         docker_compose_language_service = {},
         dockerls = {},
+
+        -- Formatters
+        ruff = {},
+        prettierd = {},
+        prettier = {},
+        pint = {},
+
+        -- linters
         tombi = {},
-        --
+        ['markdownlint-cli2'] = {},
+        htmlhint = {},
+        eslint_d = {},
+        phpstan = {},
+
+        -- debuggers
+        debugpy = {},
 
         lua_ls = {
           -- cmd = { ... },
@@ -770,7 +784,7 @@ require('lazy').setup({
           return nil
         else
           return {
-            timeout_ms = 500,
+            timeout_ms = 5000,
             lsp_format = 'fallback',
           }
         end
@@ -781,7 +795,17 @@ require('lazy').setup({
         python = { 'ruff_fix', 'ruff_format', 'ruff_organize_imports' },
 
         -- You can use 'stop_after_first' to run the first available formatter from the list
-        -- javascript = { "prettierd", "prettier", stop_after_first = true },
+        javascript = { 'prettierd', 'prettier', stop_after_first = true },
+        javascriptreact = { 'prettierd', 'prettier', stop_after_first = true },
+        typescript = { 'prettierd', 'prettier', stop_after_first = true },
+        typescriptreact = { 'prettierd', 'prettier', stop_after_first = true },
+        css = { 'prettierd', 'prettier', stop_after_first = true },
+        html = { 'prettierd', 'prettier', stop_after_first = true },
+        json = { 'prettierd', 'prettier', stop_after_first = true },
+        markdown = { 'prettierd', 'prettier', stop_after_first = true },
+        yaml = { 'prettierd', 'prettier', stop_after_first = true },
+        graphql = { 'prettierd', 'prettier', stop_after_first = true },
+        php = { 'pint' }, -- https://laravel.com/docs/12.x/pint
       },
     },
   },
@@ -958,6 +982,7 @@ require('lazy').setup({
         'c',
         'diff',
         'html',
+        'css',
         'lua',
         'luadoc',
         'markdown',
@@ -969,6 +994,17 @@ require('lazy').setup({
         'c_sharp',
         'javascript',
         'php',
+        'php_only',
+        'phpdoc',
+        'json',
+        'json5',
+        'razor',
+        'typescript',
+        'vue',
+        'xml',
+        'csv',
+        'dockerfile',
+        'powershell',
       },
       -- Autoinstall languages that are not installed
       auto_install = true,
@@ -977,9 +1013,9 @@ require('lazy').setup({
         -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
         --  If you are experiencing weird indenting issues, add the language to
         --  the list of additional_vim_regex_highlighting and disabled languages for indent.
-        additional_vim_regex_highlighting = { 'ruby' },
+        additional_vim_regex_highlighting = { 'ruby', 'php' },
       },
-      indent = { enable = true, disable = { 'ruby' } },
+      indent = { enable = true, disable = { 'ruby', 'php' } },
     },
     -- There are additional nvim-treesitter modules that you can use to interact
     -- with nvim-treesitter. You should go explore a few and see what interests you:
@@ -1000,8 +1036,8 @@ require('lazy').setup({
   --
   require 'kickstart.plugins.debug',
   require 'kickstart.plugins.indent_line',
-  -- require 'kickstart.plugins.lint',
-  -- require 'kickstart.plugins.autopairs',
+  require 'kickstart.plugins.lint',
+  require 'kickstart.plugins.autopairs',
   require 'kickstart.plugins.neo-tree',
   -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
 

lazy-lock.json

@@ -17,11 +17,11 @@
   "mini.nvim": { "branch": "main", "commit": "3f71fd3573981bf18f76b2bfb6518c4ae728638d" },
   "neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-dap": { "branch": "master", "commit": "cc77338e6e34c79f1c638f51ae4160dc9bfb05de" },
   "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
   "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" },
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" },
   "nvim-lspconfig": { "branch": "master", "commit": "dbdb80d3bd311989d21029c63918d67a786d5013" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },

lua/custom/indentation.lua

@@ -0,0 +1,70 @@
+-- lua/indentation.lua
+local M = {}
+
+-- global default
+M.default = {
+  tabstop = 4,
+  shiftwidth = 4,
+  expandtab = true,
+}
+
+-- per-filetype overrides
+M.by_ft = {
+  javascript = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  typescript = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  typescriptreact = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  javascriptreact = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  json = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  yaml = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  html = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  css = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  scss = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  lua = { tabstop = 2, shiftwidth = 2, expandtab = true },
+
+  python = { tabstop = 4, shiftwidth = 4, expandtab = true },
+  rust = { tabstop = 4, shiftwidth = 4, expandtab = true },
+  php = { tabstop = 4, shiftwidth = 4, expandtab = true },
+  java = { tabstop = 4, shiftwidth = 4, expandtab = true },
+
+  cpp = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  c = { tabstop = 2, shiftwidth = 2, expandtab = true },
+
+  sh = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  bash = { tabstop = 2, shiftwidth = 2, expandtab = true },
+  zsh = { tabstop = 2, shiftwidth = 2, expandtab = true },
+
+  go = { tabstop = 8, shiftwidth = 8, expandtab = false },
+}
+
+-- fallback check: if filetype not in `by_ft`, use default
+function M.setup()
+  vim.opt.tabstop = M.default.tabstop
+  vim.opt.shiftwidth = M.default.shiftwidth
+  vim.opt.expandtab = M.default.expandtab
+
+  for ft, opts in pairs(M.by_ft) do
+    vim.api.nvim_create_autocmd('FileType', {
+      pattern = ft,
+      callback = function()
+        vim.bo.tabstop = opts.tabstop
+        vim.bo.shiftwidth = opts.shiftwidth
+        vim.bo.expandtab = opts.expandtab
+      end,
+    })
+  end
+
+  -- catch-all fallback for unspecified filetypes
+  vim.api.nvim_create_autocmd('FileType', {
+    pattern = '*',
+    callback = function()
+      local ts = vim.bo.tabstop
+      if ts ~= 2 and ts ~= 8 then
+        vim.bo.tabstop = M.default.tabstop
+        vim.bo.shiftwidth = M.default.shiftwidth
+        vim.bo.expandtab = M.default.expandtab
+      end
+    end,
+  })
+end
+
+return M

lua/custom/plugins/bufferline.lua

@@ -4,7 +4,14 @@ return {
   dependencies = 'nvim-tree/nvim-web-devicons',
   config = function()
     vim.opt.termguicolors = true
-    require('bufferline').setup {}
+    require('bufferline').setup {
+      -- set up terminal buffer hiding.
+      options = {
+        custom_filter = function(bufnr)
+          return vim.bo[bufnr].filetype ~= 'terminal' and vim.api.nvim_get_option_value('buflisted', { buf = bufnr })
+        end,
+      },
+    }
     vim.keymap.set('n', '<leader>.', '<cmd>BufferLineMoveNext<CR>', { desc = 'Move buffer right' })
     vim.keymap.set('n', '<leader>,', '<cmd>BufferLineMovePrev<CR>', { desc = 'Move buffer left' })
     vim.keymap.set('n', '[b', '<cmd>BufferLineCyclePrev<cr>', { desc = 'Previous buffer (BufferLine order)' })

lua/custom/plugins/init.lua

@@ -8,4 +8,5 @@ return {
   require 'custom.plugins.vim-be-good', -- in empty file run :VimBeGood
   require 'custom.plugins.harpoon2',
   require 'custom.plugins.jp-terminal',
+  require('custom.indentation').setup(),
 }

lua/custom/plugins/jp-terminal.lua

@@ -1,8 +1,46 @@
 return {
-  -- open and add terminal to harpoon buffer.
   vim.keymap.set('n', '<leader>tt', function()
+    local term_buf_name = 'Powershell'
+    local existing_buf = nil
+    local visible_win = nil
+
+    -- Search all buffers for one named 'Woot Terminal'
+    for _, buf in ipairs(vim.api.nvim_list_bufs()) do
+      if vim.api.nvim_buf_get_name(buf):match(term_buf_name) then
+        existing_buf = buf
+        break
+      end
+    end
+
+    -- Check if the terminal is currently visible in any window
+    if existing_buf then
+      for _, win in ipairs(vim.api.nvim_list_wins()) do
+        if vim.api.nvim_win_get_buf(win) == existing_buf then
+          visible_win = win
+          break
+        end
+      end
+    end
+
+    -- If the terminal is visible, close the window
+    if visible_win then
+      vim.api.nvim_win_close(visible_win, true)
+      return
+    end
+
+    -- If the buffer exists but not visible, open it in split
+    if existing_buf then
+      vim.cmd 'split'
+      vim.cmd 'resize 15'
+      vim.api.nvim_win_set_buf(0, existing_buf)
+      return
+    end
+
+    -- Otherwise, create a new terminal buffer
     vim.cmd 'split term://pwsh.exe'
     vim.cmd 'resize 15'
-    vim.api.nvim_buf_set_name(0, 'New Terminal')
-  end, { desc = 'New terminal' }),
+    vim.api.nvim_buf_set_name(0, term_buf_name)
+    vim.api.nvim_set_option_value('buflisted', false, { scope = 'local' })
+    vim.bo.filetype = 'terminal'
+  end, { desc = 'Toggle Woot Terminal' }),
 }

lua/kickstart/plugins/lint.lua

@@ -3,14 +3,24 @@ return {
   { -- Linting
     'mfussenegger/nvim-lint',
     event = { 'BufReadPre', 'BufNewFile' },
+
     config = function()
       local lint = require 'lint'
+
       lint.linters_by_ft = {
-        markdown = { 'markdownlint' },
+        markdown = { 'markdownlint-cli2' },
         html = { 'htmlhint' },
         javascript = { 'eslint_d' },
         typescript = { 'eslint_d' },
         python = { 'ruff' },
+        php = { 'phpstan' },
+      }
+
+      -- configure linters like this:
+      lint.linters['markdownlint-cli2'].args = {
+        '--config',
+        vim.fn.stdpath 'config' .. '/.markdownlint.yaml',
+        '--',
       }
 
       -- To allow other plugins to add linters to require('lint').linters_by_ft,
@@ -48,6 +58,7 @@ return {
       -- Create autocommand which carries out the actual linting
       -- on the specified events.
       local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
+
       vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
         group = lint_augroup,
         callback = function()