diff --git a/cursor.vim b/cursor.vim new file mode 100644 index 0000000..d75e71e --- /dev/null +++ b/cursor.vim @@ -0,0 +1,2 @@ +let &t_SI = "\e[5 q" +let &t_EI = "\e[2 q" diff --git a/init.lua b/init.lua index c36b5b6..fb4eacc 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,4 @@ +vim.cmd('source ' .. vim.fn.stdpath("config") .. "/cursor.vim") require("config.lazy") require("options") require("globals") @@ -15,5 +16,3 @@ vim.filetype.add({ [".*/uwsm/env.*"] = "zsh", } }) - -vim.cmd[[colorscheme onedark]] diff --git a/lua/autocmd.lua b/lua/autocmd.lua index b215baa..5e87df2 100644 --- a/lua/autocmd.lua +++ b/lua/autocmd.lua @@ -5,3 +5,7 @@ autocmd("LspAttach", { vim.lsp.document_color.enable(false, args.buf, { "background" }) end, }) + +vim.api.nvim_create_autocmd("VimLeave", { + command = "set guicursor=a:ver25" +}) diff --git a/lua/config/cmp.lua b/lua/config/cmp.lua index 479c940..12e856d 100644 --- a/lua/config/cmp.lua +++ b/lua/config/cmp.lua @@ -29,6 +29,7 @@ local cmp_kinds = { local cmp = require('cmp') cmp.setup({ + preselect = 'None', formatting = { fields = { 'kind', 'abbr' }, format = function(_, vim_item) diff --git a/lua/config/huez.lua b/lua/config/huez.lua new file mode 100644 index 0000000..e5f24c8 --- /dev/null +++ b/lua/config/huez.lua @@ -0,0 +1,26 @@ +require("huez").setup({ + path = vim.fs.normalize(vim.fn.stdpath("data") --[[@as string]]) .. "/huez", + fallback = "default", + suppress_messages = true, + theme_config_module = nil, + exclude = { "desert", "evening", "industry", "koehler", "morning", "murphy", "pablo", "peachpuff", "ron", "shine", "slate", "torte", "zellner", "blue", "darkblue", "delek", "quiet", "elflord", "habamax", "lunaperche", "zaibatsu", "wildcharm", "sorbet", "vim", }, + background = "dark", + picker = { + themes = { + layout = "right", + opts = {}, + }, + favorites = { + layout = "right", + opts = {}, + }, + live = { + layout = "right", + opts = {}, + }, + ensured = { + layout = "right", + opts = {}, + }, + }, +}) diff --git a/lua/config/lspconfig.lua b/lua/config/lspconfig.lua index 7523e36..3bf1e41 100644 --- a/lua/config/lspconfig.lua +++ b/lua/config/lspconfig.lua @@ -98,6 +98,7 @@ require("mason-lspconfig").setup({ }) cmp.setup { + preselect = 'None', formatting = { fields = { 'kind', 'abbr' }, format = function(entry, vim_item) diff --git a/lua/config/lualine.lua b/lua/config/lualine.lua index 0a9434d..aa78a19 100644 --- a/lua/config/lualine.lua +++ b/lua/config/lualine.lua @@ -76,6 +76,7 @@ local virtual_env = function() end require("lualine").setup { + laststatus = 0, options = { icons_enabled = true, theme = "auto", diff --git a/lua/config/ministatusline.lua b/lua/config/ministatusline.lua new file mode 100644 index 0000000..33c335e --- /dev/null +++ b/lua/config/ministatusline.lua @@ -0,0 +1,7 @@ +return { + content = { + active = nil, + inactive = nil, + }, + use_icons = true, +} diff --git a/lua/options.lua b/lua/options.lua index 6a325fd..524f3c5 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -27,7 +27,6 @@ vim.opt.formatoptions = "rqnj" -- vim.opt.foldlevel = 0 -- vim.opt.foldlevelstart = 0 vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" -vim.o.laststatus = 3 vim.o.clipboard = "unnamedplus" vim.o.cursorline = true vim.o.cursorlineopt = "number" @@ -36,6 +35,7 @@ vim.o.ignorecase = true vim.o.smartcase = true vim.o.mouse = "a" vim.o.number = true +vim.o.termguicolors = true vim.o.numberwidth = 3 vim.o.ruler = false vim.o.showmode = false @@ -53,5 +53,7 @@ local sep = is_windows and "\\" or "/" local delim = is_windows and ";" or ":" vim.env.PATH = table.concat({ vim.fn.stdpath "data", "mason", "bin" }, sep) .. delim .. vim.env.PATH +vim.api.nvim_set_hl( 0, "Cursor", { reverse = true }) + -- vim-tpipeline vim.g.tpipeline_restore = 1 diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 91746c2..f307843 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -5,7 +5,17 @@ return { require("config.treesitter") end, }, - + { + "sainnhe/edge", + lazy = false, + priority = 1000, + config = function() + vim.g.edge_enable_italic = 1 + vim.g.edge_style = "default" + vim.g.edge_menu_selection_background = "purple" + vim.cmd("colorscheme edge") + end, + }, { "rmagatti/auto-session", config = function() @@ -48,16 +58,21 @@ return { "nvim-lualine/lualine.nvim", event = "VeryLazy", config = function () + if vim.env.TMUX then + vim.api.nvim_create_autocmd({ "FocusGained", "ColorScheme", "VimEnter" }, { + callback = function() + vim.defer_fn( function() + vim.opt.laststatus = 0 + end, 100) + end, + }) + vim.o.laststatus = 0 + end require("config.lualine") end, }, { "mawkler/modicator.nvim", - setup = function() - vim.o.cursorline = true - vim.o.number = true - vim.o.termguicolors = true - end, config = function() require("config.modicator") end @@ -252,5 +267,20 @@ return { }, { "vimpostor/vim-tpipeline", + }, + { + "yazeed1s/minimal.nvim", + config = function() + vim.g.minimal_italic_comments = true + end, + }, + { + "vague2k/huez.nvim", + branch = "stable", + event = "UIEnter", + import = "huez-manager.import", + config = function() + require("config.huez") + end, } }