Skip to content

Commit 80b0131

Browse files
committed
Update plugins; disable copilot
1 parent 9adccb2 commit 80b0131

File tree

8 files changed

+43
-27
lines changed

8 files changed

+43
-27
lines changed

nvim/lua/cj/autocomplete.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cmp.setup {
3636
{ name = "buffer" },
3737
{ name = "path" },
3838
{ name = "nvim_lua" },
39-
{ name = "copilot" },
39+
--{ name = "copilot" },
4040
},
4141
}
4242

nvim/lua/cj/lsp/init.lua

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ local on_attach = function(client, bufnr)
5959
command = "LspFormatting",
6060
})
6161
end
62-
63-
-- Kinda nasty but best way I could find to do this
64-
vim.cmd("autocmd BufWritePre *.tsx,*.ts,*.jsx,*.js EslintFixAll")
6562
end
6663

6764
-- Servers that don't need any additional config

nvim/lua/cj/plugins.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ return packer.startup(function(use)
3737
use "hrsh7th/cmp-path"
3838
use "hrsh7th/cmp-cmdline"
3939
use "hrsh7th/cmp-nvim-lsp"
40-
use "hrsh7th/cmp-copilot"
4140
use "dcampos/nvim-snippy"
4241
use "dcampos/cmp-snippy"
4342
use "github/copilot.vim"
43+
use "hrsh7th/cmp-copilot"
4444

4545
-- LSP
4646
use "neovim/nvim-lspconfig" -- enable LSP

nvim/plugin/packer_compiled.lua

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,26 @@ vim.api.nvim_command('packadd packer.nvim')
99

1010
local no_errors, error_msg = pcall(function()
1111

12-
local time
13-
local profile_info
14-
local should_profile = false
15-
if should_profile then
16-
local hrtime = vim.loop.hrtime
17-
profile_info = {}
18-
time = function(chunk, start)
19-
if start then
20-
profile_info[chunk] = hrtime()
21-
else
22-
profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
23-
end
12+
_G._packer = _G._packer or {}
13+
_G._packer.inside_compile = true
14+
15+
local time
16+
local profile_info
17+
local should_profile = false
18+
if should_profile then
19+
local hrtime = vim.loop.hrtime
20+
profile_info = {}
21+
time = function(chunk, start)
22+
if start then
23+
profile_info[chunk] = hrtime()
24+
else
25+
profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
2426
end
25-
else
26-
time = function(chunk, start) end
2727
end
28-
28+
else
29+
time = function(chunk, start) end
30+
end
31+
2932
local function save_profiles(threshold)
3033
local sorted_times = {}
3134
for chunk_name, time_taken in pairs(profile_info) do
@@ -38,14 +41,16 @@ local function save_profiles(threshold)
3841
results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
3942
end
4043
end
44+
if threshold then
45+
table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
46+
end
4147

42-
_G._packer = _G._packer or {}
4348
_G._packer.profile_output = results
4449
end
4550

4651
time([[Luarocks path setup]], true)
47-
local package_path_str = "/Users/cj/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/cj/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/cj/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/cj/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
48-
local install_cpath_pattern = "/Users/cj/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
52+
local package_path_str = "/Users/cj/.cache/nvim/packer_hererocks/2.1.1700008891/share/lua/5.1/?.lua;/Users/cj/.cache/nvim/packer_hererocks/2.1.1700008891/share/lua/5.1/?/init.lua;/Users/cj/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?.lua;/Users/cj/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?/init.lua"
53+
local install_cpath_pattern = "/Users/cj/.cache/nvim/packer_hererocks/2.1.1700008891/lib/lua/5.1/?.so"
4954
if not string.find(package.path, package_path_str, 1, true) then
5055
package.path = package.path .. ';' .. package_path_str
5156
end
@@ -105,7 +110,7 @@ _G.packer_plugins = {
105110
url = "https://github.com/github/copilot.vim"
106111
},
107112
["gitsigns.nvim"] = {
108-
config = { "\27LJ\2\n\4\0\0\5\0\16\0\0196\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\14\0005\3\4\0005\4\3\0=\4\5\0035\4\6\0=\4\a\0035\4\b\0=\4\t\0035\4\n\0=\4\v\0035\4\f\0=\4\r\3=\3\15\2B\0\2\1K\0\1\0\nsigns\1\0\0\17changedelete\1\0\4\ttext\b▐\nnumhl\21GitSignsChangeNr\ahl\19GitSignsChange\vlinehl\21GitSignsChangeLn\14topdelete\1\0\4\ttext\b▐\nnumhl\21GitSignsDeleteNr\ahl\19GitSignsDelete\vlinehl\21GitSignsDeleteLn\vdelete\1\0\4\ttext\b▐\nnumhl\21GitSignsDeleteNr\ahl\19GitSignsDelete\vlinehl\21GitSignsDeleteLn\vchange\1\0\4\ttext\b▐\nnumhl\21GitSignsChangeNr\ahl\19GitSignsChange\vlinehl\21GitSignsChangeLn\badd\1\0\0\1\0\4\ttext\b▐\nnumhl\18GitSignsAddNr\ahl\16GitSignsAdd\vlinehl\18GitSignsAddLn\nsetup\rgitsigns\frequire\0" },
113+
config = { "\27LJ\2\n\4\0\0\5\0\16\0\0196\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\14\0005\3\4\0005\4\3\0=\4\5\0035\4\6\0=\4\a\0035\4\b\0=\4\t\0035\4\n\0=\4\v\0035\4\f\0=\4\r\3=\3\15\2B\0\2\1K\0\1\0\nsigns\1\0\0\17changedelete\1\0\4\ahl\19GitSignsChange\nnumhl\21GitSignsChangeNr\ttext\b▐\vlinehl\21GitSignsChangeLn\14topdelete\1\0\4\ahl\19GitSignsDelete\nnumhl\21GitSignsDeleteNr\ttext\b▐\vlinehl\21GitSignsDeleteLn\vdelete\1\0\4\ahl\19GitSignsDelete\nnumhl\21GitSignsDeleteNr\ttext\b▐\vlinehl\21GitSignsDeleteLn\vchange\1\0\4\ahl\19GitSignsChange\nnumhl\21GitSignsChangeNr\ttext\b▐\vlinehl\21GitSignsChangeLn\badd\1\0\0\1\0\4\ahl\16GitSignsAdd\nnumhl\18GitSignsAddNr\ttext\b▐\vlinehl\18GitSignsAddLn\nsetup\rgitsigns\frequire\0" },
109114
loaded = true,
110115
path = "/Users/cj/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
111116
url = "https://github.com/lewis6991/gitsigns.nvim"
@@ -180,8 +185,15 @@ _G.packer_plugins = {
180185
time([[Defining packer_plugins]], false)
181186
-- Config for: gitsigns.nvim
182187
time([[Config for gitsigns.nvim]], true)
183-
try_loadstring("\27LJ\2\n\4\0\0\5\0\16\0\0196\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\14\0005\3\4\0005\4\3\0=\4\5\0035\4\6\0=\4\a\0035\4\b\0=\4\t\0035\4\n\0=\4\v\0035\4\f\0=\4\r\3=\3\15\2B\0\2\1K\0\1\0\nsigns\1\0\0\17changedelete\1\0\4\ttext\b▐\nnumhl\21GitSignsChangeNr\ahl\19GitSignsChange\vlinehl\21GitSignsChangeLn\14topdelete\1\0\4\ttext\b▐\nnumhl\21GitSignsDeleteNr\ahl\19GitSignsDelete\vlinehl\21GitSignsDeleteLn\vdelete\1\0\4\ttext\b▐\nnumhl\21GitSignsDeleteNr\ahl\19GitSignsDelete\vlinehl\21GitSignsDeleteLn\vchange\1\0\4\ttext\b▐\nnumhl\21GitSignsChangeNr\ahl\19GitSignsChange\vlinehl\21GitSignsChangeLn\badd\1\0\0\1\0\4\ttext\b▐\nnumhl\18GitSignsAddNr\ahl\16GitSignsAdd\vlinehl\18GitSignsAddLn\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim")
188+
try_loadstring("\27LJ\2\n\4\0\0\5\0\16\0\0196\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\14\0005\3\4\0005\4\3\0=\4\5\0035\4\6\0=\4\a\0035\4\b\0=\4\t\0035\4\n\0=\4\v\0035\4\f\0=\4\r\3=\3\15\2B\0\2\1K\0\1\0\nsigns\1\0\0\17changedelete\1\0\4\ahl\19GitSignsChange\nnumhl\21GitSignsChangeNr\ttext\b▐\vlinehl\21GitSignsChangeLn\14topdelete\1\0\4\ahl\19GitSignsDelete\nnumhl\21GitSignsDeleteNr\ttext\b▐\vlinehl\21GitSignsDeleteLn\vdelete\1\0\4\ahl\19GitSignsDelete\nnumhl\21GitSignsDeleteNr\ttext\b▐\vlinehl\21GitSignsDeleteLn\vchange\1\0\4\ahl\19GitSignsChange\nnumhl\21GitSignsChangeNr\ttext\b▐\vlinehl\21GitSignsChangeLn\badd\1\0\0\1\0\4\ahl\16GitSignsAdd\nnumhl\18GitSignsAddNr\ttext\b▐\vlinehl\18GitSignsAddLn\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim")
184189
time([[Config for gitsigns.nvim]], false)
190+
191+
_G._packer.inside_compile = false
192+
if _G._packer.needs_bufread == true then
193+
vim.cmd("doautocmd BufRead")
194+
end
195+
_G._packer.needs_bufread = false
196+
185197
if should_profile then save_profiles() end
186198

187199
end)

nvim/spell/en.utf-8.add

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ versioning
66
verifier
77
metadata
88
reprioritize
9+
analytics
10+
Unintuitive
11+
Pluggable

nvim/spell/en.utf-8.add.spl

63 Bytes
Binary file not shown.

vim/vimrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ lspconfig.rust_analyzer.setup({
271271
loadOutDirsFromCheck = true
272272
},
273273
procMacro = {
274-
enable = false
274+
enable = true
275275
},
276276
}
277277
}

zshrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,8 @@ export PATH="$BUN_INSTALL/bin:$PATH"
126126
# pnpm
127127
export PNPM_HOME="/Users/cj/Library/pnpm"
128128
export PATH="$PNPM_HOME:$PATH"
129-
# pnpm end
129+
# pnpm end
130+
[ -f "/Users/cj/.ghcup/env" ] && source "/Users/cj/.ghcup/env" # ghcup-env
131+
132+
133+
export PATH="$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"

0 commit comments

Comments
 (0)