moar

lua/custom/core/keymaps.lua

@@ -112,5 +112,5 @@ keymap.set("n", "<leader>3", function() require("harpoon.ui").nav_file(3) end, o
 keymap.set("n", "<leader>4", function() require("harpoon.ui").nav_file(4) end, opts)
 
 -- undotree
-keymap.set("n", "<leader><F5>", ":UndotreeToggle<CR>")
+keymap.set("n", "<leader>u", ":UndotreeToggle<CR>")
 

lua/custom/plugins/conform.lua

@@ -0,0 +1,42 @@
+return {
+  'stevearc/conform.nvim',
+  event = { 'BufReadPre', 'BufNewFile' },
+  config = function()
+    local conform = require 'conform'
+
+    conform.setup {
+      formatters_by_ft = {
+        lua = { 'stylua' },
+        svelte = { { 'prettierd', 'prettier' } },
+        javascript = { { 'prettierd', 'prettier' } },
+        typescript = { { 'prettierd', 'prettier' } },
+        javascriptreact = { { 'prettierd', 'prettier' } },
+        typescriptreact = { { 'prettierd', 'prettier' } },
+        json = { { 'prettierd', 'prettier' } },
+        graphql = { { 'prettierd', 'prettier' } },
+        java = { 'google-java-format' },
+        kotlin = { 'ktlint' },
+        ruby = { 'standardrb' },
+        markdown = { { 'prettierd', 'prettier' } },
+        erb = { 'htmlbeautifier' },
+        html = { 'htmlbeautifier' },
+        bash = { 'beautysh' },
+        proto = { 'buf' },
+        rust = { 'rustfmt' },
+        yaml = { 'yamlfix' },
+        toml = { 'taplo' },
+        css = { { 'prettierd', 'prettier' } },
+        scss = { { 'prettierd', 'prettier' } },
+        sh = { { 'shellcheck' } },
+      },
+    }
+
+    vim.keymap.set({ 'n', 'v' }, '<leader>l', function()
+      conform.format {
+        lsp_fallback = true,
+        async = false,
+        timeout_ms = 1000,
+      }
+    end, { desc = 'Format file or range (in visual mode)' })
+  end,
+}

lua/custom/plugins/neo-tree.lua

@@ -1,19 +1,19 @@
 -- Unless you are still migrating, remove the deprecated commands from v1.x
-vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
+vim.cmd [[ let g:neo_tree_remove_legacy_commands = 1 ]]
 
 return {
-  "nvim-neo-tree/neo-tree.nvim",
+  'nvim-neo-tree/neo-tree.nvim',
-  version = "*",
+  version = '*',
   dependencies = {
-    "nvim-lua/plenary.nvim",
+    'nvim-lua/plenary.nvim',
     -- "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
-    "MunifTanjim/nui.nvim",
+    'MunifTanjim/nui.nvim',
   },
   keys = {
-    { "<leader>o", ":Neotree toggle<cr>", desc = "NeoTree", silent = true },
+    { '<leader>o', ':Neotree toggle<cr>', desc = 'NeoTree', silent = true },
   },
-  config = function ()
+  config = function()
-    require('neo-tree').setup {
+    require('neo-tree').setup {}
-    }
   end,
 }
+

lua/custom/plugins/nvim-ufo.lua

@@ -0,0 +1,25 @@
+return {
+  "kevinhwang91/nvim-ufo",
+  dependencies = "kevinhwang91/promise-async",
+  config = function()
+    vim.o.foldcolumn = "1" -- '0' is not bad
+    vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
+    vim.o.foldlevelstart = 99
+    vim.o.foldenable = true
+
+    vim.keymap.set("n", "zR", require("ufo").openAllFolds, { desc = "Open all folds" })
+    vim.keymap.set("n", "zM", require("ufo").closeAllFolds, { desc = "Close all folds" })
+    vim.keymap.set("n", "zK", function()
+      local winid = require("ufo").peekFoldedLinesUnderCursor()
+      if not winid then
+        vim.lsp.buf.hover()
+      end
+    end, { desc = "Peek Fold" })
+
+    require("ufo").setup({
+      provider_selector = function(bufnr, filetype, buftype)
+        return { "lsp", "indent" }
+      end,
+    })
+  end,
+}

lua/custom/plugins/typescript-tools.lua

@@ -0,0 +1,15 @@
+return {
+  'pmizio/typescript-tools.nvim',
+  dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' },
+  opts = {},
+  config = function()
+    require('typescript-tools').setup {
+      settings = {
+        tsserver_plugins = {
+          -- '@styled/typescript-styled-plugin',
+          'typescript-styled-plugin',
+        },
+      },
+    }
+  end,
+}