From 0cd329e8b9bb1a5c48386f30c7a77405789b6d04 Mon Sep 17 00:00:00 2001 From: nnduc Date: Tue, 17 Feb 2026 01:50:51 +0700 Subject: [PATCH] lua nvim --- nvim/.vimrc | 143 -------------------------- nvim/coc-settings.json | 2 - nvim/init.lua | 214 ++++++++++++++++++++++++++++++++++++++ nvim/init.vim | 132 ------------------------ nvim/init.vim(server) | 127 ----------------------- nvim/latexmk.vim | 227 ----------------------------------------- nvim/site/vi.utf-8.spl | Bin 20334 -> 0 bytes 7 files changed, 214 insertions(+), 631 deletions(-) delete mode 100644 nvim/.vimrc delete mode 100644 nvim/coc-settings.json create mode 100644 nvim/init.lua delete mode 100644 nvim/init.vim delete mode 100644 nvim/init.vim(server) delete mode 100644 nvim/latexmk.vim delete mode 100644 nvim/site/vi.utf-8.spl diff --git a/nvim/.vimrc b/nvim/.vimrc deleted file mode 100644 index 62860f8..0000000 --- a/nvim/.vimrc +++ /dev/null @@ -1,143 +0,0 @@ -syntax on -set number -set cursorline -set expandtab tabstop=4 shiftwidth=4 softtabstop=4 -set autoindent -set spelllang=vi,en - - -" Fold -set foldmethod=syntax -set foldlevel=1 -set foldnestmax=1 -set encoding=utf8 - -" Search -set hlsearch -nnoremap i :nohlsi - -" Plugin -call plug#begin() -Plug 'neoclide/coc.nvim', {'branch': 'release'} -Plug 'dense-analysis/ale' -Plug 'preservim/nerdtree' -Plug 'preservim/nerdcommenter' -Plug 'lervag/vimtex' -Plug 'JuliaEditorSupport/julia-vim' -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } -Plug 'junegunn/fzf.vim' -Plug 'honza/vim-snippets' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' -Plug 'kevinhwang91/nvim-bqf' -Plug 'morhetz/gruvbox' -Plug 'tpope/vim-fugitive' -Plug 'ynkdir/vim-diff' -Plug '4ree/vim-ime' -call plug#end() - -"Color scheme -"colorscheme iceberg -"set background=light -colorscheme gruvbox -let g:gruvbox_contrast_light = 'hard' -hi clear SpellBad -hi SpellBad cterm=underline ctermfg=red - - -"Open NERDTree -:nnoremap g:NERDTree.IsOpen() ? "\:NERDTreeClose" : bufexists(expand('%')) ? "\:NERDTreeFind" : "\:NERDTree" - -"Coc.nvim -inoremap - \ coc#pum#visible() ? coc#_select_confirm() : - \ coc#expandableOrJumpable() ? "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : - \ CheckBackSpace() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? coc#_select_confirm() - \: "\u\\=coc#on_enter()\" - -function! CheckBackSpace() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -let g:coc_snippet_next = '' -inoremap coc#pum#visible() ? coc#pum#confirm() - \: "\u\\=coc#on_enter()\" - -" Comments -let mapleader = "," - -" remap save -nnoremap :w - -" moving between windows -nnoremap h -nnoremap j -nnoremap k -nnoremap l -nnoremap h -nnoremap j -nnoremap k -nnoremap l -nnoremap to :tabonly -nnoremap o :only -nnoremap :tabn -nnoremap :tabp - -"set clipboard+=unnamedplus -" " Copy to clipboard -vnoremap y "+y -nnoremap Y "+yg_ -nnoremap y "+y -nnoremap yy "+yy - -" " Paste from clipboard -nnoremap p "+p -nnoremap P "+P - - -" FZF key mapping -nnoremap b :Buffers -nnoremap r :Rg -nnoremap f :Files -nnoremap g :GFiles -nnoremap w :Rg - -filetype plugin on -set splitright -set splitbelow - -let g:vimtex_view_method= 'zathura' - -"Language tool -map :ALEToggle - - -"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux. -"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support -"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.) -if (empty($TMUX)) - if (has("nvim")) - "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 > - let $NVIM_TUI_ENABLE_TRUE_COLOR=1 - endif - "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 > - "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd > - " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 > - if (has("termguicolors")) - set termguicolors - endif -endif - -if &term =~ 'xterm' || &term == 'win32' - " Use DECSCUSR escape sequences - let &t_SI = "\e[5 q" " blink bar - let &t_SR = "\e[3 q" " blink underline - let &t_EI = "\e[1 q" " blink block - let &t_ti ..= "\e[1 q" " blink block - let &t_te ..= "\e[0 q" " default (depends on terminal, normally blink - " block) -endif - diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json deleted file mode 100644 index 3ba2825..0000000 --- a/nvim/coc-settings.json +++ /dev/null @@ -1,2 +0,0 @@ -{"coc.preferences.diagnostic.displayByAle":1 -} diff --git a/nvim/init.lua b/nvim/init.lua new file mode 100644 index 0000000..c1c3463 --- /dev/null +++ b/nvim/init.lua @@ -0,0 +1,214 @@ +-- Leader key (must be set before lazy.nvim loads) +vim.g.mapleader = "," + +-------------------- Options -------------------- +vim.opt.number = true +vim.opt.cursorline = true +vim.opt.expandtab = true +vim.opt.tabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.softtabstop = 4 +vim.opt.autoindent = true +vim.opt.spelllang = "vi,en" +vim.opt.foldmethod = "syntax" +vim.opt.foldlevel = 1 +vim.opt.foldnestmax = 1 +vim.opt.hlsearch = true +vim.opt.splitright = true +vim.opt.splitbelow = true +vim.opt.termguicolors = true + +-------------------- Keymaps -------------------- +-- Clear hlsearch then enter insert mode +vim.keymap.set("n", "i", ":nohlsi", { silent = true }) + +-- Save with space +vim.keymap.set("n", "", ":w", { silent = true }) + +-- Window navigation +vim.keymap.set("n", "", "h") +vim.keymap.set("n", "", "j") +vim.keymap.set("n", "", "k") +vim.keymap.set("n", "", "l") +vim.keymap.set("n", "", "h") +vim.keymap.set("n", "", "j") +vim.keymap.set("n", "", "k") +vim.keymap.set("n", "", "l") + +-- Tab management +vim.keymap.set("n", "to", ":tabonly", { silent = true }) +vim.keymap.set("n", "o", ":only", { silent = true }) +vim.keymap.set("n", "", ":tabn", { silent = true }) +vim.keymap.set("n", "", ":tabp", { silent = true }) + +-- Clipboard operations +vim.keymap.set("v", "y", '"+y') +vim.keymap.set("n", "Y", '"+yg_') +vim.keymap.set("n", "y", '"+y') +vim.keymap.set("n", "yy", '"+yy') +vim.keymap.set("n", "p", '"+p') +vim.keymap.set("n", "P", '"+P') + +-------------------- Bootstrap lazy.nvim -------------------- +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.uv.fs_stat(lazypath) then + vim.fn.system({ + "git", "clone", "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +-------------------- Plugins -------------------- +require("lazy").setup({ + + -- Colorscheme + { + "ellisonleao/gruvbox.nvim", + priority = 1000, + config = function() + require("gruvbox").setup({ + contrast = "hard", + }) + vim.cmd.colorscheme("gruvbox") + end, + }, + + -- Icons (dependency for nvim-tree and lualine) + { "nvim-tree/nvim-web-devicons", lazy = true }, + + -- File tree + { + "nvim-tree/nvim-tree.lua", + dependencies = { "nvim-tree/nvim-web-devicons" }, + keys = { + { "", "NvimTreeToggle", desc = "Toggle file tree" }, + }, + config = function() + require("nvim-tree").setup() + end, + }, + + -- Comments + { + "numToStr/Comment.nvim", + event = "VeryLazy", + config = function() + require("Comment").setup() + end, + }, + + -- Fuzzy finder (telescope replaces fzf) + { + "nvim-telescope/telescope.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + }, + keys = { + { "b", "Telescope buffers", desc = "Buffers" }, + { "r", "Telescope live_grep", desc = "Live grep" }, + { "f", "Telescope find_files", desc = "Find files" }, + { "g", "Telescope git_files", desc = "Git files" }, + { "w", "Telescope grep_string", desc = "Grep word under cursor" }, + }, + config = function() + require("telescope").setup() + require("telescope").load_extension("fzf") + end, + }, + + -- Statusline + { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require("lualine").setup({ + options = { theme = "gruvbox" }, + }) + end, + }, + + -- Autopairs + { + "windwp/nvim-autopairs", + event = "InsertEnter", + opts = {}, + }, + + -- Surround + { "4ree/viml-surround", event = "VeryLazy" }, + + -- LSP + { + "neovim/nvim-lspconfig", + config = function() + vim.lsp.config("clangd", {}) + vim.lsp.config("pyright", {}) + vim.lsp.config("rust_analyzer", {}) + vim.lsp.config("julials", {}) + vim.lsp.enable({ "clangd", "pyright", "rust_analyzer", "julials" }) + + vim.api.nvim_create_autocmd("LspAttach", { + callback = function(args) + local opts = { buffer = args.buf } + vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) + vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) + vim.keymap.set("n", "K", vim.lsp.buf.hover, opts) + vim.keymap.set("n", "rn", vim.lsp.buf.rename, opts) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, opts) + end, + }) + end, + }, + + -- Completion (coq_nvim) + { + "ms-jpq/coq_nvim", + branch = "coq", + dependencies = { + { "ms-jpq/coq.artifacts", branch = "artifacts" }, + { "ms-jpq/coq.thirdparty", branch = "3p" }, + }, + init = function() + vim.g.coq_settings = { auto_start = "shut-up" } + end, + }, + + -- Quickfix enhancements + { "kevinhwang91/nvim-bqf", ft = "qf" }, + + -- Git + { "tpope/vim-fugitive" }, + + -- IME support + { + "4ree/vim-ime", + event = "VeryLazy", + opts = {}, + }, + + -- LaTeX + { + "lervag/vimtex", + config = function() + vim.g.vimtex_view_method = "zathura" + vim.g.vimtex_compiler_latexmk = { + options = { + "-verbose", + "-file-line-error", + "-synctex=1", + "-interaction=nonstopmode", + "-shell-escape", + "-output-directory=./output", + "-aux-directory=./", + }, + } + end, + }, + + -- Julia + { "JuliaEditorSupport/julia-vim" }, +}) diff --git a/nvim/init.vim b/nvim/init.vim deleted file mode 100644 index d0b0480..0000000 --- a/nvim/init.vim +++ /dev/null @@ -1,132 +0,0 @@ -syntax on -set number -set cursorline -set expandtab tabstop=4 shiftwidth=4 softtabstop=4 -set autoindent -set spelllang=vi,en - - -" Fold -set foldmethod=syntax -set foldlevel=1 -set foldnestmax=1 -set encoding=utf8 - -" Search -set hlsearch -nnoremap i :nohlsi - -" Plugin -call plug#begin() -Plug 'neoclide/coc.nvim', {'branch': 'release'} -Plug 'dense-analysis/ale' -Plug 'preservim/nerdtree' -Plug 'preservim/nerdcommenter' -Plug 'lervag/vimtex' -Plug 'JuliaEditorSupport/julia-vim' -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } -Plug 'junegunn/fzf.vim' -Plug 'honza/vim-snippets' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' -Plug 'kevinhwang91/nvim-bqf' -Plug 'morhetz/gruvbox' -Plug 'tpope/vim-fugitive' -Plug 'ynkdir/vim-diff' -Plug '4ree/vim-ime' -call plug#end() - -"Color scheme -"colorscheme iceberg -"set background=light -colorscheme gruvbox -let g:gruvbox_contrast_light = 'hard' - - - -"Open NERDTree - map :NERDTreeToggle - - -"Coc.nvim -inoremap - \ coc#pum#visible() ? coc#_select_confirm() : - \ coc#expandableOrJumpable() ? "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : - \ CheckBackSpace() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? coc#_select_confirm() - \: "\u\\=coc#on_enter()\" - -function! CheckBackSpace() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -let g:coc_snippet_next = '' -inoremap coc#pum#visible() ? coc#pum#confirm() - \: "\u\\=coc#on_enter()\" - -" Comments -let mapleader = "," - -" remap save -nnoremap :w - -" moving between windows -nnoremap h -nnoremap j -nnoremap k -nnoremap l -nnoremap h -nnoremap j -nnoremap k -nnoremap l -nnoremap to :tabonly -nnoremap o :only -nnoremap :tabn -nnoremap :tabp - -"set clipboard+=unnamedplus -" " Copy to clipboard -vnoremap y "+y -nnoremap Y "+yg_ -nnoremap y "+y -nnoremap yy "+yy - -" " Paste from clipboard -nnoremap p "+p -nnoremap P "+P - - -" FZF key mapping -nnoremap b :Buffers -nnoremap r :Rg -nnoremap f :Files -nnoremap g :GFiles -nnoremap w :Rg - -filetype plugin on -set splitright -set splitbelow - -let g:vimtex_view_method= 'zathura' - -"Language tool -map :ALEToggle - - -"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux. -"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support -"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.) -if (empty($TMUX)) - if (has("nvim")) - "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 > - let $NVIM_TUI_ENABLE_TRUE_COLOR=1 - endif - "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 > - "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd > - " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 > - if (has("termguicolors")) - set termguicolors - endif -endif diff --git a/nvim/init.vim(server) b/nvim/init.vim(server) deleted file mode 100644 index 842dadb..0000000 --- a/nvim/init.vim(server) +++ /dev/null @@ -1,127 +0,0 @@ -syntax on -set number -set cursorline -set expandtab tabstop=4 shiftwidth=4 softtabstop=4 -set autoindent -set spelllang=vi,en - -" Fold -set foldmethod=syntax -set foldlevel=1 -set foldnestmax=1 -set encoding=utf8 - -" Search -set hlsearch -nnoremap i :nohlsi - -" Plugin -call plug#begin() -Plug 'neoclide/coc.nvim', {'branch': 'release'} -Plug 'preservim/nerdtree' -Plug 'preservim/nerdcommenter' -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } -Plug 'junegunn/fzf.vim' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' -Plug 'kevinhwang91/nvim-bqf' -Plug 'morhetz/gruvbox' -Plug 'tpope/vim-fugitive' -Plug 'ynkdir/vim-diff' -call plug#end() - -"Color scheme - -colorscheme gruvbox -let g:gruvbox_contrast_light = 'hard' - -set background=dark - -" Comments -let mapleader = "," - -"Open NERDTree -:nnoremap g:NERDTree.IsOpen() ? "\:NERDTreeClose" : bufexists(expand('%')) ? "\:NERDTreeFind" : "\:NERDTree" - - -"Coc.nvim -inoremap - \ coc#pum#visible() ? coc#_select_confirm() : - \ coc#expandableOrJumpable() ? "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : - \ CheckBackSpace() ? "\" : - \ coc#refresh() - -inoremap coc#pum#visible() ? coc#_select_confirm() : coc#refresh() - -function! CheckBackSpace() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -let g:coc_snippet_next = '' -" remap save -nnoremap :w - -" moving between windows -nnoremap h -nnoremap j -nnoremap k -nnoremap l -nnoremap h -nnoremap j -nnoremap k -nnoremap l -nnoremap to :tabonly -nnoremap o :only -nnoremap :tabn -nnoremap :tabp - -"set clipboard+=unnamedplus -" " Copy to clipboard -vnoremap y "+y -nnoremap Y "+yg_ -nnoremap y "+y -nnoremap yy "+yy - -" " Paste from clipboard -nnoremap p "+p -nnoremap P "+P - - -" FZF key mapping -nnoremap b :Buffers -nnoremap r :Rg -nnoremap f :Files -nnoremap g :GFiles -nnoremap w :Rg - -filetype plugin on -set splitright -set splitbelow - -"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux. -"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support -"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.) -if (empty($TMUX)) - if (has("nvim")) - "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 > - let $NVIM_TUI_ENABLE_TRUE_COLOR=1 - endif - "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 > - "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd > - " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 > - if (has("termguicolors")) - set termguicolors - endif -endif - -if &term =~ 'xterm' || &term == 'win32' - " Use DECSCUSR escape sequences - let &t_SI = "\e[5 q" " blink bar - let &t_SR = "\e[3 q" " blink underline - let &t_EI = "\e[1 q" " blink block - let &t_ti ..= "\e[1 q" " blink block - let &t_te ..= "\e[0 q" " default (depends on terminal, normally blink - " block) -endif - diff --git a/nvim/latexmk.vim b/nvim/latexmk.vim deleted file mode 100644 index d244df6..0000000 --- a/nvim/latexmk.vim +++ /dev/null @@ -1,227 +0,0 @@ -" VimTeX - LaTeX plugin for Vim -" -" Maintainer: Karl Yngve Lervåg -" Email: karl.yngve@gmail.com -" - -function! vimtex#compiler#latexmk#init(options) abort " {{{1 - return s:compiler.new(a:options) -endfunction - -" }}}1 - -function! vimtex#compiler#latexmk#get_rc_opt(root, opt, type, default) abort " {{{1 - " - " Parse option from .latexmkrc. - " - " Arguments: - " root Root of LaTeX project - " opt Name of options - " type 0 if string, 1 if integer, 2 if list - " default Value to return if option not found in latexmkrc file - " - " Output: - " [value, location] - " - " value Option value (integer or string) - " location An integer that indicates where option was found - " -1: not found (default value returned) - " 0: global latexmkrc file - " 1: local latexmkrc file - " - - if a:type == 0 - let l:pattern = '^\s*\$' . a:opt . '\s*=\s*[''"]\(.\+\)[''"]' - elseif a:type == 1 - let l:pattern = '^\s*\$' . a:opt . '\s*=\s*\(\d\+\)' - elseif a:type == 2 - let l:pattern = '^\s*@' . a:opt . '\s*=\s*(\(.*\))' - else - throw 'VimTeX: Argument error' - endif - - " Candidate files - " - each element is a pair [path_to_file, is_local_rc_file]. - let l:files = [ - \ [a:root . '/latexmkrc', 1], - \ [a:root . '/.latexmkrc', 1], - \ [fnamemodify('~/.latexmkrc', ':p'), 0], - \ [fnamemodify( - \ !empty($XDG_CONFIG_HOME) ? $XDG_CONFIG_HOME : '~/.config', ':p') - \ . '/latexmk/latexmkrc', 0] - \] - - let l:result = [a:default, -1] - - for [l:file, l:is_local] in l:files - if filereadable(l:file) - let l:match = matchlist(readfile(l:file), l:pattern) - if len(l:match) > 1 - let l:result = [l:match[1], l:is_local] - break - end - endif - endfor - - " Parse the list - if a:type == 2 && l:result[1] > -1 - let l:array = split(l:result[0], ',') - let l:result[0] = [] - for l:x in l:array - let l:x = substitute(l:x, "^'", '', '') - let l:x = substitute(l:x, "'$", '', '') - let l:result[0] += [l:x] - endfor - endif - - return l:result -endfunction - -" }}}1 - - -let s:compiler = vimtex#compiler#_template#new({ - \ 'name' : 'latexmk', - \ 'callback' : 1, - \ 'continuous': 1, - \ 'executable' : 'latexmk', - \ 'options' : [ - \ '-verbose', - \ '-file-line-error', - \ '-synctex=1', - \ '-interaction=nonstopmode', - \ '-shell-escape', - \ '-output-directory=./output', - \ '-aux-directory=./', - \ ], - \}) - -function! s:compiler.__check_requirements() abort dict " {{{1 - if !executable(self.executable) - call vimtex#log#warning(self.executable . ' is not executable') - throw 'VimTeX: Requirements not met' - endif -endfunction - -" }}}1 -function! s:compiler.__init() abort dict " {{{1 - " Check if .latexmkrc sets the build_dir - if so this should be respected - let l:out_dir = - \ vimtex#compiler#latexmk#get_rc_opt(self.state.root, 'out_dir', 0, '')[0] - if !empty(l:out_dir) - if !empty(self.build_dir) && (self.build_dir !=# l:out_dir) - call vimtex#log#warning( - \ 'Setting out_dir from latexmkrc overrides build_dir!', - \ 'Changed build_dir from: ' . self.build_dir, - \ 'Changed build_dir to: ' . l:out_dir) - endif - let self.build_dir = l:out_dir - endif -endfunction - -" }}}1 -function! s:compiler.__build_cmd() abort dict " {{{1 - let l:cmd = (has('win32') - \ ? 'set max_print_line=2000 & ' - \ : 'max_print_line=2000 ') . self.executable - - let l:cmd .= ' ' . join(self.options) - let l:cmd .= ' ' . self.get_engine() - - if !empty(self.build_dir) - let l:cmd .= ' -outdir=' . fnameescape(self.build_dir) - endif - - if self.continuous - let l:cmd .= ' -pvc -view=none' - - if self.callback - for [l:opt, l:val] in [ - \ ['compiling_cmd', 'vimtex_compiler_callback_compiling'], - \ ['success_cmd', 'vimtex_compiler_callback_success'], - \ ['failure_cmd', 'vimtex_compiler_callback_failure'], - \] - let l:cmd .= s:wrap_option_appendcmd(l:opt, 'echo ' . l:val) - endfor - endif - endif - - return l:cmd . ' ' . vimtex#util#shellescape(self.state.base) -endfunction - -" }}}1 -function! s:compiler.__pprint_append() abort dict " {{{1 - return [ - \ ['callback', self.callback], - \ ['continuous', self.continuous], - \ ['executable', self.executable], - \] -endfunction - -" }}}1 - -function! s:compiler.clean(full) abort dict " {{{1 - let l:cmd = self.executable . ' ' . (a:full ? '-C ' : '-c ') - if !empty(self.build_dir) - let l:cmd .= printf(' -outdir=%s ', fnameescape(self.build_dir)) - endif - let l:cmd .= vimtex#util#shellescape(self.state.base) - - call vimtex#jobs#run(l:cmd, {'cwd': self.state.root}) -endfunction - -" }}}1 -function! s:compiler.get_engine() abort dict " {{{1 - " Parse tex_program from TeX directive - let l:tex_program_directive = self.state.get_tex_program() - let l:tex_program = l:tex_program_directive - - - " Parse tex_program from from pdf_mode option in .latexmkrc - let [l:pdf_mode, l:is_local] = - \ vimtex#compiler#latexmk#get_rc_opt(self.state.root, 'pdf_mode', 1, -1) - - if l:pdf_mode >= 1 && l:pdf_mode <= 5 - let l:tex_program_pdfmode = [ - \ 'pdflatex', - \ 'pdfps', - \ 'pdfdvi', - \ 'lualatex', - \ 'xelatex', - \][l:pdf_mode-1] - - " Use pdf_mode if there is no TeX directive - if l:tex_program_directive ==# '_' - let l:tex_program = l:tex_program_pdfmode - elseif l:is_local && l:tex_program_directive !=# l:tex_program_pdfmode - " Give warning when there may be a confusing conflict - call vimtex#log#warning( - \ 'Value of pdf_mode from latexmkrc is inconsistent with ' . - \ 'TeX program directive!', - \ 'TeX program: ' . l:tex_program_directive, - \ 'pdf_mode: ' . l:tex_program_pdfmode, - \ 'The value of pdf_mode will be ignored.') - endif - endif - - return get(g:vimtex_compiler_latexmk_engines, - \ l:tex_program, - \ g:vimtex_compiler_latexmk_engines._) -endfunction - -" }}}1 - - -function! s:wrap_option_appendcmd(name, value) abort " {{{1 - " Note: On Linux, we use double quoted perl strings; these interpolate - " variables. One should therefore NOT pass values that contain `$`. - let l:win_cmd_sep = has('nvim') ? '^&' : '&' - let l:common = printf('$%s = ($%s ? $%s', a:name, a:name, a:name) - return has('win32') - \ ? printf(' -e "%s . '' %s '' : '''') . ''%s''"', - \ l:common, l:win_cmd_sep, a:value) - \ : printf(' -e ''%s . " ; " : "") . "%s"''', - \ l:common, a:value) -endfunction - -"}}}1 diff --git a/nvim/site/vi.utf-8.spl b/nvim/site/vi.utf-8.spl deleted file mode 100644 index 19d945336d15c3f3a32b583569a8df5a4fcf1417..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20334 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