From 7aae99d19f6f9b1f813deb743a7bda1e1bea8968 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Sat, 11 Mar 2023 10:15:33 +0900 Subject: [PATCH] update: nvim config: replace `\t` with space --- dotfiles/neovim/init.lua | 92 ++++++++++++++++----------------- dotfiles/neovim/lua/plugins.lua | 40 +++++++------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index 29f6a90..6ed68de 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -28,16 +28,16 @@ vim.o.smartcase = true -- vim script func returns 1/0, while lua evals false only if gets false or nil -- so be sure to compare with 1/0 if vim.fn.has('win32') == 1 then - if vim.fn.executable('pwsh') == 1 then - vim.opt.shell = 'pwsh' - else - vim.opt.shell = 'powershell' - end - vim.opt.shellcmdflag = '-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;' - vim.opt.shellredir = '-RedirectStandardOutput %s -NoNewWindow -Wait' - vim.opt.shellpipe = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode' - vim.opt.shellquote = '' - vim.opt.shellxquote = '' + if vim.fn.executable('pwsh') == 1 then + vim.opt.shell = 'pwsh' + else + vim.opt.shell = 'powershell' + end + vim.opt.shellcmdflag = '-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;' + vim.opt.shellredir = '-RedirectStandardOutput %s -NoNewWindow -Wait' + vim.opt.shellpipe = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode' + vim.opt.shellquote = '' + vim.opt.shellxquote = '' end @@ -52,18 +52,18 @@ vim.cmd [[autocmd BufWritePost plugins.lua PackerCompile]] -- 1. LSP Sever management --require('mason').setup() --require('mason-lspconfig').setup_handlers({ function(server) --- local opt = { --- -- -- Function executed when the LSP server startup --- -- on_attach = function(client, bufnr) --- -- local opts = { noremap=true, silent=true } --- -- vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', 'lua vim.lsp.buf.hover()', opts) --- -- vim.cmd 'autocmd BufWritePre * lua vim.lsp.buf.formatting_sync(nil, 1000)' --- -- end, --- capabilities = require('cmp_nvim_lsp').update_capabilities( --- vim.lsp.protocol.make_client_capabilities() --- ) --- } --- require('lspconfig')[server].setup(opt) +-- local opt = { +-- -- -- Function executed when the LSP server startup +-- -- on_attach = function(client, bufnr) +-- -- local opts = { noremap=true, silent=true } +-- -- vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', 'lua vim.lsp.buf.hover()', opts) +-- -- vim.cmd 'autocmd BufWritePre * lua vim.lsp.buf.formatting_sync(nil, 1000)' +-- -- end, +-- capabilities = require('cmp_nvim_lsp').update_capabilities( +-- vim.lsp.protocol.make_client_capabilities() +-- ) +-- } +-- require('lspconfig')[server].setup(opt) --end }) -- ---- 2. build-in LSP function @@ -82,7 +82,7 @@ vim.cmd [[autocmd BufWritePost plugins.lua PackerCompile]] --vim.keymap.set('n', 'g[', 'lua vim.diagnostic.goto_prev()') ---- LSP handlers --vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( --- vim.lsp.diagnostic.on_publish_diagnostics, { virtual_text = false } +-- vim.lsp.diagnostic.on_publish_diagnostics, { virtual_text = false } --) ---- Reference highlight --vim.cmd [[ @@ -100,26 +100,26 @@ vim.cmd [[autocmd BufWritePost plugins.lua PackerCompile]] ---- 3. completion (hrsh7th/nvim-cmp) --local cmp = require("cmp") --cmp.setup({ --- snippet = { --- expand = function(args) --- vim.fn["vsnip#anonymous"](args.body) --- end, --- }, --- sources = { --- { name = "nvim_lsp" }, --- -- { name = "buffer" }, --- -- { name = "path" }, --- }, --- mapping = cmp.mapping.preset.insert({ --- [""] = cmp.mapping.select_prev_item(), --- [""] = cmp.mapping.select_next_item(), --- [''] = cmp.mapping.complete(), --- [''] = cmp.mapping.abort(), --- [""] = cmp.mapping.confirm { select = true }, --- }), --- experimental = { --- ghost_text = true, --- }, +-- snippet = { +-- expand = function(args) +-- vim.fn["vsnip#anonymous"](args.body) +-- end, +-- }, +-- sources = { +-- { name = "nvim_lsp" }, +-- -- { name = "buffer" }, +-- -- { name = "path" }, +-- }, +-- mapping = cmp.mapping.preset.insert({ +-- [""] = cmp.mapping.select_prev_item(), +-- [""] = cmp.mapping.select_next_item(), +-- [''] = cmp.mapping.complete(), +-- [''] = cmp.mapping.abort(), +-- [""] = cmp.mapping.confirm { select = true }, +-- }), +-- experimental = { +-- ghost_text = true, +-- }, --}) ---- cmp.setup.cmdline('/', { ---- mapping = cmp.mapping.preset.cmdline(), @@ -143,8 +143,8 @@ vim.cmd [[autocmd BufWritePost plugins.lua PackerCompile]] ----------------------------------------------------------- -- Ctrl + P to invoke fzf file search vim.api.nvim_set_keymap('n', '', - "lua require('fzf-lua').files()", - { noremap = true, silent = true }) + "lua require('fzf-lua').files()", + { noremap = true, silent = true }) ----------------------------------------------------------- @@ -152,6 +152,6 @@ vim.api.nvim_set_keymap('n', '', require('lualine_setup') lualine = require('lualine') lualine.setup({ - options = { theme = 'iceberg_dark' } + options = { theme = 'iceberg_dark' } }) lualine.setup() diff --git a/dotfiles/neovim/lua/plugins.lua b/dotfiles/neovim/lua/plugins.lua index 4ec117b..4f5a910 100644 --- a/dotfiles/neovim/lua/plugins.lua +++ b/dotfiles/neovim/lua/plugins.lua @@ -1,29 +1,29 @@ vim.cmd [[packadd packer.nvim]] return require('packer').startup(function(use) - use 'wbthomason/packer.nvim' + use 'wbthomason/packer.nvim' - -- fzf - use { 'ibhagwan/fzf-lua', - -- optional icon - --requires = { 'kyazdan142/nvim-web/devicons' } -- not found - } + -- fzf + use { 'ibhagwan/fzf-lua', + -- optional icon + --requires = { 'kyazdan142/nvim-web/devicons' } -- not found + } - -- lualine(statusline) - use { - 'nvim-lualine/lualine.nvim', - requires = { 'kyazdani42/nvim-web-devicons', opt = true } - } + -- lualine(statusline) + use { + 'nvim-lualine/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons', opt = true } + } - -- LSP - use 'neovim/nvim-lspconfig' - use "williamboman/mason.nvim" - use "williamboman/mason-lspconfig.nvim" - use "hrsh7th/nvim-cmp" - use "hrsh7th/cmp-nvim-lsp" - use "hrsh7th/vim-vsnip" + -- LSP + use 'neovim/nvim-lspconfig' + use "williamboman/mason.nvim" + use "williamboman/mason-lspconfig.nvim" + use "hrsh7th/nvim-cmp" + use "hrsh7th/cmp-nvim-lsp" + use "hrsh7th/vim-vsnip" - -- Julia - use "JuliaEditorSupport/julia-vim" + -- Julia + use "JuliaEditorSupport/julia-vim" end)