More tweaks again. Too many to detail in this message and over too much time

init.lua

@@ -40,7 +40,7 @@ local lazyConfig = {
   --   lazy = true,
   -- },
   install = {
-    colorscheme = { 'catppuccin' },
+    colorscheme = { vim.g.pref_colorscheme },
   },
   ui = {
     border = preferred_border,
@@ -98,24 +98,14 @@ require('lazy').setup({
     },
   },
   'sudormrfbin/cheatsheet.nvim',
-  -- {
-  --   'nvimdev/lspsaga.nvim',
-  --   event = "LspAttach",
-  --   dependencies = {
-  --     'nvim-treesitter/nvim-treesitter',
-  --     'nvim-tree/nvim-web-devicons',
-  --   },
-  --   config = true,
-  -- },
-
   -- Code action lightbulb, like in VSCode
-  {
-    'kosayoda/nvim-lightbulb',
-    dependencies = {
-      'neovim/nvim-lspconfig',
-    },
-    opts = { autocmd = { enabled = true } },
-  },
+  -- {
+  --   'kosayoda/nvim-lightbulb',
+  --   dependencies = {
+  --     'neovim/nvim-lspconfig',
+  --   },
+  --   opts = { autocmd = { enabled = true } },
+  -- },
   { 'folke/trouble.nvim' },
 
 
@@ -228,11 +218,11 @@ pcall(require('telescope').load_extension, 'fzf')
 -- See `:help nvim-treesitter`
 require('nvim-treesitter.configs').setup {
   -- Add languages to be installed here that you want installed for treesitter
-  ensure_installed = { 'lua', 'rust', 'tsx', 'typescript', 'javascript', 'astro', 'svelte',
+  ensure_installed = { 'astro', 'lua', 'rust', 'tsx', 'typescript', 'javascript', 'astro', 'svelte',
     'vimdoc', 'vim', 'markdown', 'css', 'json', 'yaml', 'bash' },
 
   -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
-  auto_install = false,
+  auto_install = true,
 
   highlight = { enable = true },
   indent = { enable = true },

lua/custom/helpers/colorscheme.lua

@@ -16,7 +16,8 @@ local function get_if_available(name, opts)
 end
 
 -- Uncomment the colorscheme to use
-local colorscheme = get_if_available("catppuccin-mocha")
+local colorscheme = get_if_available(vim.g.pref_colorscheme)
+-- local colorscheme = get_if_available("catppuccin-mocha")
 -- local colorscheme = get_if_available("minicyan")
 -- local colorscheme = get_if_available('gruvbox')
 -- local colorscheme = get_if_available('rose-pine')

lua/custom/keymaps.lua

@@ -86,3 +86,4 @@ kmap('<C-W>', function()
 end, '[W]rap word under cursor')
 
 -- kmap('<C-R><C-R>', '<cmd>ReloadConfig<cr>', '[R]reload nvim config')
+kmap('<A-q>', '<esc>vipgw<cr>', 'Reflow current paragraph', {'n', 'v', 'i'})

lua/custom/options.lua

@@ -7,7 +7,8 @@ local globals = {
   pref_border_style = 'single',
   pref_blend = 0,
   pref_colorscheme = 'catppuccin',
-  pref_layer_colorscheme = 'catppuccin-macchiato',
+  -- pref_colorscheme = 'nordic',
+  pref_layer_colorscheme = 'minicyan',
   pref_autoformat = false,
 }
 
@@ -49,8 +50,8 @@ local opts = {
   scrolloff = 6,
 
   -- Code folding
-  foldmethod = 'expr',
-  foldexpr = 'nvim_treesitter#foldexpr()',
+  -- foldmethod = 'expr',
+  -- foldexpr = 'nvim_treesitter#foldexpr()',
 }
 
 -- Set options from table

lua/custom/plugins/ai.lua

@@ -1,6 +1,7 @@
 return {
   {
     -- https://github.com/gsuuon/llm.nvim#configuration
+    enabled = false,
     'gsuuon/llm.nvim',
     config = function()
       require('llm').setup({

lua/custom/plugins/code-formatting.lua

@@ -7,6 +7,14 @@ local prettierd = function()
 end
 
 return {
+  {
+    "The Primeagen/refactoring.nvim",
+    requires = {
+      "nvim-lua/plenary.nvim",
+      "nvim-treesitter/nvim-treesitter",
+    },
+    config = true,
+  },
   {
     -- https://github.com/mhartington/formatter.nvim#configure
     'mhartington/formatter.nvim',

lua/custom/plugins/editor.lua

@@ -9,6 +9,7 @@ return {
   {
     -- https://github.com/anuvyklack/pretty-fold.nvim#foldtext-configuration
     'anuvyklack/pretty-fold.nvim',
+    enabled = false,
     dependencies = {
       {
         -- https://github.com/anuvyklack/fold-preview.nvim#configuration
@@ -179,4 +180,17 @@ return {
       end)
     end,
   },
+  {
+    "abecodes/tabout.nvim",
+    dependencies = { "nvim-treesitter/nvim-treesitter" },
+    cinfig = true,
+  },
+  {
+    "ray-x/navigator.nvim",
+    enabled = false,
+    dependencies = {
+      "ray-x/guihua",
+      "neovim/nvim-lspconfig",
+    },
+  },
 }

lua/custom/plugins/languages.lua

@@ -1,11 +1,19 @@
 return {
   {
     'wuelnerdotexe/vim-astro',
+    dependencies = {
+      { 'virchau13/tree-sitter-astro' },
+    },
     init = function()
       vim.g.astro_typescript = 'enable'
     end,
     config = false,
   },
+  {
+    "davidmh/mdx.nvim",
+    config = true,
+    dependencies = { "nvim-treesitter/nvim-treesitter" }
+  },
   {
     -- https://github.com/leafOfTree/vim-svelte-plugin#configuration
     'leafOfTree/vim-svelte-plugin',

lua/custom/plugins/languages/typescript.lua

@@ -1,4 +1,5 @@
 return {
+  { "dmmulroy/ts-error-translator.nvim" },
   {
     -- https://github.com/pmizio/typescript-tools.nvim#%EF%B8%8F-configuration
     "pmizio/typescript-tools.nvim",
@@ -10,11 +11,14 @@ return {
         separate_diagnostic_server = true,
         publish_diagnostic_on = "change",
         tsserver_path = "/Users/oobleck/Library/pnpm/tsserver",
-        expose_as_code_action = { "all" },
+        expose_as_code_action = "all",
+        code_lens = "all",
+        disable_member_code_lens = false,
       },
     },
     config = true,
     keys = {
+      { "<Leader>cr", vim.lsp.buf.rename, desc = "[R]ename symbol" },
       { "<Leader>co", "<cmd>TSToolsOrganizeImports<cr>",     desc = "[O]rganize Imports" },
       { "<Leader>cs", "<cmd>TSToolsSortImports<cr>",         desc = "[S]ort Impots" },
       { "<Leader>cu", "<cmd>TSToolsRemoveUnusedImports<cr>", desc = "Remove [u]nused imports" },

lua/custom/plugins/lsp-config.lua

@@ -71,7 +71,23 @@ return {
         --   vim.keymap.set("n", "gp", "<cmd>lua require('goto-preview').goto_preview_definition()<CR>",
         --     { noremap = true, desc = '[G]o to Definition [P]review' })
         -- end,
-      }
+      },
+      {
+        'nvimdev/lspsaga.nvim',
+        event = "LspAttach",
+        dependencies = {
+          'nvim-treesitter/nvim-treesitter',
+          'nvim-tree/nvim-web-devicons',
+        },
+        config = true,
+        keys = {
+          { "<Leader>cp", "<cmd>Lspsaga peek_definition<cr>", desc = "[P]eek definition" },
+          { "<Leader>cF", "<cmd>Lspsaga finder", desc = "[F]ind references" },
+          { "<Leader>cI", "<cmd>Lspsaga incoming_calls", desc = "[I]ncoming calls"  },
+          { "<Leader>cO", "<cmd>Lspsaga outgoing_calls", desc = "[O]utgoing calls"  },
+        },
+      },
+
     },
     opts = {
       -- options for vim.diagnostic.config()
@@ -105,13 +121,23 @@ return {
       --  If you want to override the default filetypes that your language server will attach to you can
       --  define the property 'filetypes' to the map in question.
       servers = {
+        astro = {
+          -- init_options = {
+          --   typescript = {},
+          -- },
+        },
         rust_analyzer = {},
-        tsserver = { filetypes = {'typescript', 'javascript'} },
+        tsserver = { filetypes = { 'typescript', 'javascript' } },
         stylelint_lsp = {
           stylelintplus = {
             autoFixOnFormat = true,
           },
         },
+        mdx_analyzer = {
+          typescript = {
+            enabled = true,
+          },
+        },
         eslint = {},
         bashls = {},
         -- beautysh = {},

lua/custom/plugins/ui.lua

@@ -7,6 +7,14 @@ return {
     "catppuccin/nvim",
     name = "catppuccin",
   },
+  {
+    'AlexvZyl/nordic.nvim',
+    lazy = false,
+    priority = 1000,
+    config = function()
+      require 'nordic'.load()
+    end
+  },
   "sainnhe/everforest",
   {
     -- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-base16.md#default-config
@@ -19,23 +27,30 @@ return {
   },
 
   -- Other UI
-  -- {
-  --   -- Breadcrumbs dropbar (like IntelliJ's): Requires nvim 0.10+
-  --   -- https://github.com/Bekaboo/dropbar.nvim#configuration
-  --   'Bekaboo/dropbar.nvim',
-  --   dependencies = { 'nvim-tree/nvim-web-devicons' },
-  --   opts = {
-  --     sources = {
-  --       path = {
-  --         relative_to = function(_)
-  --           return vim.fn.getcwd()
-  --         end,
-  --       },
-  --     },
-  --   },
-  -- },
+  {
+    -- Breadcrumbs dropbar (like IntelliJ's): Requires nvim 0.10+
+    -- https://github.com/Bekaboo/dropbar.nvim#configuration
+    'Bekaboo/dropbar.nvim',
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
+      'nvim-telescope/telescope-fzf-native.nvim',
+    },
+    opts = {
+      sources = {
+        path = {
+          relative_to = function(_)
+            return vim.fn.getcwd()
+          end,
+        },
+      },
+    },
+    init = function()
+      vim.ui.select = require('dropbar.utils.menu').select
+    end,
+  },
   {
     "LunarVim/breadcrumbs.nvim",
+    enabled = false,
     dependencies = {
       "SmiteshP/nvim-navic",
       opts = {
@@ -197,17 +212,19 @@ return {
     },
     config = true,
   },
-  -- {
-  --   'echasnovski/mini.tabline',
-  --   dependencies = {
-  --     'nvim-tree/nvim-web-devicons',
-  --     'lewis6991/gitsigns.nvim',
-  --   },
-  --   config = true,
-  -- },
+  {
+    'echasnovski/mini.tabline',
+    enabled = false,
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
+      'lewis6991/gitsigns.nvim',
+    },
+    config = true,
+  },
   {
     -- https://github.com/romgrk/barbar.nvim#options
     'romgrk/barbar.nvim',
+    enabled = true,
     dependencies = {
       'lewis6991/gitsigns.nvim',     -- OPTIONAL: for git status
       'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
@@ -290,7 +307,7 @@ return {
         local cwd = vim.fn.getcwd()
         local phrase = string.match(cwd, '[/\\]([^/\\]+)$')
         local fonts = { 'chrome', 'block', 'tiny' }
-        local figfonts = {'sblood', 'rounded'}
+        local figfonts = { 'sblood', 'rounded' }
         local banner = phrase
         local cfonts_cmd = "cfonts " .. phrase .. " -f " .. fonts[1]
         local fig_cmd = 'figlet -W -f' .. figfonts[1] .. ' ' .. phrase
@@ -369,6 +386,9 @@ return {
         end,
         {}
       )
+      vim.keymap.set({ 'n' }, function()
+        require 'mini.starter'.open()
+      end, { desc = '[S]how [S]tart screen/Dashboard' })
     end,
   },
   {
@@ -378,9 +398,20 @@ return {
     opts = {
       options = {
         icons_enabled = true,
-        -- theme = 'onedark',
+        theme = 'powerline_dark',
         component_separators = '/',
-        section_separators = '',
+        -- section_separators = '',
+      },
+      sections = {
+        lualine_a = {
+          {
+            'mode',
+            icons_enabled = true,
+            fmt = function(str)
+              return str:sub(1, 1)
+            end
+          }
+        },
       },
     },
   },