diff --git a/lazy-lock.json b/lazy-lock.json index 4c5410d..6544fb8 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -43,7 +43,7 @@ "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" }, + "onedarkpro.nvim": { "branch": "main", "commit": "ec07364f3cfa9cc6467bf067a490cfd74011efcd" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index 43f87ad..e308fbe 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -16,4 +16,4 @@ require("user.keymaps") -- require("user.bufferline") -- require("user.chat_gpt") -- vim.cmd("colorscheme one_monokai") -vim.cmd("colorscheme onedark") +-- vim.cmd("colorscheme onedark") diff --git a/lua/custom/default.lua b/lua/custom/default.lua index fc70499..eaa0127 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -12,7 +12,7 @@ -- catppuccin, catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha -- dracula -- nightfox, dayfox, dawnfox, duskfox, nordfox, terafox, carbonfox -vim.g.pcode_colorscheme = "tokyonight" +vim.g.pcode_colorscheme = "onedark" -- custom transparent mode -- only support diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 77acf53..8871cd9 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -1,4 +1,5 @@ return { + { "navarasu/onedark.nvim", enabled = false }, { "folke/tokyonight.nvim", enabled = false }, { "olimorris/onedarkpro.nvim", @@ -23,14 +24,15 @@ return { colors = { onedark = { green = "#99c379", - gray = "#8094b4", + gray = "#abb2bf", red = "#e06c75", purple = "#c678dd", - yellow = "#e5c07a", + yellow = "#e5c07b", blue = "#61afef", cyan = "#56b6c2", bg_statusline = "#282c34", indentline = "#3b4261", + float_bg = "#282c34", }, }, options = { diff --git a/lua/user/lsp/mason.lua b/lua/user/lsp/mason.lua index 0a5e7f5..1f309ac 100644 --- a/lua/user/lsp/mason.lua +++ b/lua/user/lsp/mason.lua @@ -1,68 +1,69 @@ local servers = { - "lua_ls", + "lua_ls", } local function idxOf(array, value) - for i, v in ipairs(array) do - if v == value then - return i - end - end - return nil + for i, v in ipairs(array) do + if v == value then + return i + end + end + return nil end local data_exists, custom_lsp = pcall(require, "core.config") if data_exists then - for _, client in pairs(custom_lsp.mason_ensure_installed) do - table.insert(servers, client) - end + for _, client in pairs(custom_lsp.mason_ensure_installed) do + table.insert(servers, client) + end end local unregis_lsp = {} local data_ok, unregis = pcall(require, "core.config") if data_ok then - if unregis.unregister_lsp ~= nil then - unregis_lsp = unregis.unregister_lsp - end + if unregis.unregister_lsp ~= nil then + unregis_lsp = unregis.unregister_lsp + end end local settings = { - ui = { - border = "none", - icons = { - -- package_installed = "◍", - -- package_pending = "◍", - -- package_uninstalled = "◍", - package_pending = " ", - package_installed = " ", - package_uninstalled = " ", - }, - keymaps = { - -- Keymap to expand a server in the UI - toggle_server_expand = "", - -- Keymap to install the server under the current cursor position - install_server = "i", - -- Keymap to reinstall/update the server under the current cursor position - update_server = "u", - -- Keymap to check for new version for the server under the current cursor position - check_server_version = "c", - -- Keymap to update all installed servers - update_all_servers = "U", - -- Keymap to check which installed servers are outdated - check_outdated_servers = "C", - -- Keymap to uninstall a server - uninstall_server = "X", - }, - }, - log_level = vim.log.levels.INFO, - max_concurrent_installers = 4, + ui = { + -- border = "none", + border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, + icons = { + -- package_installed = "◍", + -- package_pending = "◍", + -- package_uninstalled = "◍", + package_pending = " ", + package_installed = " ", + package_uninstalled = " ", + }, + keymaps = { + -- Keymap to expand a server in the UI + toggle_server_expand = "", + -- Keymap to install the server under the current cursor position + install_server = "i", + -- Keymap to reinstall/update the server under the current cursor position + update_server = "u", + -- Keymap to check for new version for the server under the current cursor position + check_server_version = "c", + -- Keymap to update all installed servers + update_all_servers = "U", + -- Keymap to check which installed servers are outdated + check_outdated_servers = "C", + -- Keymap to uninstall a server + uninstall_server = "X", + }, + }, + log_level = vim.log.levels.INFO, + max_concurrent_installers = 4, } require("mason").setup(settings) -- * buka remark ini jika akan menggunakan list serverrs diatas dan remark config dibawah require("mason-lspconfig").setup({ - ensure_installed = servers, - automatic_installation = true, + ensure_installed = servers, + automatic_installation = true, }) -- -- * buka remark ini jika ingin menjalankan dengan cara install dan remark config diatas (pilih satu) @@ -70,151 +71,151 @@ require("mason-lspconfig").setup({ local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig") if not lspconfig_status_ok then - return + return end local opts = {} require("mason-lspconfig").setup_handlers({ - function(server_name) -- default handler (optional) - local is_skip = false - local my_index = idxOf(unregis_lsp, server_name) - if my_index ~= nil then - is_skip = true - end - if not is_skip then - -- if server_name == "lua_ls" then - -- server_name = "sumneko_lua" - -- end - opts = { - on_attach = require("user.lsp.handlers").on_attach, - capabilities = require("user.lsp.handlers").capabilities, - } + function(server_name) -- default handler (optional) + local is_skip = false + local my_index = idxOf(unregis_lsp, server_name) + if my_index ~= nil then + is_skip = true + end + if not is_skip then + -- if server_name == "lua_ls" then + -- server_name = "sumneko_lua" + -- end + opts = { + on_attach = require("user.lsp.handlers").on_attach, + capabilities = require("user.lsp.handlers").capabilities, + } - server_name = vim.split(server_name, "@")[1] + server_name = vim.split(server_name, "@")[1] - local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server_name) - if require_ok then - opts = vim.tbl_deep_extend("force", conf_opts, opts) - end - lspconfig[server_name].setup(opts) - end - end, - -- Next, you can provide targeted overrides for specific servers. - -- ["rust_analyzer"] = function() - -- require("rust-tools").setup({}) - -- end, - -- ["lua_ls"] = function() - -- lspconfig.sumneko_lua.setup({ - -- settings = { - -- Lua = { - -- diagnostics = { - -- globals = { "vim" }, - -- }, - -- }, - -- }, - -- }) - -- end, - -- ["tsserver"] = function() - -- lspconfig.tsserver.setup({ - -- on_attach = require("user.lsp.handlers").on_attach, - -- capabilities = require("user.lsp.handlers").capabilities, - -- -- add cmd - -- cmd = { "typescript-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"), - -- init_options = { - -- hostInfo = "neovim", - -- }, - -- }) - -- end, - -- ["emmet_ls"] = function() - -- lspconfig.emmet_ls.setup({ - -- on_attach = require("user.lsp.handlers").on_attach, - -- capabilities = require("user.lsp.handlers").capabilities, - -- -- add cmd - -- cmd = { "emmet-ls", "-c", "--stdio" }, - -- -- add file type support - -- -- filetypes = { - -- -- "javascript", - -- -- "javascriptreact", - -- -- "javascript.jsx", - -- -- "typescript", - -- -- "typescriptreact", - -- -- "typescript.tsx", - -- -- "astro", - -- -- "css", - -- -- "eruby", - -- -- "html", - -- -- "htmldjango", - -- -- "less", - -- -- "pug", - -- -- "sass", - -- -- "scss", - -- -- "svelte", - -- -- "vue" -- }, - -- -- add dynamic root dir support - -- root_dir = require("lspconfig.util").root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"), - -- }) - -- end, - -- ["eslint"] = function() - -- lspconfig.eslint.setup({ - -- on_attach = require("user.lsp.handlers").on_attach, - -- capabilities = require("user.lsp.handlers").capabilities, - -- -- add cmd - -- 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"), - -- }) - -- end, - -- ["kotlin_language_server"] = function() - -- lspconfig.kotlin_language_server.setup({ - -- on_attach = require("user.lsp.handlers").on_attach, - -- capabilities = require("user.lsp.handlers").capabilities, - -- cmd = { "kotlin-language-server" }, - -- filetypes = { "kotlin" }, - -- root_dir = require("lspconfig.util").root_pattern( - -- "build.gradle.kts", - -- "build.gradle", - -- "settings.gradle", - -- "gradlew", - -- "pom.xml", - -- "build.gradle.kts", - -- "build.kts", - -- ".git" - -- ), - -- }) - -- end, - -- ["clangd"] = function() - -- lspconfig.clangd.setup({ - -- on_attach = require("user.lsp.handlers").on_attach, - -- capabilities = require("user.lsp.handlers").capabilities, - -- root_dir = require("lspconfig.util").root_pattern( - -- "build", - -- "compile_commands.json", - -- ".git", - -- "mvnw", - -- "gradlew", - -- "pom.xml", - -- "build.gradle" - -- ) or vim.loop.cwd() or vim.fn.getcwd(), - -- }) - -- end, + local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server_name) + if require_ok then + opts = vim.tbl_deep_extend("force", conf_opts, opts) + end + lspconfig[server_name].setup(opts) + end + end, + -- Next, you can provide targeted overrides for specific servers. + -- ["rust_analyzer"] = function() + -- require("rust-tools").setup({}) + -- end, + -- ["lua_ls"] = function() + -- lspconfig.sumneko_lua.setup({ + -- settings = { + -- Lua = { + -- diagnostics = { + -- globals = { "vim" }, + -- }, + -- }, + -- }, + -- }) + -- end, + -- ["tsserver"] = function() + -- lspconfig.tsserver.setup({ + -- on_attach = require("user.lsp.handlers").on_attach, + -- capabilities = require("user.lsp.handlers").capabilities, + -- -- add cmd + -- cmd = { "typescript-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"), + -- init_options = { + -- hostInfo = "neovim", + -- }, + -- }) + -- end, + -- ["emmet_ls"] = function() + -- lspconfig.emmet_ls.setup({ + -- on_attach = require("user.lsp.handlers").on_attach, + -- capabilities = require("user.lsp.handlers").capabilities, + -- -- add cmd + -- cmd = { "emmet-ls", "-c", "--stdio" }, + -- -- add file type support + -- -- filetypes = { + -- -- "javascript", + -- -- "javascriptreact", + -- -- "javascript.jsx", + -- -- "typescript", + -- -- "typescriptreact", + -- -- "typescript.tsx", + -- -- "astro", + -- -- "css", + -- -- "eruby", + -- -- "html", + -- -- "htmldjango", + -- -- "less", + -- -- "pug", + -- -- "sass", + -- -- "scss", + -- -- "svelte", + -- -- "vue" -- }, + -- -- add dynamic root dir support + -- root_dir = require("lspconfig.util").root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git"), + -- }) + -- end, + -- ["eslint"] = function() + -- lspconfig.eslint.setup({ + -- on_attach = require("user.lsp.handlers").on_attach, + -- capabilities = require("user.lsp.handlers").capabilities, + -- -- add cmd + -- 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"), + -- }) + -- end, + -- ["kotlin_language_server"] = function() + -- lspconfig.kotlin_language_server.setup({ + -- on_attach = require("user.lsp.handlers").on_attach, + -- capabilities = require("user.lsp.handlers").capabilities, + -- cmd = { "kotlin-language-server" }, + -- filetypes = { "kotlin" }, + -- root_dir = require("lspconfig.util").root_pattern( + -- "build.gradle.kts", + -- "build.gradle", + -- "settings.gradle", + -- "gradlew", + -- "pom.xml", + -- "build.gradle.kts", + -- "build.kts", + -- ".git" + -- ), + -- }) + -- end, + -- ["clangd"] = function() + -- lspconfig.clangd.setup({ + -- on_attach = require("user.lsp.handlers").on_attach, + -- capabilities = require("user.lsp.handlers").capabilities, + -- root_dir = require("lspconfig.util").root_pattern( + -- "build", + -- "compile_commands.json", + -- ".git", + -- "mvnw", + -- "gradlew", + -- "pom.xml", + -- "build.gradle" + -- ) or vim.loop.cwd() or vim.fn.getcwd(), + -- }) + -- end, })