diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/plugins/colorscheme.lua | 26 | ||||
| -rw-r--r-- | lua/plugins/lsp.lua | 1 | ||||
| -rw-r--r-- | lua/plugins/modify-blend.lua | 61 | ||||
| -rw-r--r-- | lua/user/keys.lua | 48 | ||||
| -rw-r--r-- | lua/user/opts.lua | 1 | ||||
| -rw-r--r-- | lua/user/pack.lua | 5 |
6 files changed, 85 insertions, 57 deletions
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 1f76a40..0ee4364 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,6 +1,6 @@ -- Colorscheme -- ayu gruvbox molokai onedark srcery everblush vscode edge nightfly doom-one -local colorscheme = "onedark" +local colorscheme = "nightfly" local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) if not status_ok then vim.notify("colorscheme " .. colorscheme .. " not found!") @@ -37,3 +37,27 @@ au WinLeave * setl winhl=WinSeparator:WinSeparator require("notify").setup({ background_colour = "#000000", }) +-- let g:terminal_color_0 = '#2e3436' +-- let g:terminal_color_1 = '#cc0000' +-- let g:terminal_color_2 = '#4e9a06' +-- let g:terminal_color_3 = '#c4a000' +-- let g:terminal_color_4 = '#3465a4' +-- let g:terminal_color_5 = '#75507b' +-- let g:terminal_color_6 = '#0b939b' +-- let g:terminal_color_7 = '#d3d7cf' +-- let g:terminal_color_8 = '#555753' +-- let g:terminal_color_9 = '#ef2929' +-- let g:terminal_color_10 = '#8ae234' +-- let g:terminal_color_11 = '#fce94f' +-- let g:terminal_color_12 = '#729fcf' +-- let g:terminal_color_13 = '#ad7fa8' +-- let g:terminal_color_14 = '#00f5e9' +-- let g:terminal_color_15 = '#eeeeec' +-- +-- set background=dark +-- execute "silent! colorscheme base16-eighties" +-- highlight Comment guifg=#585858 +-- highlight Normal guifg=#999999 +-- "highlight TabLine guifg=#333333 guibg=#777777 +-- "highlight TabLineSel guifg=#FA7F7F +-- highlight MatchParen gui=bold guibg=black guifg=limegreen diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 900121f..924db87 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -257,7 +257,6 @@ vim.diagnostic.config({ severity_sort = false, -- default to false }) -vim.o.updatetime = 250 vim.cmd[[ augroup OpenFloat autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focusable = false,}) diff --git a/lua/plugins/modify-blend.lua b/lua/plugins/modify-blend.lua index 7c48815..4cb2bdd 100644 --- a/lua/plugins/modify-blend.lua +++ b/lua/plugins/modify-blend.lua @@ -1,40 +1,43 @@ local ui = vim.api.nvim_list_uis()[1] -local bufnr = vim.api.nvim_create_buf(false, true) +local bufnr = vim.api.nvim_create_buf(true, true) local win = vim.api.nvim_open_win(bufnr, true, { - relative = "editor", + --relative = "editor", + relative = "cursor", width = ui.width, height = ui.height, + anchor = "NE", row = 10, col = 10, style = "minimal", + zindex = 50, }) vim.api.nvim_win_set_option(win, "winblend", 1) - -local blend_start = 15 -local offset = 1 - -CANCEL = false -local timer = vim.loop.new_timer() -timer:start( - 0, - 50, - vim.schedule_wrap(function() - blend_start = blend_start + offset - - if blend_start > 90 then - offset = -1 - elseif blend_start < 10 then - offset = 1 - end - - if CANCEL or not vim.api.nvim_win_is_valid(win) then - timer:close() - timer:stop() - return - end - - vim.cmd([[highlight NormalFloat blend=]] .. tostring(blend_start)) - end) -) +-- +--local blend_start = 15 +--local offset = 1 +-- +--CANCEL = false +--local timer = vim.loop.new_timer() +--timer:start( +-- 0, +-- 50, +-- vim.schedule_wrap(function() +-- blend_start = blend_start + offset +-- +-- if blend_start > 90 then +-- offset = -1 +-- elseif blend_start < 10 then +-- offset = 1 +-- end +-- +-- if CANCEL or not vim.api.nvim_win_is_valid(win) then +-- timer:close() +-- timer:stop() +-- return +-- end +-- +-- vim.cmd([[highlight NormalFloat blend=]] .. tostring(blend_start)) +-- end) +--) diff --git a/lua/user/keys.lua b/lua/user/keys.lua index f01a0c5..8feee85 100644 --- a/lua/user/keys.lua +++ b/lua/user/keys.lua @@ -152,7 +152,7 @@ map("n", "<leader>cd", ":cd %:p:h<CR>:pwd<CR>") map('n', '<leader>o', ':!xdg-open %<cr><cr>') -- Unsets the 'last search pattern' register by hitting return -map("n", "<CR>", "!silent :noh<CR><CR>") +--map("n", "<CR>", "!silent :noh<CR><CR>") -- Toggle completion map("n", "<Leader>tc", ":lua require('user.utils').toggle_completion()<CR>") @@ -266,11 +266,11 @@ map("n", "<C-t>", ":call OpenLastClosed() <CR>") ---------------- Plugin Operations ---------------- -- Packer -map("n", "<leader>pc", "<cmd>PackerCompile<cr>") -map("n", "<leader>pi", "<cmd>PackerInstall<cr>") -map("n", "<leader>ps", "<cmd>PackerSync<cr>") -map("n", "<leader>pS", "<cmd>PackerStatus<cr>") -map("n", "<leader>pu", "<cmd>PackerUpdate<cr>") +map("n", "<leader>Pc", "<cmd>PackerCompile<cr>") +map("n", "<leader>Pi", "<cmd>PackerInstall<cr>") +map("n", "<leader>Ps", "<cmd>PackerSync<cr>") +map("n", "<leader>PS", "<cmd>PackerStatus<cr>") +map("n", "<leader>Pu", "<cmd>PackerUpdate<cr>") -- Tmux navigation (aserowy/tmux.nvim) map('n', '<C-h>', '<CMD>NavigatorLeft<CR>') @@ -358,23 +358,23 @@ end map("n", "<leader>ww", ":lua Toggle_autopairs()<CR>", term_opts) -- Tabularize -vim.cmd([[ - vnoremap <expr> <Leader>mm ':Tabularize /^\s*\S.*\zs' . split(&commentstring, '%s')[0] . "<CR>" - nnoremap <expr> <Leader>mm ':Tabularize /^\s*\S.*\zs' . split(&commentstring, '%s')[0] . "<CR>" - "nnoremap <leader>i mc40A <esc>080lDgelD`cP - "vnoremap <leader>ii mc0f-20i<Space><Esc>`cdt=j -]]) +--vim.cmd([[ +-- vnoremap <expr> <Leader>mm ':Tabularize /^\s*\S.*\zs' . split(&commentstring, '%s')[0] . "<CR>" +-- nnoremap <expr> <Leader>mm ':Tabularize /^\s*\S.*\zs' . split(&commentstring, '%s')[0] . "<CR>" +-- "nnoremap <leader>i mc40A <esc>080lDgelD`cP +-- "vnoremap <leader>ii mc0f-20i<Space><Esc>`cdt=j +--]]) -- EasyAlign -vim.cmd([[ - " Start interactive EasyAlign in visual mode (e.g. vipga) - xmap ga <Plug>(EasyAlign) - " Start interactive EasyAlign for a motion/text object (e.g. gaip) - nmap ga <Plug>(EasyAlign) - if !exists('g:easy_align_delimiters') - let g:easy_align_delimiters = {} - endif - let g:easy_align_delimiters['--'] = { 'pattern': '--', 'ignore_groups': ['String'] } - nnoremap <F1> 21A <Esc>d21\| - imap <F1> <Esc><F1>a -]]) +--vim.cmd([[ +-- " Start interactive EasyAlign in visual mode (e.g. vipga) +-- xmap ga <Plug>(EasyAlign) +-- " Start interactive EasyAlign for a motion/text object (e.g. gaip) +-- nmap ga <Plug>(EasyAlign) +-- if !exists('g:easy_align_delimiters') +-- let g:easy_align_delimiters = {} +-- endif +-- let g:easy_align_delimiters['--'] = { 'pattern': '--', 'ignore_groups': ['String'] } +-- nnoremap <F1> 21A <Esc>d21\| +-- imap <F1> <Esc><F1>a +--]]) diff --git a/lua/user/opts.lua b/lua/user/opts.lua index 13e9c1c..90fe0f2 100644 --- a/lua/user/opts.lua +++ b/lua/user/opts.lua @@ -25,6 +25,7 @@ vim.cmd([[ -- Environment --vim.opt.shell = "zsh" -- +vim.o.updatetime = 250 vim.o.shell = "/bin/zsh" vim.scriptencoding = "utf-8" -- vim.opt.encoding = "utf-8" -- diff --git a/lua/user/pack.lua b/lua/user/pack.lua index 43b7a36..1a37d8b 100644 --- a/lua/user/pack.lua +++ b/lua/user/pack.lua @@ -15,7 +15,7 @@ if fn.empty(fn.glob(install_path)) > 0 then vim.cmd([[packadd packer.nvim]]) end --- Autocommand that reloads neovim whenever you save the plugins.lua file +-- Autocommand that reloads neovim whenever you save this file vim.cmd([[ augroup packer_user_config autocmd! @@ -29,9 +29,10 @@ if not status_ok then return end --- Have packer use a popup window +-- Have packer use a popup window and set a maximum number of jobs packer.init({ auto_reload_compiled = true, + max_jobs = 90, display = { open_fn = function() return require("packer.util").float({ border = "rounded" }) |