diff --git a/.zshrc b/.zshrc index fa23e31..1f032dc 100644 --- a/.zshrc +++ b/.zshrc @@ -106,8 +106,9 @@ unsetopt BEEP # unsetopt LIST_BEEP # brew -export HOMEBREW_BREW_GIT_REMOTE="https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/brew.git" -export HOMEBREW_BOTTLE_DOMAIN="https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles" +export HOMEBREW_BREW_GIT_REMOTE="https://mirrors.ustc.edu.cn/brew.git" +export HOMEBREW_CORE_GIT_REMOTE="https://mirrors.ustc.edu.cn/homebrew-core.git" +export HOMEBREW_BOTTLE_DOMAIN="https://mirrors.ustc.edu.cn/homebrew-bottles" export HOMEBREW_NO_AUTO_UPDATE=true # 禁止 brew 每次安装软件都 upate # git diff --git a/nvim/lock-v0.8.1.json b/nvim/lock-v0.8.1.json new file mode 100644 index 0000000..baa075b --- /dev/null +++ b/nvim/lock-v0.8.1.json @@ -0,0 +1 @@ +{"nvim-dap": {"commit": "8f396b7"}, "FixCursorHold.nvim": {"commit": "70a9516"}, "nvcode-color-schemes.vim": {"commit": "3a0e624"}, "telescope-fzf-native.nvim": {"commit": "7447fe7"}, "codi.vim": {"commit": "2898369"}, "packer.nvim": {"commit": "dcd2f38"}, "nvim-lspconfig": {"commit": "cb64ead"}, "playground": {"commit": "1290fdf"}, "numb.nvim": {"commit": "d95b7ea"}, "nvim-treesitter": {"commit": "7685324"}, "which-key.nvim": {"commit": "61553ae"}, "telescope-file-browser.nvim": {"commit": "8646e46"}, "fzf-lua": {"commit": "0c8b338"}, "nvim-autopairs": {"commit": "99f6963"}, "friendly-snippets": {"commit": "b4f857a"}, "vim-vsnip": {"commit": "e44026b"}, "nvim-colorizer.lua": {"commit": "36c610a"}, "toggleterm.nvim": {"commit": "f494c61"}, "tabular": {"commit": "339091a"}, "cmp-nvim-lsp": {"commit": "5922477"}, "vim-fugitive": {"commit": "49cc585"}, "neotest": {"commit": "a2559f0"}, "gitsigns.nvim": {"commit": "d076301"}, "glow.nvim": {"commit": "20d1cd0"}, "lspkind-nvim": {"commit": "c68b3a0"}, "cmp-cmdline": {"commit": "23c51b2"}, "telescope.nvim": {"commit": "3c2e5fb"}, "telescope-project.nvim": {"commit": "ff4d3ce"}, "trouble.nvim": {"commit": "897542f"}, "nvim-ts-context-commentstring": {"commit": "32d9627"}, "lsp_signature.nvim": {"commit": "2f3e574"}, "one-monokai-vim": {"commit": "4fdfd93"}, "gruvbox.nvim": {"commit": "02a9182"}, "nvim-bqf": {"commit": "448fa92"}, "aerial.nvim": {"commit": "38c6fe1"}, "hop.nvim": {"commit": "75f73d3"}, "lush.nvim": {"commit": "979f4d2"}, "LuaSnip": {"commit": "e687d78"}, "vim-go-coverage": {"commit": "d9b0c9f"}, "vim-matchup": {"commit": "55e3330"}, "popup.nvim": {"commit": "b7404d3"}, "cmp-vsnip": {"commit": "989a8a7"}, "nvim-web-devicons": {"commit": "189ad37"}, "FTerm.nvim": {"commit": "d132089"}, "nvim-dap-virtual-text": {"commit": "2971ce3"}, "neotest-go": {"commit": "4573733"}, "nvim-ts-autotag": {"commit": "fdefe46"}, "rnvimr": {"commit": "d78ca64"}, "nvim-dap-ui": {"commit": "54365d2"}, "barbar.nvim": {"commit": "9347ed8"}, "monokai.nvim": {"commit": "6fb4f7f"}, "lspsaga.nvim": {"commit": "9ec569a"}, "vim-markdown": {"commit": "df4be86"}, "dashboard-nvim": {"commit": "d82ddae"}, "nvim-luapad": {"commit": "6efe380"}, "nvim-tree.lua": {"commit": "829e9f6"}, "bracey.vim": {"commit": "4e1a22a"}, "nvim-lsp-installer": {"commit": "17e0bfa"}, "lsp-rooter.nvim": {"commit": "7c83364"}, "nvim-comment": {"commit": "e9ac16a"}, "plenary.nvim": {"commit": "4b7e520"}, "nvim-cmp": {"commit": "93f385c"}, "telescope-dap.nvim": {"commit": "b4134ff"}, "galaxyline.nvim": {"commit": "eb81be0"}, "markdown-preview.nvim": {"commit": "02cc387"}, "DAPInstall.nvim": {"commit": "bbda2b0"}, "neodev.nvim": {"commit": "dbed203"}, "cmp-path": {"commit": "91ff86c"}, "cmp-buffer": {"commit": "3022dbc"}} diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index 67033d3..1bcddd1 100644 --- a/nvim/lua/lsp.lua +++ b/nvim/lua/lsp.lua @@ -82,7 +82,7 @@ autocmd BufWritePre *.lua lua vim.lsp.buf.formatting_sync(nil, 100) ]] local function documentHighlight(client, bufnr) -- Set autocommands conditional on server_capabilities - if client.resolved_capabilities.document_highlight then + if client.server_capabilities.document_highlight then vim.api.nvim_exec( [[ hi LspReferenceRead cterm=bold ctermbg=red guibg=#464646 @@ -109,7 +109,7 @@ end --function lsp_config.tsserver_on_attach(client, bufnr) -- lsp_config.common_on_attach(client, bufnr) --- client.resolved_capabilities.document_formatting = false +-- client.server_capabilities.document_formatting = false --end -- Use a loop to conveniently both setup defined servers diff --git a/nvim/lua/pluginconfig/init.lua b/nvim/lua/pluginconfig/init.lua index 1b87db1..377c61e 100644 --- a/nvim/lua/pluginconfig/init.lua +++ b/nvim/lua/pluginconfig/init.lua @@ -6,7 +6,7 @@ require('pluginconfig/galaxyline') require('pluginconfig/gitsigns') require('pluginconfig/hop') require('pluginconfig/lspinstall') -require('pluginconfig/lua-dev') -- must before lspconfig +require('pluginconfig/neodev') -- must before lspconfig require('pluginconfig/mkdx') require('pluginconfig/neotest') require('pluginconfig/numb') diff --git a/nvim/lua/pluginconfig/lua-dev.lua b/nvim/lua/pluginconfig/neodev.lua similarity index 72% rename from nvim/lua/pluginconfig/lua-dev.lua rename to nvim/lua/pluginconfig/neodev.lua index ea0d05b..e8a4d9e 100644 --- a/nvim/lua/pluginconfig/lua-dev.lua +++ b/nvim/lua/pluginconfig/neodev.lua @@ -1,3 +1,3 @@ -require("lua-dev").setup({ +require("neodev").setup({ -- add any options here, or leave empty to use the default settings }) diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 30d6c71..90c4fdf 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -54,7 +54,7 @@ return require("packer").startup(function(use) requires = { 'kyazdani42/nvim-web-devicons' } } - use { 'folke/lua-dev.nvim' } + use { 'folke/neodev.nvim' } use { "rafcamlet/nvim-luapad" } -- Debugging @@ -90,7 +90,7 @@ return require("packer").startup(function(use) use "kevinhwang91/rnvimr" -- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'} - use { 'lewis6991/gitsigns.nvim', tag = 'release', opt = true, requires = { 'nvim-lua/plenary.nvim' } } + use { 'lewis6991/gitsigns.nvim', opt = true, requires = { 'nvim-lua/plenary.nvim' } } use { "folke/which-key.nvim", opt = true } use { "ChristianChiarulli/dashboard-nvim", opt = true } use { "windwp/nvim-autopairs", opt = true }