diff --git a/lua/plugins/astroui.lua b/lua/plugins/astroui.lua index d67aace..71d5d60 100644 --- a/lua/plugins/astroui.lua +++ b/lua/plugins/astroui.lua @@ -3,7 +3,7 @@ return { "AstroNvim/astroui", ---@type AstroUIOpts opts = { - colorscheme = "cyberdream", + colorscheme = "astromars", -- add new user interface icon icons = { VimIcon = "", diff --git a/lua/plugins/dankcolors.lua b/lua/plugins/dankcolors.lua deleted file mode 100644 index 917d4c1..0000000 --- a/lua/plugins/dankcolors.lua +++ /dev/null @@ -1,91 +0,0 @@ -return { - { - "RRethy/base16-nvim", - priority = 1000, - config = function() - require('base16-colorscheme').setup({ - base00 = '#0A0A0F', - base01 = '#0A0A0F', - base02 = '#5c6370', - base03 = '#5c6370', - base04 = '#abb2bf', - base05 = '#ffffff', - base06 = '#ffffff', - base07 = '#ffffff', - base08 = '#e05f68', - base09 = '#e05f68', - base0A = '#57e9e8', - base0B = '#8ee086', - base0C = '#38838d', - base0D = '#57e9e8', - base0E = '#2e9986', - base0F = '#2e9986', - }) - - vim.api.nvim_set_hl(0, 'Visual', { - bg = '#5c6370', - fg = '#ffffff', - bold = true - }) - vim.api.nvim_set_hl(0, 'Statusline', { - bg = '#57e9e8', - fg = '#0A0A0F', - }) - vim.api.nvim_set_hl(0, 'LineNr', { fg = '#5c6370' }) - vim.api.nvim_set_hl(0, 'CursorLineNr', { fg = '#38838d', bold = true }) - - vim.api.nvim_set_hl(0, 'Statement', { - fg = '#2e9986', - bold = true - }) - vim.api.nvim_set_hl(0, 'Keyword', { link = 'Statement' }) - vim.api.nvim_set_hl(0, 'Repeat', { link = 'Statement' }) - vim.api.nvim_set_hl(0, 'Conditional', { link = 'Statement' }) - - vim.api.nvim_set_hl(0, 'Function', { - fg = '#57e9e8', - bold = true - }) - vim.api.nvim_set_hl(0, 'Macro', { - fg = '#57e9e8', - italic = true - }) - vim.api.nvim_set_hl(0, '@function.macro', { link = 'Macro' }) - - vim.api.nvim_set_hl(0, 'Type', { - fg = '#38838d', - bold = true, - italic = true - }) - vim.api.nvim_set_hl(0, 'Structure', { link = 'Type' }) - - vim.api.nvim_set_hl(0, 'String', { - fg = '#8ee086', - italic = true - }) - - vim.api.nvim_set_hl(0, 'Operator', { fg = '#abb2bf' }) - vim.api.nvim_set_hl(0, 'Delimiter', { fg = '#abb2bf' }) - vim.api.nvim_set_hl(0, '@punctuation.bracket', { link = 'Delimiter' }) - vim.api.nvim_set_hl(0, '@punctuation.delimiter', { link = 'Delimiter' }) - - vim.api.nvim_set_hl(0, 'Comment', { - fg = '#5c6370', - italic = true - }) - - local current_file_path = vim.fn.stdpath("config") .. "/lua/plugins/dankcolors.lua" - if not _G._matugen_theme_watcher then - local uv = vim.uv or vim.loop - _G._matugen_theme_watcher = uv.new_fs_event() - _G._matugen_theme_watcher:start(current_file_path, {}, vim.schedule_wrap(function() - local new_spec = dofile(current_file_path) - if new_spec and new_spec[1] and new_spec[1].config then - new_spec[1].config() - print("Theme reload") - end - end)) - end - end - } -} diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua index 5d5f50c..e7fdd02 100644 --- a/lua/plugins/neotree.lua +++ b/lua/plugins/neotree.lua @@ -61,11 +61,11 @@ return { ["/"] = "fuzzy_finder", ["f"] = "filter_on_submit", [""] = "clear_filter", - [""] = "open_and_close_neotree", - [""] = "open", - -- Avante integration - [""] = "avante_add_files", - -- Git keybindings from astrocore + [""] = "open_and_close_neotree", + [""] = "open", + -- Avante integration + [""] = "avante_add_files", + -- Git keybindings from astrocore ["o"] = function() vim.cmd "!gh repo view --web" end, ["h"] = function() require("snacks").terminal("gh dash", { @@ -226,23 +226,21 @@ return { avante_add_files = function(state) local node = state.tree:get_node() local filepath = node:get_id() - local relative_path = require('avante.utils').relative_path(filepath) + local relative_path = require("avante.utils").relative_path(filepath) - local sidebar = require('avante').get() + local sidebar = require("avante").get() local open = sidebar:is_open() -- ensure avante sidebar is open if not open then - require('avante.api').ask() - sidebar = require('avante').get() + require("avante.api").ask() + sidebar = require("avante").get() end sidebar.file_selector:add_selected_file(relative_path) -- remove neo tree buffer - if not open then - sidebar.file_selector:remove_selected_file('neo-tree filesystem [1]') - end + if not open then sidebar.file_selector:remove_selected_file "neo-tree filesystem [1]" end end, -- Refresh patterns when changing directories refresh_patterns = function(state) @@ -295,9 +293,7 @@ return { always_show_by_pattern = {}, visible = function(item) -- Hide all symlinks - if item.type == "link" then - return false - end + if item.type == "link" then return false end return true end, hide_by_name = { diff --git a/lua/polish.lua b/lua/polish.lua index de12d49..834787b 100644 --- a/lua/polish.lua +++ b/lua/polish.lua @@ -35,14 +35,3 @@ vim.api.nvim_create_autocmd("VimResume", { end, desc = "Check for file changes after Screen reattach/resume", }) - - - -require("cyberdream").setup { - variant = "default", -- use "light" for the light variant. Also accepts "auto" to set dark or light colors based on the current value of `vim.o.background` - transparent = true, - italic_comments = true, - hide_fillchars = true, - borderless_pickers = true, - terminal_colors = true, -}