diff --git a/after/typescriptreact/highlights.scm b/after/typescriptreact/highlights.scm new file mode 100644 index 0000000..a04c456 --- /dev/null +++ b/after/typescriptreact/highlights.scm @@ -0,0 +1,13 @@ +;; extends +(jsx_attribute + ((property_identifier) @name (#eq? @name "className")) + (string ((string_fragment) @conceal (#set! conceal "󰇘")))) + +; (jsx_attribute +; ((property_identifier)(#eq? property_identifier "className")) +; (string (string_fragment) @conceal (#set! conceal "󰇘"))) + + +; (#set! @conceal "conceal" "󰇘") + +; (jsx_attribute) @conceal (#set! conceal "c") diff --git a/lazy-lock.json b/lazy-lock.json index 38c17a4..6a62c60 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LazyVim": { "branch": "main", "commit": "cbf1d335ed6a478a2e6144aa2d462a8330b2b0fc" }, + "LazyVim": { "branch": "main", "commit": "b57582bc913d8dd24d24b1577d28d782a067e9ce" }, "LuaSnip": { "branch": "master", "commit": "b4bc24c4925aeb05fd47d2ee9b24b7f73f5d7e32" }, "alpha-nvim": { "branch": "main", "commit": "1838ae926e8d49fe5330d1498ee8289ae2c340bc" }, "bufferline.nvim": { "branch": "main", "commit": "018bdf61a97e00caeff05d16977437c63018762e" }, @@ -8,7 +8,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "dressing.nvim": { "branch": "master", "commit": "540d6e7115fb32b5035ddaf0c1a26cbffb855dac" }, + "dressing.nvim": { "branch": "master", "commit": "66e4990240f92e31b0d5e4df6deb6bb0160ae832" }, "flit.nvim": { "branch": "main", "commit": "f60e4b3d49bb5a5e97cfffe66f2e671eb422078e" }, "friendly-snippets": { "branch": "main", "commit": "1d0dac346de7c6895ac72528df3276386c6b149b" }, "gitsigns.nvim": { "branch": "main", "commit": "814158f6c4b1724c039fcefe79b0be72c9131c2d" }, @@ -35,11 +35,11 @@ "nvim-navic": { "branch": "master", "commit": "15704c607569d6c5cfeab486d3ef9459645a70ce" }, "nvim-notify": { "branch": "master", "commit": "159c6cf1be25a933f35e97499314c9faab55c98f" }, "nvim-spectre": { "branch": "master", "commit": "1abe23ec9b7bc3082164f4cb842d521ef70e080e" }, - "nvim-treesitter": { "branch": "master", "commit": "7e1cb38c382dc1f1feb90a759a26dd600bd39841" }, + "nvim-treesitter": { "branch": "master", "commit": "32d0baae44f5fd0416128c871fca6d9e27b60b3d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "35a60f093fa15a303874975f963428a5cd24e4a0" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" }, "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" }, "persistence.nvim": { "branch": "main", "commit": "c814fae5c37aa0aba9cd9da05df6e52b88d612c3" }, + "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" }, "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, "rose-pine": { "branch": "main", "commit": "2eace84d649d76d41dcd44a87a17f64c7c4a586d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 891b190..3ba0bbf 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -20,7 +20,7 @@ require("lazy").setup({ defaults = { -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. - lazy = false, + lazy = true, -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, -- have outdated releases, which may break your Neovim install. version = false, -- always use the latest git commit diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua new file mode 100644 index 0000000..22202fd --- /dev/null +++ b/lua/plugins/lspconfig.lua @@ -0,0 +1,13 @@ +return { + { + "neovim/nvim-lspconfig", + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- pyright will be automatically installed with mason and loaded with lspconfig + rust_analyzer = {}, + }, + }, + }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 0000000..4b5d3df --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,15 @@ +-- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above +-- would overwrite `ensure_installed` with the new value. +-- If you'd rather extend the default config, use the code below instead: +return { + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "rust", + }) + end, + }, + { "nvim-treesitter/playground", dependencies = { "nvim-treesitter/nvim-treesitter" }, lazy = true }, +}