sync from original repo

init.lua

@@ -85,4 +85,3 @@ vim.diagnostic.config {
 }
 
 require('ricdotmarker').setup()
-require('presence').setup()

lazy-lock.json

@@ -8,7 +8,7 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
   "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
+  "conform.nvim": { "branch": "master", "commit": "016802de402556da54c36bd7359b441266b01cdd" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
   "kanagawa.nvim": { "branch": "master", "commit": "bb85e4bfc8d89b0e62c8fa53ccdd13d12e2f77b3" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
@@ -18,13 +18,12 @@
   "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
   "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
   "nvim-cmp": { "branch": "main", "commit": "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3" },
-  "nvim-lspconfig": { "branch": "master", "commit": "43ed3797b266e1ee8d222e491379ad471c9d3146" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4267d26e60323a45e18f8e7a63a964cc8f53ca4e" },
   "nvim-tree.lua": { "branch": "master", "commit": "531b807b8f0d6f75016a0ee1e0cd5ce2086e9d95" },
   "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
   "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" },
   "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
-  "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "ricdotmarker": { "branch": "main", "commit": "1ffe60773e20912941221d057d901bb60fd7f920" },
+  "ricdotmarker": { "branch": "main", "commit": "1b3937729cc7a038bcab78370c4d7abda7d74839" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" },
   "vim-wakatime": { "branch": "master", "commit": "9f8a1d3b9c6f3a948988a0896b3227c1e1f74a58" },

lua/configs/keys.lua

@@ -1,6 +1,7 @@
 local map = vim.keymap.set
 local api = vim.api
 local cmd = vim.cmd
+local api = vim.api
 
 vim.g.mapleader = ' '
 

lua/configs/plugins/conform.lua

@@ -19,6 +19,7 @@ return {
       javascript = { 'prettierd' },
       typescript = { 'prettierd' },
       json = { 'prettierd' },
+      python = { 'ruff_format' },
       -- javascriptjsx = { "prettierd", "prettier" },
       -- typescripttsx = { "prettierd", "prettier" },
     },

lua/configs/plugins/init.lua

@@ -62,15 +62,15 @@ return {
     build = ':TSUpdate',
     config = function()
       require('nvim-treesitter.configs').setup {
-        ensure_installed = { 'typescript', 'tsx', 'javascript', 'go', 'vue' },
+        -- Ensure the typescript parser is locked in
+        ensure_installed = { 'typescript', 'tsx', 'javascript', 'python' },
         highlight = { enable = true },
       }
     end,
   },
 
   { 'numToStr/FTerm.nvim' },
   { 'ricdotnet/ricdotmarker', requires = 'nvim-lua/plenary.nvim' },
-  { 'andweeb/presence.nvim' },
   { 'wakatime/vim-wakatime' },
   { 'ThePrimeagen/vim-be-good' },
 }

lua/configs/plugins/lsp.lua

@@ -1,6 +1,6 @@
 local lsp = vim.lsp
 
-local servers = { 'lua_ls', 'html', 'cssls', 'ts_ls', 'vue_ls', 'eslint', 'tailwindcss', 'gopls', 'svelte' }
+local servers = { 'lua_ls', 'html', 'cssls', 'ts_ls', 'eslint', 'tailwindcss', 'gopls' }
 lsp.enable(servers)
 
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
@@ -30,23 +30,6 @@ local function lsp_config()
     },
   })
 
-  lsp.config('vue_ls', {
-    filetypes = { 'vue' },
-    init_options = {
-      vue = {
-        hybridMode = false,
-      },
-      typescript = {
-        tsdk = vim.fn.expand '~/.local/share/nvim/mason/packages/vue-language-server/node_modules/typescript/lib',
-      },
-    },
-  })
-
-  lsp.config('svelte', {
-    capabilities = capabilities,
-    filetypes = { 'svelte' },
-  })
-
   lsp.config('tailwindcss', {
     filetypes = {
       'html',

lua/configs/plugins/mason.lua

@@ -11,13 +11,9 @@ return {
         'html',
         'cssls',
         'ts_ls',
-        'vue_ls',
         'eslint-lsp',
-        'tailwindcss',
         'basedpyright',
         'clangd',
-        'svelte',
-        -- 'volar',
 
         'prettierd',
         'stylua',