From a3bf20286d409b1405d1bd83bfac90411034cd06 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Wed, 27 Mar 2024 07:50:16 +0700 Subject: [PATCH] add: update patch plugins --- lazy-lock.json | 12 ++++++------ lua/custom/default.lua | 2 +- lua/plugins/colorscheme.lua | 17 +++++++++-------- lua/user/lsp/settings/eslint.lua | 29 ++++++++++++++++++----------- lua/user/lsp/settings/sqlls.lua | 8 ++++++++ lua/user/nvim-tree.lua | 2 +- lua/user/webdevicons.lua | 6 ++++++ 7 files changed, 49 insertions(+), 27 deletions(-) create mode 100644 lua/user/lsp/settings/sqlls.lua diff --git a/lazy-lock.json b/lazy-lock.json index ff984e8..4fc2f30 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -9,13 +9,13 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "code_runner.nvim": { "branch": "main", "commit": "baea3a97c02276bff92b235f4e0d9fd8909d0d04" }, + "code_runner.nvim": { "branch": "main", "commit": "e40f651e98a0a12fcd44bf54a2ed258cfee5a914" }, "codeium.vim": { "branch": "main", "commit": "bef9cbaa5c19ab85d8048f364bfc0ac8c7ab335d" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "af6afefbb46ab29a8a1db69536b04290a9403876" }, + "lazy.nvim": { "branch": "main", "commit": "68941b7b13861ca44ad5d4caf7296d9160b4732f" }, "lsp-progress.nvim": { "branch": "main", "commit": "1c37b1cd0611563a767f0a340d61f265c4c54ecd" }, "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "2ba17cecfde8b8c7c7c287909a1e4de895223df6" }, @@ -24,12 +24,12 @@ "mini.animate": { "branch": "main", "commit": "82519630b2760ffc516ebc387bef632f9c07b9f5" }, "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, "neoscroll.nvim": { "branch": "master", "commit": "21d52973bde32db998fc8b6590f87eb3c3c6d8e4" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "none-ls-extras.nvim": { "branch": "main", "commit": "4f6ba0c4a317a630157bc02fad110fcd826e9494" }, "none-ls.nvim": { "branch": "main", "commit": "18910d09d21d7df339805343bfe4a2b2e41c057b" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, - "nvim-cmp": { "branch": "main", "commit": "6ed1c93465c33f6a53b4c3f103bf9d1ab696382a" }, + "nvim-cmp": { "branch": "main", "commit": "97dc716fc914c46577a4f254035ebef1aa72558a" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-material-icon": { "branch": "main", "commit": "602088c2682e61cbebd7191de7dc88bfa90c6890" }, @@ -42,11 +42,11 @@ "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, - "telescope.nvim": { "branch": "master", "commit": "1e591885751d255b12c3649253cb6c2838e2c724" }, + "telescope.nvim": { "branch": "master", "commit": "c2b8311dfacd08b3056b8f0249025d633a4e71a8" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, - "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index eabd364..d8750a6 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -11,7 +11,7 @@ -- catppuccin, catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha -- dracula -- nightfox, dayfox, dawnfox, duskfox, nordfox, terafox, carbonfox -vim.g.pcode_colorscheme = "tokyonight-storm" +vim.g.pcode_colorscheme = "onedark" -- custom transparent mode -- only support diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 13eb8d6..474d8f3 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -348,16 +348,17 @@ return { term_colors = true, style = onedark_style, colors = { - green = "#99c379", - gray = "#8094b4", + bg0 = "#1e222a", + green = "#98c379", + gray = "#abb2bf", red = "#e06c75", purple = "#c678dd", - yellow = "#e5c07a", + yellow = "#e5c07b", orange = "#d19a66", blue = "#61afef", cyan = "#56b6c2", bg_d = "$bg", - bg1 = "#282c34", + bg1 = "#1e222a", }, code_style = { comments = "italic", @@ -378,8 +379,8 @@ return { ["@tag.delimiter"] = { fg = "$gray" }, ["@tag.html"] = { fg = "$red" }, ["@tag.attribute"] = { fg = "$orange", fmt = "italic" }, - ["@tag.javascript"] = { fg = "$yellow" }, - ["@constructor.javascript"] = { fg = "$yellow" }, + ["@tag.javascript"] = { fg = "$red" }, + ["@constructor.javascript"] = { fg = "$red" }, ["@tag.tsx"] = { fg = "$yellow" }, ["@constructor.tsx"] = { fg = "$yellow" }, -- NvimTreeFolderIcon = { fg = "#FCC76A" }, @@ -474,8 +475,8 @@ return { comments = "italic", -- Value is any valid attr-list value `:help attr-list` conditionals = "italic", constants = "NONE", - functions = "italic", - keywords = "bold,italic", + functions = "NONE", + keywords = "italic", numbers = "NONE", operators = "NONE", strings = "NONE", diff --git a/lua/user/lsp/settings/eslint.lua b/lua/user/lsp/settings/eslint.lua index 8f3aa92..fc6e6fc 100644 --- a/lua/user/lsp/settings/eslint.lua +++ b/lua/user/lsp/settings/eslint.lua @@ -1,13 +1,20 @@ return { - cmd = { "vscode-eslint-language-server", "--stdio" }, -- add file type support - filetypes = { - "javascript", - "javascriptreact", - "javascript.jsx", - "typescript", - "typescriptreact", - "typescript.tsx", - }, - -- add dynamic root dir support - root_dir = require("lspconfig.util").root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"), + cmd = { "vscode-eslint-language-server", "--stdio" }, -- add file type support + filetypes = { + "javascript", + "javascriptreact", + "javascript.jsx", + "typescript", + "typescriptreact", + "typescript.tsx", + }, + -- add dynamic root dir support + root_dir = require("lspconfig.util").root_pattern( + "package.json", + "tsconfig.json", + "jsconfig.json", + ".eslintrc.json", + ".eslintrc.js", + ".eslintrc.cjs" + ), } diff --git a/lua/user/lsp/settings/sqlls.lua b/lua/user/lsp/settings/sqlls.lua new file mode 100644 index 0000000..8dfeaaa --- /dev/null +++ b/lua/user/lsp/settings/sqlls.lua @@ -0,0 +1,8 @@ +return { + -- cmd = { "sql-language-server", "up", "--method", "stdio" }, + -- filetypes = { "sql", "mysql" }, + -- -- add root dir support + -- root_dir = require("lspconfig.util").root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git") + -- or vim.loop.cwd() + -- or vim.fn.getcwd(), +} diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua index a297025..c64ea0b 100644 --- a/lua/user/nvim-tree.lua +++ b/lua/user/nvim-tree.lua @@ -14,7 +14,7 @@ nvim_tree.setup({ dotfiles = false, git_clean = false, no_buffer = false, - custom = { "node_modules", "\\.cache" }, + custom = { "node_modules", "\\.cache", "\\.git" }, exclude = {}, }, filesystem_watchers = { diff --git a/lua/user/webdevicons.lua b/lua/user/webdevicons.lua index eea0956..74cf548 100644 --- a/lua/user/webdevicons.lua +++ b/lua/user/webdevicons.lua @@ -161,6 +161,12 @@ web_devicons.setup({ cterm_color = "240", name = "viteconfigts", }, + [".releaserc"] = { + icon = "󰚧", + color = "#9C9C9C", + cterm_color = "240", + name = "releaserc", + }, [".profile"] = { icon = "󰙄", color = "#9C9C9C",