diff --git a/lazy-lock.json b/lazy-lock.json index c038833..c1666e9 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,7 +13,7 @@ "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" }, "codeium.nvim": { "branch": "main", "commit": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825" }, "conform.nvim": { "branch": "master", "commit": "60e6fbddbdf37d7790de07dc7420beefaf650e5e" }, - "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, + "darcula-dark.nvim": { "branch": "main", "commit": "cce636860dc5151b6980a35dd378f54a238e0f0e" }, "dressing.nvim": { "branch": "master", "commit": "71349f24c6e07b39f33600985843c289ca735308" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, @@ -43,7 +43,7 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "06563ae0c9928a2df42aefe66f2aed2f2943e32e" }, "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, - "nvim-treesitter": { "branch": "master", "commit": "4ee5fdd666f46fb379302a32750f932d25448d98" }, + "nvim-treesitter": { "branch": "master", "commit": "e0d6c7643dc953acc2e817d0cebfc2f1f8c008e1" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, @@ -53,7 +53,7 @@ "rainbow-delimiters.nvim": { "branch": "master", "commit": "12b1a1e095d968887a17ef791c2edb78d7595d46" }, "rest.nvim": { "branch": "main", "commit": "91badd46c60df6bd9800c809056af2d80d33da4c" }, "smart-splits.nvim": { "branch": "master", "commit": "66fda3a601a5b4c679656f15eb6ddd613c8d3216" }, - "telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" }, + "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" }, "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index cc2c57d..0a126e1 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -14,7 +14,7 @@ -- solarized-osaka -- darcula-dark -- juliana -pcode.colorscheme = "dracula" +pcode.colorscheme = "darcula-dark" -- 0 =off 1= on pcode.transparent_mode = 0 diff --git a/lua/plugins/javascript.lua b/lua/plugins/javascript.lua index 8c90762..a26f787 100644 --- a/lua/plugins/javascript.lua +++ b/lua/plugins/javascript.lua @@ -26,14 +26,14 @@ if pcode.active_javascript_config.active then opts.formatters_by_ft.javascript = { package } end, }, - { - "mfussenegger/nvim-lint", - opts = function(_, opts) - opts.linters_by_ft = opts.linters_by_ft or {} - require("user.utils.masoncfg").try_install("eslint_d") - opts.linters_by_ft.javascript = { "eslint_d" } - end, - }, + -- { + -- "mfussenegger/nvim-lint", + -- opts = function(_, opts) + -- opts.linters_by_ft = opts.linters_by_ft or {} + -- require("user.utils.masoncfg").try_install("eslint_d") + -- opts.linters_by_ft.javascript = { "eslint_d" } + -- end, + -- }, { "nvim-neotest/neotest", dependencies = { diff --git a/lua/plugins/themes/jetbrains.lua b/lua/plugins/themes/jetbrains.lua index 06ab59a..f299979 100644 --- a/lua/plugins/themes/jetbrains.lua +++ b/lua/plugins/themes/jetbrains.lua @@ -7,17 +7,19 @@ if (color == "darcula-dark") and true or false then priority = 1000, lazy = false, config = function() - require("darcula").setup { + require("darcula").setup({ colors = { lavender = "#9876AA", }, - } + }) vim.api.nvim_create_autocmd("ColorScheme", { pattern = "*", callback = function() local colors = require("darcula").colors() local hi = vim.api.nvim_set_hl hi(0, "@property.json", { fg = colors.lavender }) + hi(0, "@property.jsonc", { fg = colors.lavender }) + -- hi(0, "@variable.member.sql", { fg = colors.olive_green }) -- telescope hi(0, "TelescopePromptBorder", { fg = colors.medium_gray }) hi(0, "TelescopeResultsBorder", { fg = colors.medium_gray }) @@ -30,8 +32,8 @@ if (color == "darcula-dark") and true or false then hi(0, "TelescopeResultsDiffDelete", { fg = colors.red }) hi(0, "TelescopeResultsDiffChange", { fg = colors.bright_cyan }) hi(0, "TelescopeResultsDiffAdd", { fg = colors.olive_green }) - hi(0, "TelescopePromptNormal", { bg = color.dark, fg = color.grey }) - hi(0, "TelescopePromptPrefix", { bg = color.dark, fg = color.red }) + hi(0, "TelescopePromptNormal", { bg = colors.dark, fg = colors.grey }) + hi(0, "TelescopePromptPrefix", { bg = colors.dark, fg = colors.red }) hi(0, "TelescopeResultsTitle", { bg = colors.olive_green, fg = colors.very_dark_gray }) end, })