diff --git a/.Brewfile.Darwin.gooddeAir b/.Brewfile.Darwin.gooddeAir index 497ccf1..02737d0 100644 --- a/.Brewfile.Darwin.gooddeAir +++ b/.Brewfile.Darwin.gooddeAir @@ -24,6 +24,8 @@ brew "fzf" brew "git" brew "gnupg" brew "go" +brew "node" +brew "graphql-cli" brew "helm" brew "zookeeper" brew "kafka" @@ -36,7 +38,6 @@ brew "mas" brew "zlib" brew "mysql", restart_service: true brew "neovim" -brew "node" brew "pinentry-mac" brew "pnpm" brew "postgresql@14" @@ -71,6 +72,7 @@ cask "google-drive" cask "lark" cask "logi-options-plus" cask "logseq" +cask "microsoft-edge" cask "ngrok" cask "notion" cask "rapidapi" @@ -93,6 +95,7 @@ mas "Notion Web Clipper", id: 1559269364 mas "Reeder", id: 1529448980 mas "Slack", id: 803453959 mas "Twitter", id: 1482454543 +mas "Userscripts", id: 1463298887 mas "Vimari", id: 1480933944 mas "WeChat", id: 836500024 mas "Xcode", id: 497799835 diff --git a/nvim/init.lua b/nvim/init.lua index 1274784..e76a409 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -10,6 +10,7 @@ local o, wo, bo = vim.o, vim.wo, vim.bo local buffer = { o, bo } local window = { o, wo } + local utils = require('utils') local map = utils.map local set = utils.set @@ -157,10 +158,11 @@ map('i', '', '') -- map('n', 'e', '1w') -- map('n', 'p', ':wincmd p') --- map('i', '', 'copilot#Accept()', { expr = true }) --- vim.g.copilot_no_tab_map = 1 --- vim.g.copilot_no_maps = 1 --- vim.g.copilot_assume_mapped = 1 +map('i', '', 'copilot#Accept()', { expr = true }) +vim.g.copilot_no_tab_map = 1 +vim.g.copilot_no_maps = 1 +vim.g.copilot_assume_mapped = 1 + require('plugins') require('funcs') diff --git a/nvim/lua/config/nvim_cmp.lua b/nvim/lua/config/nvim_cmp.lua index 83a5703..e95c0ba 100644 --- a/nvim/lua/config/nvim_cmp.lua +++ b/nvim/lua/config/nvim_cmp.lua @@ -24,18 +24,18 @@ cmp.setup({ mapping = cmp.mapping.preset.insert({ [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), + -- [''] = cmp.mapping.complete(), --[""] = cmp.mapping.close(), - -- [''] = function(fallback) - -- fallback() - -- end, + [''] = function(fallback) + fallback() + end, [''] = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true, }), [''] = cmp.mapping.confirm({ select = true }), - -- [''] = cmp.mapping.select_next_item(), - -- [''] = cmp.mapping.select_prev_item(), + -- [''] = cmp.mapping.select_next_item(), + -- [''] = cmp.mapping.select_prev_item(), --}, }), sources = { diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index ffae65e..ff7ae8c 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -127,18 +127,18 @@ return require('packer').startup(function(use) require('config.lsp_lines') end, }) - --use({ - --'github/copilot.vim', - --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({ + 'github/copilot.vim', + 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', run = ':TSUpdate',