diff --git a/lazy-lock.json b/lazy-lock.json index 697dafb..2571dd6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" }, + "Eva-Theme.nvim": { "branch": "master", "commit": "902dd17975a7710e544d409ea856dbecc9d64997" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "auto-conform.nvim": { "branch": "main", "commit": "d04389f955dd0990e85a269b226199f458de32a6" }, @@ -15,7 +16,6 @@ "code_runner.nvim": { "branch": "main", "commit": "6c5bfe44a6c7523350cd706e6b3b8101166eed99" }, "codeium.vim": { "branch": "main", "commit": "e0342fde9474fdd0a36ff9692fe0031b7611a19f" }, "conform.nvim": { "branch": "master", "commit": "acc7337cfd24ddfa3109bfc8c258c09c88c5c450" }, - "dracula.nvim": { "branch": "main", "commit": "fdf503e52ec1c8aae07353604d891fe5a3ed5201" }, "dressing.nvim": { "branch": "master", "commit": "71349f24c6e07b39f33600985843c289ca735308" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, @@ -45,7 +45,7 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, - "nvim-treesitter": { "branch": "master", "commit": "09bad640e4507885fa0e7035348c7854c531b3d6" }, + "nvim-treesitter": { "branch": "master", "commit": "a7a3b9c10e8a5fe0da05ebb65db3ed1d164e612d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "48128953949b51235ccada535f021a505fdaf3df" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, @@ -53,7 +53,6 @@ "playground": { "branch": "master", "commit": "bcfab84f98a33f2ad34dda6c842046dca70aabf6" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "a727bd368e70808125b7cf589328cc595faf3d5a" }, - "rest.nvim": { "branch": "main", "commit": "91badd46c60df6bd9800c809056af2d80d33da4c" }, "smart-splits.nvim": { "branch": "master", "commit": "1a2b268a7ec7aeef879cdd15973339010ec134f7" }, "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 336a577..93e8d22 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -15,7 +15,7 @@ -- darcula-dark -- juliana -- Eva-Dark, Eva-Dark-Italic, Eva-Dark-Bold -pcode.colorscheme = "dracula" +pcode.colorscheme = "Eva-Dark-Italic" -- 0 =off 1= on pcode.transparent_mode = 0 @@ -154,7 +154,7 @@ pcode.refactoring = false pcode.database = false -- https://github.com/rest-nvim/rest.nvim -pcode.rest_client = true +pcode.rest_client = false -- https://github.com/mfussenegger/nvim-dap pcode.nvim_dap = true -- not support for windows os (auto config mason-nvim-dap) diff --git a/lua/plugins/themes/evatheme.lua b/lua/plugins/themes/evatheme.lua index b616055..e5c2947 100644 --- a/lua/plugins/themes/evatheme.lua +++ b/lua/plugins/themes/evatheme.lua @@ -30,6 +30,11 @@ if substring(tostring(clr), "Eva") and true or false then hi(0, "NvimTreeGitMergeIcon", { bg = color.dark, fg = color.git.diffModified }) hi(0, "NvimTreeGitStagedIcon", { bg = color.dark, fg = color.git.stagedModified }) 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 = "#838FA7", fg = color.dark }) + hi(0, "TermCursorNC", { bg = "#838FA7", fg = color.dark }) end, }) end, diff --git a/lua/user/autocommands.lua b/lua/user/autocommands.lua index eaf163f..8b0c0c4 100644 --- a/lua/user/autocommands.lua +++ b/lua/user/autocommands.lua @@ -86,6 +86,16 @@ vim.filetype.add({ }, }) +-- config cursor +vim.opt.guicursor = { + "n-v:block", -- Normal, Visual, Command mode: block cursor + "i-ci-ve-c:ver25", -- Insert, Command-line Insert, Visual mode: vertical bar cursor + "r-cr:hor20", -- Replace, Command-line Replace mode: horizontal bar cursor + "o:hor50", -- Operator-pending mode: horizontal bar cursor + "a:blinkwait700-blinkoff400-blinkon250", -- Blinking settings + "sm:block-blinkwait175-blinkoff150-blinkon175", -- Select mode: block cursor with blinking +} + -- Autoformat -- augroup _lsp -- autocmd!