Merge branch 'dev' into v2.5

lazy-lock.json

@@ -1,8 +1,8 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "Eva-Theme.nvim": { "branch": "master", "commit": "568fdba3a2a3088bec2198e7bb8f28d482629e58" },
+  "Eva-Theme.nvim": { "branch": "master", "commit": "80d9229ea010774610cec71921afc0defbbd3822" },
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
-  "LuaSnip": { "branch": "master", "commit": "29417eea5b7c4b6beda105ced072855101d9680e" },
+  "LuaSnip": { "branch": "master", "commit": "2737edc9e674e537dc0a97e3405658d57d2d31ed" },
   "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" },
   "auto-bufferline.nvim": { "branch": "main", "commit": "f5835a4b62bfb6f6c829f8f050e5102ccf230b3e" },
   "auto-conform.nvim": { "branch": "main", "commit": "5f0897235e84bf2f8ff9d634e81678d5bfa63ab8" },
@@ -36,7 +36,7 @@
   "minty": { "branch": "main", "commit": "1b604ed0d741294cfb56c0ce3aa6161e9ae7dd8b" },
   "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
   "neotest-phpunit": { "branch": "main", "commit": "baae8dfa0a3aaacd9f0bb6845d6348f5bcdc48bb" },
-  "noice.nvim": { "branch": "main", "commit": "d80136061820765baf70ace7dfb98a52575edc4a" },
+  "noice.nvim": { "branch": "main", "commit": "73d38cc939db6553b87e5f72ff732447046bced1" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
   "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
@@ -52,25 +52,23 @@
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
   "nvim-scrollview": { "branch": "main", "commit": "f7f611330a8f7cd00dc81538fec369611be678ed" },
   "nvim-tree.lua": { "branch": "master", "commit": "610a1c189bdb2b9b936169b2ea9d1838f971fa2b" },
-  "nvim-treesitter": { "branch": "master", "commit": "7dc8aabe86db8c2f23520e8334f7584f83e84342" },
+  "nvim-treesitter": { "branch": "master", "commit": "0722f23886d7de2c702ca54a72d94d6171715cb7" },
   "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "e0f9b3efe150724af2d2ed59997d5ece373840e3" },
   "refactoring.nvim": { "branch": "master", "commit": "53ed6854e0bba64d467c58e87084dcf8b1c22d36" },
   "smart-splits.nvim": { "branch": "master", "commit": "11600d75e1b57e9fe1f3ca880a917485fc399e8c" },
   "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
   "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "a39fa4c92268832f6034306793b8acbfec2a7549" },
   "toggleterm.nvim": { "branch": "main", "commit": "5969229c0352ff1ed7f6e24aba9c6554e1842939" },
-  "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
   "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
   "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" },
   "volt": { "branch": "main", "commit": "ff954757fdaf72da0dedd77bdf74718ea846f989" },
   "vscode-php-debug": { "branch": "main", "commit": "6193fbc1c819437325df3dad43e254d8e5c416e5" },
-  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" },
+  "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" },
   "yanky.nvim": { "branch": "main", "commit": "73215b77d22ebb179cef98e7e1235825431d10e4" },
   "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
 }

lua/pcode/plugins/theme/catppuccin.lua

@@ -0,0 +1,76 @@
+return {
+  "catppuccin/nvim",
+  name = "catppuccin",
+  priority = 1000,
+  config = function()
+    local transparent = false
+    require("catppuccin").setup({
+      flavour = "auto", -- latte, frappe, macchiato, mocha
+      background = { -- :h background
+        light = "latte",
+        dark = "mocha",
+      },
+      transparent_background = transparent, -- disables setting the background color.
+      show_end_of_buffer = false, -- shows the '~' characters after the end of buffers
+      term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`)
+      dim_inactive = {
+        enabled = false, -- dims the background color of inactive window
+        shade = "dark",
+        percentage = 0.15, -- percentage of the shade to apply to the inactive window
+      },
+      no_italic = false, -- Force no italic
+      no_bold = false, -- Force no bold
+      no_underline = false, -- Force no underline
+      styles = { -- Handles the styles of general hi groups (see `:h highlight-args`):
+        comments = { "italic" }, -- Change the style of comments
+        conditionals = { "italic" },
+        loops = {},
+        functions = {},
+        keywords = { "italic" },
+        strings = {},
+        variables = {},
+        numbers = {},
+        booleans = {},
+        properties = {},
+        types = {},
+        operators = {},
+        -- miscs = {}, -- Uncomment to turn off hard-coded styles
+      },
+      color_overrides = {},
+      custom_highlights = function(colors)
+        return {
+          NvimTreeNormal = { fg = colors.text, bg = transparent and colors.none or colors.base },
+          NvimTreeWinSeparator = { fg = colors.mantle, bg = transparent and colors.none or colors.none },
+          Pmenu = { fg = colors.text, bg = transparent and colors.none or colors.base },
+          WhichKeyFloat = { fg = colors.text, bg = transparent and colors.none or colors.base },
+          WhichKey = { fg = colors.text, bg = transparent and colors.none or colors.base },
+          WhichKeyBorder = { fg = colors.text, bg = transparent and colors.none or colors.base },
+          NormalFloat = { fg = colors.text, bg = transparent and colors.none or colors.base },
+          Normal = { fg = colors.text, bg = transparent and colors.none or colors.base },
+          NormalNC = { fg = colors.text, bg = transparent and colors.none or colors.base },
+          StatusLine = { fg = colors.text, bg = colors.none },
+        }
+      end,
+      highlight_overrides = {
+        all = function(colors)
+          return {
+            ["@markup.link.url"] = { fg = colors.rosewater, style = { "italic" } },
+          }
+        end,
+      },
+      default_integrations = true,
+      integrations = {
+        cmp = true,
+        gitsigns = true,
+        nvimtree = true,
+        treesitter = true,
+        notify = false,
+        mini = {
+          enabled = true,
+          indentscope_color = "",
+        },
+        -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
+      },
+    })
+  end,
+}

lua/pcode/plugins/theme/evatheme.lua

@@ -14,20 +14,16 @@ return {
       pattern = "*",
       callback = function()
         local hi = vim.api.nvim_set_hl
-        -- hi(0, "LspInfoBorder", { fg = "#2F3F5C" })
-        -- hi(0, "LspInfoBorder", { fg = "#598DEF" })
-        hi(0, "LspInfoBorder", { fg = "#8A97C3" })
-        -- hi(0, "FloatBorder", { fg = "#2F3F5C" })
-        -- hi(0, "FloatBorder", { fg = "#598DEF" })
-        hi(0, "FloatBorder", { fg = "#8A97C3" })
+        hi(0, "LspInfoBorder", { fg = color.comment })
+        hi(0, "FloatBorder", { fg = color.comment })
         hi(0, "StatusLine", { bg = color.background })
         hi(0, "StatusLineNC", { bg = color.background })
         hi(0, "WinBar", { bg = color.background })
         hi(0, "WinBarNC", { bg = color.background })
         hi(0, "NormalFloat", { bg = color.background })
         hi(0, "NormalNC", { bg = color.background })
-        hi(0, "@tag.delimiter.javascript", { fg = "#838FA7" })
-        hi(0, "@tag.delimiter.tsx", { fg = "#838FA7" })
+        hi(0, "@tag.delimiter.javascript", { fg = color.punctuation })
+        hi(0, "@tag.delimiter.tsx", { fg = color.punctuation })
         -- git
         hi(0, "NvimTreeGitNewIcon", { bg = color.dark, fg = color.git.added })
         hi(0, "NvimTreeGitRenamedIcon", { bg = color.dark, fg = color.git.added })
@@ -40,11 +36,11 @@ return {
         hi(0, "MiniIndentscopeSymbol", { bg = color.dark, fg = color.parameter })
         -- cursor
         -- hi(0, "Cursor", { bg = "#838FA7", fg = "#838FA7" })
-        hi(0, "CursorColumn", { bg = color.dark, fg = "#838FA7" })
-        hi(0, "TermCursor", { bg = "#FF9070", fg = color.dark })
-        hi(0, "TermCursorNC", { bg = "#FF9070", fg = color.dark })
-        hi(0, "MiniIndentscopeSymbol", { fg = "#FF9070" })
-        hi(0, "MiniIndentscopeSymbolOff", { fg = "#FF9070" })
+        hi(0, "CursorColumn", { bg = color.dark, fg = color.punctuation })
+        hi(0, "TermCursor", { bg = color.digit, fg = color.dark })
+        hi(0, "TermCursorNC", { bg = color.digit, fg = color.dark })
+        hi(0, "MiniIndentscopeSymbol", { fg = color.digit })
+        hi(0, "MiniIndentscopeSymbolOff", { fg = color.digit })
       end,
     })
   end,

lua/pcode/plugins/theme/sublimetext.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,
+}

lua/pcode/plugins/theme/tokyonight.lua

@@ -0,0 +1,77 @@
+return {
+  "folke/tokyonight.nvim",
+  priority = 1000,
+  config = function()
+    local status_ok, tokyonight = pcall(require, "tokyonight")
+    if not status_ok then
+      return
+    end
+    local transp = false
+    local sidebar = "normal" --"dark , transparent, normal"
+    local hilight = "#292e42"
+    local tras = pcode.transparent_mode or 0
+    if tras == 1 then
+      transp = true
+      sidebar = "transparent"
+      -- hilight = "#3E4254"
+      -- hilight = "#353a56"
+      hilight = "#292e42"
+    end
+
+    tokyonight.setup({
+      -- your configuration comes here
+      -- or leave it empty to use the default settings
+      style = "night", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day`
+      light_style = "day", -- The theme is used when the background is set to light
+      transparent = transp, -- Enable this to disable setting the background color
+      terminal_colors = true, -- Configure the colors used when opening a `:terminal` in Neovim
+      styles = {
+        -- Style to be applied to different syntax groups
+        -- Value is any valid attr-list value for `:help nvim_set_hl`
+        -- comments = { italic = true },
+        comments = { italic = true },
+        keywords = {},
+        functions = {},
+        variables = {},
+        -- Background styles. Can be "dark", "transparent" or "normal"
+        sidebars = sidebar, -- style for sidebars, see below
+        floats = sidebar, -- style for floating windows
+      },
+      sidebars = { "qf", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]`
+      day_brightness = 0.2, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors
+      hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**.
+      dim_inactive = false, -- dims inactive windows
+      lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold
+
+      --- You can override specific color groups to use other groups or a hex color
+      --- function will be called with a ColorScheme table
+      -- @param colors ColorScheme
+      on_colors = function(colors)
+        colors.bg_highlight = hilight
+        colors.bg_statusline = colors.none
+      end,
+
+      --- You can override specific highlights to use other groups or a hex color
+      --- function will be called with a Highlights and ColorScheme table
+      --@param highlights Highlights
+      -- @param colors ColorScheme
+      on_highlights = function(highlights, colors)
+        highlights.NvimTreeFolderIcon = {
+          bg = colors.none,
+          fg = "#e0af68",
+        }
+        highlights.Underlined = {
+          underline = false,
+        }
+        highlights.NvimTreeWinSeparator = {
+          fg = colors.border,
+        }
+        highlights.BufferLineFill = { bg = colors.bg }
+        highlights.NvimTreeSpecialFile = { fg = colors.purple, underline = false }
+        highlights["@tag.attribute"] = { fg = colors.green1, italic = true }
+        -- highlights["@keyword.function"] = { fg = colors.blue, italic = true }
+        -- highlights["@function"] = { fg = colors.blue, italic = true }
+      end,
+    })
+  end,
+}

lua/pcode/user/default.lua

@@ -47,8 +47,8 @@ pcode.extras = {
 pcode.themes = {
   -- note: open remark only one
   -- **:: Eva Theme ::** --
-  evatheme = "Eva-Dark",
-  -- evatheme = "Eva-Dark-Italic",
+  -- evatheme = "Eva-Dark",
+  evatheme = "Eva-Dark-Italic",
   -- evatheme = "Eva-Dark-Bold",
   -- evatheme = "Eva-Light",
   --
@@ -63,6 +63,22 @@ pcode.themes = {
   --
   -- **:: Jetbrains Theme ::** --
   -- jetbrains = "darcula-dark",
+  --
+  -- **:: Sublimetext Theme ::** --
+  -- sublimetext = "juliana",
+  --
+  -- **:: Tokyonight Theme ::** --
+  -- tokyonight = "tokyonight-night",
+  -- tokyonight = "tokyonight-storm",
+  -- tokyonight = "tokyonight-day",
+  -- tokyonight = "tokyonight-moon",
+  --
+  -- **:: Catppuccin Theme ::** --
+  -- catppuccin = "catppuccin",
+  -- catppuccin = "catppuccin-latte",
+  -- catppuccin = "catppuccin-frappe",
+  -- catppuccin = "catppuccin-macchiato",
+  -- catppuccin = "catppuccin-macchiato",
 }
 -- activate config transparent_bg
 pcode.transparent = false