gitea-admin/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

structure change. Colorscheme picker. etc.

Browse Source
This commit is contained in:
Nachuan Tang
2023-03-22 07:00:40 -04:00
parent 69efb28c6f
commit 8175681fa9
4 changed files with 882 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vimrc
+12 -6
View File
@@ -10,12 +10,14 @@
let after_directory = g:mydotfiles_directory . 'config/vi-plugs/coc-theme/after/'
" detect vim type(vim or nvim)
let g:vim_v = 0
if has('nvim')
let g:vim_type = 'nvim'
let g:vim_version = matchstr(execute('version'), 'NVIM v\zs[^\n]*')
else
let g:vim_type = 'vim'
let g:vim_version = matchstr(execute('version'), 'Vi IMproved \zs[^\n]*')
let g:vim_v = v:version
endif
" detect operating system (Windows/Linux/Darwin)
@@ -100,12 +102,12 @@
"
" set tabpagemax=15 " Only show 15 tabs
" set showmode " Display the current mode
" set cursorline " Highlight current line
set nocursorline " Highlight current line
" get rid of current line highlight, instead just highlight the number column
augroup CLClear
autocmd! ColorScheme * hi clear CursorLine
augroup END
" augroup CLClear
" autocmd! ColorScheme * hi clear CursorLine
" augroup END
set cmdheight=1 " get rid of the extra useless line at the bottom(if not working, probably a plugin is changing the value)
@@ -141,8 +143,12 @@
set shiftwidth=4 " Use indents of 4 spaces
set tabstop=4 " An indentation every four columns
set softtabstop=4 " Let backspace delete indent
autocmd FileType javascript,typescript set tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType c,cpp,python,java set tabstop=4 shiftwidth=4 softtabstop=4
augroup FileFormat
autocmd!
autocmd FileType javascript,typescript,lua setlocal tabstop=2 shiftwidth=2 softtabstop=2
" autocmd FileType c,cpp,python,java setlocal tabstop=4 shiftwidth=4 softtabstop=4
augroup END
set nojoinspaces " Prevents inserting two spaces after punctuation on a join (J)
set splitright " Puts new vsplit windows to the right of the current
set splitbelow " Puts new split windows to the bottom of the current
.vimrc.bundles
+253 -257
View File
@@ -3,54 +3,64 @@
" OPTIONS
" PLUGIN_INSTALL
" UTILITIES
" PLUGIN_CONFIGURATION
" THEME_CONFIGURATION
" PLUGIN_CONFIGURATION " THEME_CONFIGURATION
" KEY_MAPS
" OTHER_CONFIGS
let g:debug_mode = v:false
let g:high_performence = v:false " set true will also disable animation
let g:autocomplte_enable = v:true
let g:copilot_enable = v:false
let g:high_performence = v:false
" only used by neovim
let g:classic_vim_ui = v:false
let g:animation_enable = v:true
let g:swap_dict = [
\ ['false', '0', 'dark' ],
\ ['true' , '1', 'light']]
" convinient function to swap between two options
nmap <leader><leader>t :call SwapWord()<CR>
" PLUGIN_INSTALL
" {
" Plugin environment
let g:mydotfiles_directory = expand('~/.dotfiles/')
let s:plugin_dir = expand('~/.vim/plugged/')
let g:config_file_path = g:vim_dir . ".config.vim"
call plug#begin(s:plugin_dir)
" https://github.com/junegunn/vim-plug/wiki/tips
function! Cond(cond, ...)
let opts = get(a:000, 0, {})
return a:cond ? opts : extend(opts, { 'on': [], 'for': [] })
endfunction
let g:animation_enable = g:high_performence ? v:false : g:animation_enable
"""""""""""""""""""""""
"""" THEME_PLUGINS """"
"""""""""""""""""""""""
Plug 'sainnhe/everforest', Cond(g:vim_type == 'vim')
Plug 'sainnhe/everforest'
if !g:high_performence
Plug 'jacoborus/tender.vim'
Plug 'cocopon/iceberg.vim'
Plug 'catppuccin/nvim', Cond( has('nvim-0.8.2') \|\| g:vim_v >= 900 , { 'as': 'catppuccin' })
Plug 'NLKNguyen/papercolor-theme'
Plug 'EdenEast/nightfox.nvim', Cond(has('nvim-0.5'))
Plug 'projekt0n/github-nvim-theme', Cond(has('nvim-0.5'), { 'tag': 'v0.0.7' })
Plug 'folke/tokyonight.nvim', Cond(g:vim_type == 'nvim', { 'branch': 'main' })
endif
" Neovim only
Plug 'EdenEast/nightfox.nvim', Cond(g:vim_type == 'nvim' && g:vim_version >= 0.5)
Plug 'projekt0n/github-nvim-theme', Cond(g:vim_type == 'nvim' && g:vim_version >= 0.5, { 'tag': 'v0.0.7' })
"""""""""""""""""""""""
"""""""" END """"""""""
"""""""""""""""""""""""
Plug 'lervag/vimtex'
Plug 'github/copilot.vim', Cond(( g:vim_type == 'nvim' \|\| g:vim_v >= 900 )
\ && g:copilot_enable && executable('node'))
Plug 'gelguy/wilder.nvim', Cond(g:vim_type == 'vim' \|\| g:classic_vim_ui)
Plug 'gelguy/wilder.nvim', Cond((g:vim_type == 'vim' \|\| g:classic_vim_ui) && !g:high_performence)
" To use Python remote plugin features in Vim for wilder, can be skipped
" Plug 'roxma/nvim-yarp', Cond(g:vim_type == 'vim')
" Plug 'roxma/vim-hug-neovim-rpc', Cond(g:vim_type == 'vim')
Plug 'dstein64/vim-startuptime'
Plug 'simeji/winresizer'
Plug 'dstein64/vim-startuptime', Cond(!g:high_performence)
Plug 'simeji/winresizer', Cond(!g:high_performence)
Plug 'rust-lang/rust.vim', { 'for': ['rust'] }
Plug 'machakann/vim-sandwich'
@@ -58,29 +68,27 @@ let g:animation_enable = v:true
Plug 'jiangmiao/auto-pairs'
" Plug 'mg979/vim-visual-multi'
Plug 'RRethy/vim-illuminate'
Plug 'RRethy/vim-illuminate', Cond(!g:high_performence)
"Plug 'easymotion/vim-easymotion'
Plug 'mhinz/vim-startify'
Plug 'ludovicchabant/vim-gutentags', Cond(!exists('g:vscode'), { 'for': ['c', 'cpp'] })
Plug 'ludovicchabant/vim-gutentags'
Plug 'christoomey/vim-tmux-navigator'
Plug 'airblade/vim-rooter'
Plug 'roxma/vim-tmux-clipboard', Cond(executable('tmux'))
Plug 'liuchengxu/vista.vim'
Plug 'liuchengxu/vista.vim', Cond(!g:high_performence)
"""""""""""""""""""""""
"" ESSENTIAL_PLUGINS ""
"""""""""""""""""""""""
" Comment stuff out
Plug 'tpope/vim-commentary'
Plug 'vim-scripts/restore_view.vim'
" vim only plugins
Plug 'scrooloose/nerdtree', Cond(g:vim_type == 'vim' \|\| g:vim_version < 0.8, { 'on' : ['NERDTreeToggle', 'NERDTreeFind'] })
Plug 'scrooloose/nerdtree', Cond(g:vim_type == 'vim' \|\| g:vim_v < 800, { 'on' : ['NERDTreeToggle', 'NERDTreeFind'] })
Plug 'tiagofumo/vim-nerdtree-syntax-highlight', Cond(g:vim_type == 'vim' && !g:high_performence)
Plug 'neoclide/coc.nvim', Cond(!exists('g:vscode') && executable('node'), {'branch': 'release'})
Plug 'neoclide/coc.nvim', Cond(g:autocomplte_enable && executable('node'), {'branch': 'release'})
" only work with vim
if g:vim_type == 'vim'
@@ -103,22 +111,22 @@ let g:animation_enable = v:true
if g:vim_version >= 0.5
Plug 'xiyaowong/nvim-transparent'
Plug 'lukas-reineke/indent-blankline.nvim', Cond(!g:animation_enable)
Plug 'echasnovski/mini.indentscope'
Plug 'echasnovski/mini.animate'
Plug 'echasnovski/mini.indentscope', Cond(g:animation_enable)
Plug 'echasnovski/mini.animate', Cond(g:animation_enable)
Plug 'nvim-lualine/lualine.nvim'
Plug 'karb94/neoscroll.nvim'
Plug 'petertriho/nvim-scrollbar'
Plug 'folke/which-key.nvim'
Plug 'karb94/neoscroll.nvim', Cond(g:animation_enable)
Plug 'petertriho/nvim-scrollbar', Cond(g:animation_enable)
Plug 'folke/which-key.nvim', Cond(!g:high_performence)
endif
if g:vim_version >= 0.7
Plug 'nvim-treesitter/nvim-treesitter', Cond(!exists('g:vscode') && executable('make'), {'do': ':TSUpdate'})
Plug 'nvim-treesitter/nvim-treesitter', Cond(executable('make'), {'do': ':TSUpdate'})
" for telescope
Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-telescope/telescope.nvim', Cond(g:vim_type == 'nvim', { 'tag': '0.1.x' })
Plug 'nvim-telescope/telescope.nvim', Cond(g:vim_type == 'nvim', { 'branch': '0.1.x' })
" c plugin for telescope to make it faster
Plug 'nvim-telescope/telescope-fzf-native.nvim', Cond(!exists('g:vscode') && executable('make'), { 'do': 'make' })
Plug 'nvim-telescope/telescope-fzf-native.nvim', Cond(executable('make'), { 'do': 'make' })
" comment out this plugin if the machine doesn't have required
" font install
@@ -128,19 +136,24 @@ let g:animation_enable = v:true
if g:vim_version >= 0.8
Plug 'nvim-tree/nvim-tree.lua'
Plug 'rcarriga/nvim-notify'
Plug 'folke/noice.nvim'
Plug 'MunifTanjim/nui.nvim'
Plug 'rcarriga/nvim-notify', Cond(!g:high_performence && g:animation_enable)
Plug 'folke/noice.nvim', Cond(!g:high_performence && g:animation_enable)
Plug 'MunifTanjim/nui.nvim', Cond(!g:high_performence && g:animation_enable)
endif
endif
call plug#end()
augroup InitConfig
autocmd VimLeave * call SaveConfig()
" Automatically install missing plugins at startup
autocmd VimEnter *
\ if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
\| PlugInstall --sync | q
\| endif
augroup end
" }
" UTILITIES
@@ -149,7 +162,8 @@ let g:animation_enable = v:true
" special filetypes probably defined by plugins that we don't want other
" plugins to mess around with them
let g:special_fts = ['help', 'nerdtree']
" import ultilities functions
execute('source ' . g:mydotfiles_directory . '/utils.vim')
function! HasPlug(plug_name, ...)
let plug_dir_name = get(a:, 1, a:plug_name) " optional argument for the name of plug's folder
@@ -165,19 +179,60 @@ function! HasPlug(plug_name, ...)
return v:false
endfunction
function! SaveConfig()
let p = ReadVariable(g:config_file_path)
if type(p) != type({})
let p = {}
endif
let config = has_key(p, g:vim_type) && type(p[g:vim_type]) == 4
\ ? p[g:vim_type] : {}
let config = Merge(config, g:my_config)
" vim and nvim may have diferenrt available plugins
let p[g:vim_type] = config
call SaveVariable(p, g:config_file_path)
endfunction
function! LoadConfig()
let result = ReadVariable(g:config_file_path)
" if it is dictionary
if type(result) == 4
if has_key(result, g:vim_type)
let config = result[g:vim_type]
if type(config) == 4 | return config | endif
endif
endif
return {}
endfunction
" }
" PLUGIN_CONFIGURATION
" {
if HasPlug('Copilot.vim')
" imap <expr> <C-n> <Plug>(copilot-next)
" imap <expr> <C-p> <Plug>(copilot-prev)
endif
if HasPlug('vimtex')
if g:os == 'Darwin'
let g:vimtex_view_method = 'skim'
endif
nmap <leader>lv <plug>(vimtex-view)
nmap <leader>lc :VimtexCompile<CR>
let g:vimtex_quickfix_open_on_warning = 0
endif
if HasPlug('minimap.vim')
nnoremap <silent> <leader>mm :MinimapToggle<CR>
let g:minimap_highlight_search = 1
let g:minimap_git_colors = 1
let g:minimap_enable_highlight_colorgroup = 1
let g:minimap_block_filetypes = ['help', 'nerdtree']
endif
if HasPlug('vista.vim')
let g:special_fts += ['vista']
let g:vista_default_executive = 'vim_lsp'
if HasPlug('coc.nvim')
let g:vista_default_executive = 'coc'
@@ -524,7 +579,12 @@ endfunction
call airline#parts#define_function('cocstatus', 'AirlineCocStatus')
call airline#parts#define_accent('cocstatus', 'italic')
function! AirlineInit()
let _airline_section_y = ''
if HasPlug('coc.nvim')
let _airline_section_y .= airline#section#create(['cocstatus'])
endif
" this create function returns a format string for status line (:h
" stl). the string we append is what will happend if we pass
" cocstatus into the create function. By appending them we have
@@ -535,7 +595,7 @@ endfunction
let g:airline_section_error = ''
let g:airline_section_warning = ''
let g:airline_section_x = airline#section#create(['bufnum'])
let g:airline_section_y = airline#section#create(['cocstatus'])
let g:airline_section_y = _airline_section_y
let g:airline_section_z = airline#section#create(['filetype'])
" see source for current list
@@ -545,12 +605,21 @@ endfunction
end
endfunction
if !g:high_performence
call timer_start(100, 's:aireline_refresh', {'repeat' : -1 })
endif
autocmd! CursorMoved * call s:aireline_refresh(0)
" if !g:high_performence
" call timer_start(100, 's:aireline_refresh', {'repeat' : -1 })
" endif
function! s:airlineconfig()
let g:my_config[&background].airline_theme = g:airline_theme
endfunction
autocmd AirlineAu User AirlineAfterTheme call s:airlineconfig()
endfunction
autocmd! User AirlineAfterInit call AirlineInit()
augroup AirlineAu
autocmd!
autocmd User AirlineAfterInit call AirlineInit()
augroup end
let g:airline#extensions#localsearch#enabled = 0
let g:airline_extensions = ['bufferline']
@@ -591,10 +660,8 @@ endfunction
if HasPlug("fzf") && HasPlug("fzf.vim")
" [Buffers] Jump to the existing window if possible
let g:fzf_buffers_jump = 1
"let $FZF_DEFAULT_COMMAND='find . \( -name node_modules -o -name .git \) -prune -o -print'
" - Preview window on the right with 50% width
" - CTRL-/ will toggle preview window.
if g:os == 'Windows'
let g:fzf_preview_window = []
@@ -602,6 +669,10 @@ endfunction
let g:fzf_preview_window = ['right:50%', 'ctrl-/']
end
let g:fzf_colors = {
\ 'gutter': ['bg', 'normal'],
\ }
" check if ripgrep is installed
if ! executable('rg')
command! -bang -nargs=* Rg
@@ -609,9 +680,19 @@ endfunction
\ 'grep -R --line-number --exclude-dir=".git;.svn" --color=always -- '.shellescape(<q-args>), 1,
\ fzf#vim#with_preview(), <bang>0)
endif
function! FzfColorSelect(color_name)
execute("colorscheme " . a:color_name)
call Theme_persistent(a:color_name)
if has_key(g:colo2airline, a:color_name )
call SetStatusLineTheme(g:colo2airline[a:color_name])
endif
endfunction
noremap <leader>fr :Rg<CR>
noremap <leader>ff :Files<CR>
noremap <leader>fc :Colors<CR>
noremap <leader>fc :call fzf#vim#colors({
\ 'sink': function('FzfColorSelect')})<CR>
endif
" }
@@ -654,17 +735,14 @@ endfunction
"""""""""""""""""""""""""""""""""""""""
" a list contains all available themes
let g:all_dark_themes = []
let g:all_light_themes = []
if HasPlug("tokyonight.nvim")
end
if HasPlug("github-nvim-theme")
let g:all_dark_themes += ['github_dark', 'github_dark_default', 'github_dimmed', 'github_dark_colorblind']
let g:all_light_themes += ['github_light', 'github_light_default', 'github_light_colorblind']
end
if HasPlug("nightfox.nvim")
let g:all_dark_themes += ['nightfox']
let g:all_light_themes += ['dawnfox']
end
if HasPlug('nvim-transparent')
@@ -684,18 +762,13 @@ endfunction
endif
if HasPlug('everforest')
let g:all_dark_themes += ['everforest']
let g:all_light_themes += ['everforest']
let g:everforest_better_performance = 1
let g:everforest_background = 'hard'
" let g:everforest_enable_italic = 1
function! Everforest_trans_enable()
let g:everforest_transparent_background = 2
colorscheme everforest
if exists(':AirlineTheme')
execute('AirlineTheme everforest')
endif
call SetStatusLineTheme('everforest')
" hack to fix caret characters appearing in the statusline when StatusLine
" and StatusLineNC has same highlight(https://vi.stackexchange.com/questions/15873/carets-in-status-line)
hi StatusLine guifg=#d3c6aa ctermfg=223
@@ -703,9 +776,7 @@ endfunction
function! Everforest_trans_disable()
let g:everforest_transparent_background = 0
colorscheme everforest
if exists(':AirlineTheme')
execute('AirlineTheme everforest')
endif
call SetStatusLineTheme('everforest')
endfunction
function! CB_dark_tb_enable_everforest()
call Everforest_trans_enable()
@@ -722,184 +793,113 @@ endfunction
endif
if HasPlug('papercolor-theme')
let g:all_dark_themes += ['PaperColor']
let g:all_light_themes += ['PaperColor']
function! CB_dark_tb_enable_PaperColor()
let g:PaperColor_Theme_Options = {
\ 'theme': {'default.dark': { 'transparent_background': 1 }}
\ }
execute("colorscheme " . g:dark_theme)
\ 'theme': {'default.dark': { 'transparent_background': 1 }}}
colorscheme PaperColor
endfunction
function! CB_light_tb_enable_PaperColor()
let g:PaperColor_Theme_Options = {
\ 'theme': {'default.light': { 'transparent_background': 1 }}
\ }
execute("colorscheme " . g:light_theme)
\ 'theme': {'default.light': { 'transparent_background': 1 }}}
colorscheme PaperColor
endfunction
function! CB_dark_tb_disable_PaperColor()
let g:PaperColor_Theme_Options = {
\ 'theme': {'default.dark': { 'transparent_background': 0 }}
\ }
execute("colorscheme " . g:dark_theme)
\ 'theme': {'default.dark': { 'transparent_background': 0 }}}
colorscheme PaperColor
endfunction
function! CB_light_tb_disable_PaperColor()
let g:PaperColor_Theme_Options = {
\ 'theme': {'default.light': { 'transparent_background': 0 }}
\ }
execute("colorscheme " . g:light_theme)
\ 'theme': {'default.light': { 'transparent_background': 0 }}}
colorscheme PaperColor
endfunction
endif
"""""""""""""""""""""""""""""""""""""""
"""""""""" THEME_ULTILITIES """""""""""
"""""""""""""""""""""""""""""""""""""""
" debug function print out highlight group of cursor position
function! ShowHighLightGroup()
if !exists("*synstack")
return
endif
echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
:echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
\ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
\ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"
endfunc
nmap <Leader>db :call ShowHighLightGroup()<CR>
" search and filter highlight group
" :call Sh('airline')
function! Sh(pattern)
execute("filter /" . a:pattern . "/ highlight")
endfunc
" get current colorscheme name
function! ColourSchemeName()
try
return g:colors_name
catch /^Vim:E121/
return "default"
catch /.*/
return "default"
endtry
endfunction
" delete signal file if exist
function! DeleteSignalFile(name)
if filereadable(g:vim_dir . a:name)
call delete(g:vim_dir . a:name)
endif
endfunction
" Create signal file if not exist
function! CreateSignalFile(name)
call system("touch " . g:vim_dir . a:name)
endfunction
function! SignalFileExists(filename)
if filereadable(g:vim_dir . a:filename)
return v:true
endif
return v:false
endfunction
function! SetDarkTheme()
function! SetDarkTheme(...)
let colors_name = a:0 > 0 ? a:1 : g:my_config.dark.theme
if HasColorscheme(colors_name)
execute("colorscheme " . colors_name)
if &background == 'light'
set background=dark
" hi clear
execute("colorscheme " . g:dark_theme)
let g:dark_or_light_theme = 'dark'
endif
let g:my_config.dark.theme = colors_name
let g:my_config.background = 'dark'
endif
endfunction
function! SetLightTheme()
function! SetLightTheme(...)
let colors_name = a:0 > 0 ? a:1 : g:my_config.light.theme
if HasColorscheme(colors_name)
execute("colorscheme " . colors_name)
if &background == 'dark'
set background=light
" hi clear
execute("colorscheme " . g:light_theme)
execute("colorscheme " . g:light_theme)
let g:dark_or_light_theme = 'light'
endif
let g:my_config.light.theme = colors_name
let g:my_config.background = 'light'
endif
endfunction
" Change bottom airline/lualine theme
function! SetStatusLineTheme(theme)
if g:vim_type == 'nvim' && g:vim_version >= 0.5
function! SetStatusLineTheme(...)
if has('nvim-0.5')
" lualine will change theme automatically
else
if HasPlug('vim-airline') && HasPlug('vim-airline-themes')
if HasPlug('vim-airline') && HasPlug('vim-airline-themes') && exists(':AirlineTheme')
let theme = a:0 > 0 ? a:1 : g:my_config[&background].airline_theme
try
execute('AirlineTheme ' . a:theme)
catch
let theme = g:default_config[&background].airline_theme
execute('AirlineTheme ' . theme)
endtry
endif
endif
endfunction
function! EnableTransparent()
let colorscheme_name = ColourSchemeName()
if g:dark_or_light_theme == 'dark'
let dark_cb_name = 'CB_dark_tb_enable_' . colorscheme_name
if exists('*' . dark_cb_name)
execute('call ' . dark_cb_name . '()')
elseif g:dark_transparent_enable_cb != ''
execute('call ' . g:dark_transparent_enable_cb . '()')
let bg = &background
let cb_name = 'CB_' .bg. '_tb_enable_'.colorscheme_name
if exists('*' . cb_name)
execute('call ' . cb_name . '()')
elseif exists('g:'.bg.'_transparent_enable_cb') && g:dark_transparent_enable_cb != ''
let cb_name = get(g:, bg.'_transparent_enable_cb', '')
if cb_name != ''
execute('call '.cb_name.'()')
endif
else
return
endif
let g:transparent_dark_theme = v:true
call CreateSignalFile('.transparent_dark_theme.signal')
else
let light_cb_name = 'CB_light_tb_enable_' . colorscheme_name
if exists('*' . light_cb_name)
execute('call ' . light_cb_name . '()')
elseif g:light_transparent_enable_cb != ''
execute('call ' . g:light_transparent_enable_cb . '()')
else
return
endif
let g:transparent_light_theme = v:true
call CreateSignalFile('.transparent_light_theme.signal')
endif
let g:my_config[&background].transparent = v:true
endfunction
function! DisableTransparent()
let colorscheme_name = ColourSchemeName()
if g:dark_or_light_theme == 'dark'
let dark_cb_name = 'CB_dark_tb_disable_' . colorscheme_name
if exists('*' . dark_cb_name)
set background=dark
execute('call ' . dark_cb_name . '()')
elseif g:dark_transparent_disable_cb != ''
execute('call ' . g:dark_transparent_disable_cb . '()')
let bg = &background
let cb_name = 'CB_' . bg . '_tb_disable_'.colorscheme_name
if exists('*' . cb_name)
execute('call ' . cb_name . '()')
elseif exists('g:'.bg.'_transparent_disable_cb')
let cb_name = get(g:, bg.'_transparent_disable_cb', '')
if cb_name != ''
execute('call '.cb_name.'()')
endif
else
return
endif
let g:transparent_dark_theme = v:false
call DeleteSignalFile('.transparent_dark_theme.signal')
else
let light_cb_name = 'CB_light_tb_disable_' . colorscheme_name
if exists('*' . light_cb_name)
set background=light
execute('call ' . light_cb_name . '()')
elseif g:light_transparent_disable_cb != ''
execute('call ' . g:light_transparent_disable_cb . '()')
else
return
endif
let g:transparent_light_theme = v:false
call DeleteSignalFile('.transparent_light_theme.signal')
endif
" if g:vim_type == 'nvim' && g:vim_version > 0.5
" :TransparentDisable
" endif
let g:my_config[&background].transparent = v:false
endfunction
" ToggleTransparent background
function! ToggleTransparent()
if g:transparent_dark_theme && g:dark_or_light_theme == 'dark'
if g:my_config[&background].transparent
call DisableTransparent()
elseif g:transparent_light_theme && g:dark_or_light_theme == 'light'
call DisableTransparent()
elseif ! g:transparent_light_theme && g:dark_or_light_theme == 'light'
call EnableTransparent()
elseif ! g:transparent_dark_theme && g:dark_or_light_theme == 'dark'
else
call EnableTransparent()
endif
endfunction
@@ -907,23 +907,28 @@ endfunction
" Allow to trigger background
function! ToggleBG()
" Inversion
if g:dark_or_light_theme == "dark"
if &background == "dark"
call SetLightTheme()
call SetStatusLineTheme(g:airline_light_theme)
call CreateSignalFile('.light_theme.signal')
else
call SetDarkTheme()
call SetStatusLineTheme(g:airline_dark_theme)
call DeleteSignalFile('.light_theme.signal')
endif
call SetStatusLineTheme(g:my_config[&background].airline_theme)
if (g:transparent_dark_theme && g:dark_or_light_theme == 'dark') || (g:transparent_light_theme && g:dark_or_light_theme == 'light')
if g:my_config[&background].transparent
call EnableTransparent()
else
call DisableTransparent()
endif
endfunction
" persistent config over colorscheme change
function! Theme_persistent(...)
let color_name = a:0 > 0 ? a:1 : ColourSchemeName()
let g:my_config.background = &background
let g:my_config[&background].theme = color_name
endfunction
"""""""""""""""""""""""""""""""""""""""
""""""""""""" THEME_INIT """"""""""""""
"""""""""""""""""""""""""""""""""""""""
@@ -931,84 +936,80 @@ endfunction
" transparent backgroud for supported terminal emulator
" check if transparent_dark_theme.signl or transparent_light_theme.signl
" exist and set respect variable
let g:transparent_dark_theme = v:false
let g:transparent_light_theme = v:false
function! Theme_initilize()
if SignalFileExists('.transparent_dark_theme.signal')
let g:transparent_dark_theme = v:true
endif
if SignalFileExists('.transparent_light_theme.signal')
let g:transparent_light_theme = v:true
if has('termguicolors')
set termguicolors
endif
" dark or light
if filereadable(g:vim_dir . '.light_theme.signal')
let g:dark_or_light_theme = 'light'
else
let g:dark_or_light_theme = 'dark'
endif
if g:dark_or_light_theme == 'dark'
let g:airline_theme=g:airline_dark_theme
if g:my_config.background == 'dark'
if HasColorscheme(g:my_config.dark.theme)
call SetDarkTheme()
else
let g:airline_theme=g:airline_light_theme
call SetLightTheme()
call SetDarkTheme(g:my_config.dark.default)
endif
if (g:transparent_dark_theme && g:dark_or_light_theme == 'dark')
\ || (g:transparent_light_theme && g:dark_or_light_theme == 'light')
call SetStatusLineTheme(g:my_config.dark.airline_theme)
else
if HasColorscheme(g:my_config.dark.theme)
call SetLightTheme()
else
call SetLightTheme(g:my_config.light.default)
endif
call SetStatusLineTheme(g:my_config.light.airline_theme)
endif
if g:my_config[g:my_config.background].transparent
call EnableTransparent()
else
call DisableTransparent()
endif
endfunction
au! VimEnter * call Theme_initilize()
augroup ThemeAuGroup
autocmd!
autocmd VimEnter * call Theme_initilize()
augroup END
"""""""""""""""""""""""""""""""""""""""
""""""""""" THEME_OPTIONS """""""""""""
"""""""""""""""""""""""""""""""""""""""
" Default
let g:dark_theme = 'default'
let g:light_theme = 'default'
let g:default_config = {
\ 'background': 'dark',
\ 'dark': {
\ 'theme': 'default',
\ 'default': 'default',
\ 'transparent': v:false,
\ 'airline_theme': 'angr',
\ },
\ 'light': {
\ 'theme': 'default',
\ 'default': 'default',
\ 'transparent': v:false,
\ 'airline_theme': 'silver',
\ },
\ }
" for airline
let g:airline_dark_theme = "angr"
let g:airline_light_theme = "silver"
let g:my_config = {}
" vim theme
if g:vim_type == 'vim'
set t_Co=256
if has('termguicolors')
set termguicolors
endif
if HasPlug("papercolor-theme")
" improve coc color in this theme
let g:light_theme = 'PaperColor'
endif
let g:colo2airline = {
\ }
" permenent default
if HasPlug("everforest")
let g:light_theme = 'everforest'
let g:dark_theme = 'everforest'
let g:airline_dark_theme = "everforest"
let g:airline_light_theme = "everforest"
endif
endif
if g:vim_type == 'nvim'
if HasPlug("nightfox.nvim")
let g:light_theme = 'dawnfox'
let g:dark_theme = 'nightfox'
end
if HasPlug("github-nvim-theme")
let g:dark_theme = 'github_dark'
let g:airline_dark_theme = "hybrid"
end
let g:default_config = Merge(g:default_config, {
\ 'dark': {
\ 'airline_theme': 'everforest',
\ 'default': 'everforest',
\ },
\ 'light': {
\ 'airline_theme': 'everforest',
\ 'default': 'everforest',
\ },
\ })
endif
let g:my_config = Merge(g:default_config, LoadConfig())
" }
" KEY_MAPS
@@ -1031,7 +1032,8 @@ endfunction
" leader num change tab
" only for vim or nvim without lualine
if g:vim_type == 'vim' || (g:vim_type == 'nvim' && g:vim_version < 0.5)
if (g:vim_type == 'vim' || !has('nvim-0.5')) && HasPlug('vim-bufferline')
for i in range(1, 9)
execute "nnoremap <silent> <nowait> <leader>" . i .
\ " :call bufferline#jump(" . i . ")<CR>"
@@ -1052,9 +1054,3 @@ if g:vim_type == 'nvim' && filereadable(g:mydotfiles_directory . '.vimrc.lua')
execute('source ' . g:mydotfiles_directory . '/.vimrc.lua')
endif
" OTHER_CONFIGS
if filereadable(g:mydotfiles_directory . "/config/theme.vim")
" exec "source " . g:mydotfiles_directory . "/config/theme.vim"
endif
.vimrc.lua
+36 -23
View File
@@ -6,6 +6,7 @@
-- jump animation. (Performence will be effected)
local animation_enable = vim.g.animation_enable
local high_performence = vim.g.high_performence
local debug_mode = vim.g.debug_mode
-- false basicly enable plugins like noice, nvim-notify etc.
local classic_vim_ui = vim.g.classic_vim_ui
@@ -27,7 +28,6 @@ local _wrap = function(func, ...)
func(unpack(args))
end
end
-- use to print object
function _G.put(...)
local objects = {}
@@ -190,15 +190,27 @@ local function which_key_config()
wk.setup()
end
vim.g.hhx = ''
local function telescope_config()
if not HasPlug('telescope.nvim') then
return
end
local actions = require("telescope.actions")
local action_state = require "telescope.actions.state"
if HasPlug('telescope-fzf-native.nvim') then
require('telescope').setup {
pickers = {
colorscheme = {
enable_preview = true
enable_preview = true,
mappings = {
i = {
["<CR>"] = function(bufnr)
local selection = action_state.get_selected_entry()
actions.select_default()
vim.fn.Theme_persistent(selection.value)
end,
},
},
}
},
extensions = {
@@ -224,7 +236,8 @@ local function telescope_config()
vim.api.nvim_create_autocmd("User", {
pattern = "TelescopePreviewerLoaded",
command = "setlocal wrap number" })
command = "setlocal wrap number"
})
end
local function github_theme_config()
@@ -248,7 +261,6 @@ local function animate_config()
end
if HasPlug('mini.animate') then
local animate = require('mini.animate')
animate.setup({
cursor = {
@@ -336,13 +348,12 @@ local function transparent_config()
return
end
require("transparent").setup({
enable = true, -- boolean: enable transparent
extra_groups = { -- table/string: additional groups that should be cleared
-- In particular, when you set it to 'all', that means all available groups
"NvimTreeNormal",
"VertSplit",
},
exclude = {}, -- table: groups you don't want to clear
exclude_groups = {}, -- table: groups you don't want to clear
})
end
@@ -373,21 +384,32 @@ local function lualine_config()
local speed = 1600
local loadidx = (vim.loop.now() % speed)
local msg = "LSP(" .. id .. ")"
local msg = "lsp:" .. id
if state == "starting" then
return msg .. " %#CocstatusLoading#" .. loading[math.floor(loadidx / (step * (speed / 100))) + 1]
end
return msg .. " %#CocstatusSucceed#✔"
end
local function debugstats()
local t = vim.fn.Debugstats()
return "ft:" .. t['filetype'] .. " bt:" .. t['buftype'] .. " wid:" .. t['winid']
end
local _section_x = {}
local _section_y = { 'encoding' }
if HasPlug('coc.nvim') then table.insert(_section_x, cocstatus) end
if debug_mode then _section_y = { debugstats } end
local disabled_filetypes_data = {}
if vim_version_minor < 7 then
-- globalstatus only work for nvim >= 0.7
disabled_filetypes_data = { -- Filetypes to disable lualine for.
disabled_filetypes_data = {
-- Filetypes to disable lualine for.
statusline = {}, -- only ignores the ft for statusline.
winbar = {}, -- only ignores the ft for winbar.
'NvimTree',
'vista'
'vista',
}
end
@@ -395,12 +417,10 @@ local function lualine_config()
options = {
icons_enabled = show_icon,
theme = 'auto', -- lualine theme
-- theme = 'ayu', -- lualine theme
-- component_separators = { left = '', right = ''},
-- section_separators = { left = '', right = ''},
component_separators = { left = '', right = '' },
section_separators = { left = '', right = '' },
always_divide_middle = false,
globalstatus = true,
disabled_filetypes = disabled_filetypes_data,
@@ -420,18 +440,13 @@ local function lualine_config()
fzf = 'FZF',
alpha = 'Alpha',
NvimTree = '',
vista = ''
},
symbols = {
modified = ' ●', -- Text to show when the buffer is modified
alternate_file = '', -- Text to show to identify the alternate file
directory = '', -- Text to show when the buffer is a directory
vista = '',
},
}
},
-- lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_x = { cocstatus },
lualine_y = {'encoding'},
lualine_x = _section_x,
lualine_y = _section_y,
lualine_z = { 'location' }
},
}
@@ -448,7 +463,6 @@ local function lualine_config()
vim.api.nvim_set_keymap('n', '<Space>' .. i, ':LualineBuffersJump ' .. i .. '<CR>',
{ noremap = true, silent = true, nowait = true })
end
end
local function nvim_treesitter_config()
@@ -456,10 +470,9 @@ local function nvim_treesitter_config()
return
end
require('nvim-treesitter.configs').setup {
-- ensure_installed = { "c", "bash", "lua" },
ensure_installed = { "c", "bash", "lua", "python", "vim" },
sync_install = false,
auto_install = true,
-- ignore_install = { "javascript" },
highlight = {
enable = true,
additional_vim_regex_highlighting = false,
@@ -531,6 +544,7 @@ if vim_version_minor >= 5 then
which_key_config()
animate_config()
nvim_scrollbar_config()
lualine_config()
end
if vim_version_minor >= 7 then
nvim_treesitter_config()
@@ -543,7 +557,6 @@ if vim_version_minor >= 8 then
end
local function late_loading()
lualine_config()
end
-- late loading
utils.vim
+169
View File
@@ -0,0 +1,169 @@
" This file stores helper functions
function! Notify(msg)
echo msg
endfunction
" This function is used to save a variable to a file
function! SaveVariable(var, file)
let serialized = string(a:var)
call writefile([serialized], a:file)
endfun
" This function is used to retrieve a variable from a file
" only first line is count
function! ReadVariable(file)
if !filereadable(a:file)
return v:null
endif
let serialized = readfile(a:file)
if(len(serialized) == 0)
return v:null
endif
execute "let result = " . serialized[0]
return result
endfun
" Merge two dictionaries, also recursively merging nested keys.
" Use extend() if you don't need to merge nested keys.
fun! Merge(defaults, override)
let l:new = copy(a:defaults)
for [l:k, l:v] in items(a:override)
let l:new[l:k] = (type(l:v) is v:t_dict && type(get(l:new, l:k)) is v:t_dict)
\ ? Merge(l:new[l:k], l:v)
\ : l:v
endfor
return l:new
endfun
function! Sh(pattern)
execute("filter /" . a:pattern . "/ highlight")
endfunc
" get current colorscheme name
function! ColourSchemeName()
try
return g:colors_name
catch /^Vim:E121/
return "default"
catch /.*/
return "default"
endtry
endfunction
" debug function print out highlight group of cursor position
function! ShowHighLightGroup()
if !exists("*synstack")
return
endif
echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
:echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
\ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
\ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"
endfunc
" get highlight group information and return as dictionary
function! GetHighlight(group)
let output = execute('hi ' . a:group)
let list = split(output, '\s\+')
let dict = {}
for item in list
if match(item, '=') > 0
let splited = split(item, '=')
let dict[splited[0]] = splited[1]
endif
endfor
return dict
endfunction
function! InTransparentMode()
let dict = GetHighlight('Normal')
let isGui = &termguicolors
if isGui
if !has_key(dict, 'guibg')
return 1
endif
elseif !isGui
if !has_key(dict, 'ctermfg')
return 1
endif
endif
return 0
endfunction
function! HasColorscheme(name)
let scheme = a:name
let colors = globpath(&runtimepath, printf('colors/%s.vim', scheme), 1, 1)
if len(colors) > 0 | return 1 | endif
let colors += globpath(&packpath, printf('pack/*/start/*/colors/%s.vim', scheme), 1, 1)
if len(colors) > 0 | return 1 | endif
let colors += globpath(&packpath, printf('pack/*/opt/*/colors/%s.vim', scheme), 1, 1)
if len(colors) > 0 | return 1 | endif
if has('nvim')
let colors = globpath(&runtimepath, printf('colors/%s.lua', scheme), 1, 1)
if len(colors) > 0 | return 1 | endif
let colors += globpath(&packpath, printf('pack/*/start/*/colors/%s.lua', scheme), 1, 1)
if len(colors) > 0 | return 1 | endif
let colors += globpath(&packpath, printf('pack/*/opt/*/colors/%s.lua', scheme), 1, 1)
if len(colors) > 0 | return 1 | endif
endif
return 0
endfunction
" delete signal file if exist
function! DeleteSignalFile(name)
if filereadable(g:vim_dir . a:name)
call delete(g:vim_dir . a:name)
endif
endfunction
" Create signal file if not exist
function! CreateSignalFile(name)
call system("touch " . g:vim_dir . a:name)
endfunction
function! SignalFileExists(filename)
if filereadable(g:vim_dir . a:filename)
return v:true
endif
return v:false
endfunction
" Debug related
if g:debug_mode
let g:debug_logs = []
function! Debugstats()
let d = {}
let d['filetype'] = &ft
let d['buftype'] = &buftype
let d['winid'] = win_getid()
return d
endfunction
endif
" Swap values under cursor according to g:swap_dict
" {
function SwapWord()
let word = expand("<cword>")
let l1 = g:swap_dict[0]
let l2 = g:swap_dict[1]
let inx = index(l1, word)
if inx != -1
let newword = l2[inx]
else
let inx = index(l2, word)
if inx != -1
let newword = l1[inx]
endif
endif
if inx != -1
execute "normal ciw" . newword . "\<Esc>"
endif
endfunction
" }