diff --git a/lazy-lock.json b/lazy-lock.json index eb1f21a..5fb470a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,7 +10,6 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" }, "codeium.vim": { "branch": "main", "commit": "289eb724e5d6fab2263e94a1ad6e54afebefafb2" }, - "darcula-dark.nvim": { "branch": "main", "commit": "9009c7ad4527e8197b95febb76323a2d23156ddb" }, "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" }, "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, @@ -31,13 +30,14 @@ "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, + "nvim-juliana": { "branch": "master", "commit": "a5da27b456f440e652e04e25a282800bee2ea1e9" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "b91ae14fc3bb801c7ea69bc283fe860b32b5163d" }, + "nvim-treesitter": { "branch": "master", "commit": "5c924407cf110e9da4f3ba02ffed127b4198ad89" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, "nvim-ts-autotag": { "branch": "main", "commit": "bcf3146864262ef2d3c877beba3e222b5c73780d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 2a65864..164b558 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -14,7 +14,8 @@ -- github_dark, github_dark_default, github_dark_colorblind, github_dark_dimmed -- solarized-osaka -- darcula-dark -vim.g.pcode_colorscheme = "darcula-dark" +-- juliana +vim.g.pcode_colorscheme = "juliana" -- 0 =off 1= on vim.g.pcode_transparent_mode = 0 diff --git a/lua/custom/plugins/juliana.lua b/lua/custom/plugins/juliana.lua new file mode 100644 index 0000000..11bc26b --- /dev/null +++ b/lua/custom/plugins/juliana.lua @@ -0,0 +1,18 @@ +return { + -- "pojokcodeid/nvim-juliana", + -- lazy = false, + -- priority = 1000, + -- opts = {}, + -- config = function() + -- vim.api.nvim_create_autocmd("ColorScheme", { + -- pattern = "*", + -- callback = function() + -- -- get colors + -- local colors = require("nvim-juliana").colors() + -- -- custom hilights + -- local hi = vim.api.nvim_set_hl + -- hi(0, "FoldColumn", { bg = colors.bg2 }) + -- end, + -- }) + -- end, +} diff --git a/lua/custom/plugins/tailwind.lua b/lua/custom/plugins/tailwind.lua index df1f231..a3e37b1 100644 --- a/lua/custom/plugins/tailwind.lua +++ b/lua/custom/plugins/tailwind.lua @@ -1,24 +1,24 @@ return { - { - "NvChad/nvim-colorizer.lua", - opts = { - user_default_options = { - tailwind = true, - }, - }, - }, - { - "hrsh7th/nvim-cmp", - dependencies = { - { "roobert/tailwindcss-colorizer-cmp.nvim", config = true }, - }, - opts = function(_, opts) - -- original kind icon formatter - local format_kinds = opts.formatting.format - opts.formatting.format = function(entry, item) - format_kinds(entry, item) -- add icons - return require("tailwindcss-colorizer-cmp").formatter(entry, item) - end - end, - }, + { + "NvChad/nvim-colorizer.lua", + opts = { + user_default_options = { + tailwind = true, + }, + }, + }, + { + "hrsh7th/nvim-cmp", + dependencies = { + { "roobert/tailwindcss-colorizer-cmp.nvim", config = true }, + }, + opts = function(_, opts) + -- original kind icon formatter + local format_kinds = opts.formatting.format + opts.formatting.format = function(entry, item) + format_kinds(entry, item) -- add icons + return require("tailwindcss-colorizer-cmp").formatter(entry, item) + end + end, + }, } diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 5ee7fa8..ead3347 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -694,4 +694,23 @@ return { }) end, }, + { + "pojokcodeid/nvim-juliana", + lazy = false, + enabled = (color == "juliana") and true or false, + priority = 1000, + opts = {}, + config = function() + vim.api.nvim_create_autocmd("ColorScheme", { + pattern = "*", + callback = function() + -- get colors + local colors = require("nvim-juliana").colors() + -- custom hilights + local hi = vim.api.nvim_set_hl + hi(0, "FoldColumn", { bg = colors.bg2 }) + end, + }) + end, + }, } diff --git a/lua/user/lsp/settings/tailwindcss.lua b/lua/user/lsp/settings/tailwindcss.lua index 5f8dea5..36d5cf9 100644 --- a/lua/user/lsp/settings/tailwindcss.lua +++ b/lua/user/lsp/settings/tailwindcss.lua @@ -1,92 +1,92 @@ return { - cmd = { "tailwindcss-language-server", "--stdio" }, - filetypes = { - "aspnetcorerazor", - "astro", - "astro-markdown", - "blade", - "clojure", - "django-html", - "htmldjango", - "edge", - "eelixir", - "elixir", - "ejs", - "erb", - "eruby", - "gohtml", - "gohtmltmpl", - "haml", - "handlebars", - "hbs", - "html", - "html-eex", - "heex", - "jade", - "leaf", - "liquid", - "markdown", - "mdx", - "mustache", - "njk", - "nunjucks", - "php", - "razor", - "slim", - "twig", - "css", - "less", - "postcss", - "sass", - "scss", - "stylus", - "sugarss", - "javascript", - "javascriptreact", - "reason", - "rescript", - "typescript", - "typescriptreact", - "vue", - "svelte", - "templ", - }, - -- init options - init_options = { - userLanguages = { - eelixir = "html-eex", - eruby = "erb", - templ = "html", - }, - }, - -- root dir - root_dir = root_pattern( - "tailwind.config.js", - "tailwind.config.cjs", - "tailwind.config.mjs", - "tailwind.config.ts", - "postcss.config.js", - "postcss.config.cjs", - "postcss.config.mjs", - "postcss.config.ts", - "package.json", - "node_modules", - ".git" - ), - -- settings - settings = { - tailwindCSS = { - classAttributes = { "class", "className", "class:list", "classList", "ngClass" }, - lint = { - cssConflict = "warning", - invalidApply = "error", - invalidConfigPath = "error", - invalidScreen = "error", - invalidTailwindDirective = "error", - invalidVariant = "error", - recommendedVariantOrder = "warning", - }, - validate = true, - }, - }, + -- cmd = { "tailwindcss-language-server", "--stdio" }, + -- filetypes = { + -- "aspnetcorerazor", + -- "astro", + -- "astro-markdown", + -- "blade", + -- "clojure", + -- "django-html", + -- "htmldjango", + -- "edge", + -- "eelixir", + -- "elixir", + -- "ejs", + -- "erb", + -- "eruby", + -- "gohtml", + -- "gohtmltmpl", + -- "haml", + -- "handlebars", + -- "hbs", + -- "html", + -- "html-eex", + -- "heex", + -- "jade", + -- "leaf", + -- "liquid", + -- "markdown", + -- "mdx", + -- "mustache", + -- "njk", + -- "nunjucks", + -- "php", + -- "razor", + -- "slim", + -- "twig", + -- "css", + -- "less", + -- "postcss", + -- "sass", + -- "scss", + -- "stylus", + -- "sugarss", + -- "javascript", + -- "javascriptreact", + -- "reason", + -- "rescript", + -- "typescript", + -- "typescriptreact", + -- "vue", + -- "svelte", + -- "templ", + -- }, + -- -- init options + -- init_options = { + -- userLanguages = { + -- eelixir = "html-eex", + -- eruby = "erb", + -- templ = "html", + -- }, + -- }, + -- -- root dir + -- root_dir = root_pattern( + -- "tailwind.config.js", + -- "tailwind.config.cjs", + -- "tailwind.config.mjs", + -- "tailwind.config.ts", + -- "postcss.config.js", + -- "postcss.config.cjs", + -- "postcss.config.mjs", + -- "postcss.config.ts", + -- "package.json", + -- "node_modules", + -- ".git" + -- ), + -- -- settings + -- settings = { + -- tailwindCSS = { + -- classAttributes = { "class", "className", "class:list", "classList", "ngClass" }, + -- lint = { + -- cssConflict = "warning", + -- invalidApply = "error", + -- invalidConfigPath = "error", + -- invalidScreen = "error", + -- invalidTailwindDirective = "error", + -- invalidVariant = "error", + -- recommendedVariantOrder = "warning", + -- }, + -- validate = true, + -- }, + -- }, } diff --git a/lua/user/utils/lualine_component.lua b/lua/user/utils/lualine_component.lua index 9aefcbe..0e710bf 100644 --- a/lua/user/utils/lualine_component.lua +++ b/lua/user/utils/lualine_component.lua @@ -33,6 +33,7 @@ local mode_map = { ["VISUAL"] = "V", ["REPLACE"] = "R", ["COMMAND"] = "C", + ["O-PENDING"] = "O", } return {