From e7b2e4c5267eeaf6ff58bf0bf3ad76a56113ea30 Mon Sep 17 00:00:00 2001 From: Lee Tang Date: Thu, 28 Apr 2022 12:01:56 +0800 Subject: [PATCH] updates --- nvim/lua/config/copilot.lua | 0 nvim/lua/plugins.lua | 19 ++++++++++--------- setup.sh | 2 ++ 3 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 nvim/lua/config/copilot.lua diff --git a/nvim/lua/config/copilot.lua b/nvim/lua/config/copilot.lua deleted file mode 100644 index e69de29..0000000 diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 5edf7d9..5a430ab 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -17,7 +17,6 @@ return require('packer').startup(function(use) use('nvim-lua/plenary.nvim') use('folke/tokyonight.nvim') - use('kyazdani42/nvim-web-devicons') use('tpope/vim-fugitive') -- git fugitive use({ 'lewis6991/gitsigns.nvim', @@ -113,10 +112,15 @@ return require('packer').startup(function(use) }) use({ 'github/copilot.vim', - setup = function() end, - config = function() - require('config.copilot') + setup = function() + vim.g.copilot_no_tab_map = 1 + vim.g.copilot_no_maps = 1 + vim.g.copilot_assume_mapped = 1 end, + config = function() + local map = require('utils').map + map('i', '', 'copilot#Accept()', { expr = true }) + end }) use({ 'nvim-treesitter/nvim-treesitter', @@ -127,8 +131,7 @@ return require('packer').startup(function(use) }) use({ 'iamcco/markdown-preview.nvim', - run = 'cd app && yarn install', - cmd = { 'MarkdownPreview', 'MarkdownPreviewStop' }, + run = 'cd app && yarn install' }) use({ 'nvim-lualine/lualine.nvim', @@ -180,7 +183,7 @@ return require('packer').startup(function(use) 'williamboman/nvim-lsp-installer', 'folke/lsp-colors.nvim', 'folke/lua-dev.nvim', - 'ray-x/lsp_signature.nvim', + 'ray-x/lsp_signature.nvim', 'jose-elias-alvarez/null-ls.nvim', 'RRethy/vim-illuminate', 'simrat39/rust-tools.nvim', @@ -209,9 +212,7 @@ return require('packer').startup(function(use) }) -- erlang use('vim-erlang/vim-erlang-tags') - -- markdown use('iamcco/mathjax-support-for-mkdp') - use('iamcco/markdown-preview.vim') --beancount use('nathangrigg/vim-beancount') -- python diff --git a/setup.sh b/setup.sh index 0c7452b..3d4cff2 100755 --- a/setup.sh +++ b/setup.sh @@ -10,6 +10,8 @@ FILES=( .tmux.conf .ideavimrc + .npmrc + ) CONFIG_FILES=(