diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim new file mode 100644 index 0000000..e2ab224 --- /dev/null +++ b/home-manager/nvim/init.vim @@ -0,0 +1,58 @@ +colorscheme slate + +hi LineNr ctermfg=240 +hi LspErrorVirtualText ctermbg=9 +hi ModeMsg ctermfg=248 +hi Nontext ctermfg=240 +hi Pmenu ctermbg=236 ctermfg=248 +hi PmenuSel ctermbg=240 ctermfg=255 +hi SpecialKey ctermfg=240 +hi StatusLine cterm=NONE ctermbg=12 ctermfg=252 +hi TabLine cterm=NONE ctermbg=238 ctermfg=248 +hi TabLineFill cterm=NONE ctermbg=238 +hi Underlined ctermfg=6 + +inoremap ( () +inoremap { {} +inoremap [ [] +inoremap < <> +inoremap " "" +inoremap ` `` + +function! NewlineWithIndent() + let nlAndIndent = "\n\t\n\\" + let open = getline(".")[col(".")-2] + let close = getline(".")[col(".")-1] + + if close == "}" && open == "{" + return nlAndIndent + elseif close == ")" && open == "(" + return nlAndIndent + elseif close == "]" && open == "[" + return nlAndIndent + else + return "\n" + endif +endfunction +inoremap NewlineWithIndent() + +autocmd! BufNewFile,BufRead !*.go,!*.md,!*.txt inoremap ' '' + +autocmd! BufNewFile,BufRead !*.md,!*.txt packadd asyncomplete.vim asyncomplete-lsp.vim +autocmd! BufNewFile,BufRead *.md,*.txt packadd coc.nvim +autocmd! BufNewFile,BufRead *.go packadd vim-goimports + +set autoindent +set lcs=eol:↲,tab:>_,trail:・ +set list +set number +set shiftwidth=4 +set showmatch +set splitright +set tabstop=4 + +autocmd! BufNewFile,BufRead *.json set filetype=jsonc + +syntax on + +tnoremap -- 2.51.2 From 7b6ba185227213d4b7817fc61ea515fb070908c6 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Fri, 31 Dec 2021 09:47:00 +0900 Subject: [PATCH 002/589] :fire: remove coc.nvim --- home-manager/nvim/init.vim | 2 -- 1 file changed, 2 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index e2ab224..5e2b543 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -38,8 +38,6 @@ inoremap NewlineWithIndent() autocmd! BufNewFile,BufRead !*.go,!*.md,!*.txt inoremap ' '' -autocmd! BufNewFile,BufRead !*.md,!*.txt packadd asyncomplete.vim asyncomplete-lsp.vim -autocmd! BufNewFile,BufRead *.md,*.txt packadd coc.nvim autocmd! BufNewFile,BufRead *.go packadd vim-goimports set autoindent -- 2.51.2 From c6f8289af4d56eef6420495424584bb554400feb Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 2 Jan 2022 09:41:30 +0900 Subject: [PATCH 003/589] :sparkles: add fileformat to statusline --- home-manager/nvim/init.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 5e2b543..5ab1257 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -47,6 +47,10 @@ set number set shiftwidth=4 set showmatch set splitright + +let encode = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} +set statusline=%f%m%=%{encode[&fileformat]}\ [%l\ %c\ %P] + set tabstop=4 autocmd! BufNewFile,BufRead *.json set filetype=jsonc -- 2.51.2 From 391e8f4fa0405095960d10a56b5d1a67588e6319 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 2 Jan 2022 09:53:30 +0900 Subject: [PATCH 004/589] :bug: set nlCharacter by fileformat --- home-manager/nvim/init.vim | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 5ab1257..507dd54 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -20,7 +20,14 @@ inoremap " "" inoremap ` `` function! NewlineWithIndent() - let nlAndIndent = "\n\t\n\\" + let nlCharacter = '\n' + if &fileformat == 'dos' + let nlCharacter = '\r\n' + elseif &fileformat == 'mac' + let nlCharacter = '\r' + endif + + let nlAndIndent = nlCharacter + "\t" + nlCharacter + "\\" let open = getline(".")[col(".")-2] let close = getline(".")[col(".")-1] @@ -31,7 +38,7 @@ function! NewlineWithIndent() elseif close == "]" && open == "[" return nlAndIndent else - return "\n" + return nlCharacter endif endfunction inoremap NewlineWithIndent() @@ -48,8 +55,8 @@ set shiftwidth=4 set showmatch set splitright -let encode = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} -set statusline=%f%m%=%{encode[&fileformat]}\ [%l\ %c\ %P] +let eol = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} +set statusline=%f%m%=%{eol[&fileformat]}\ [%l\ %c\ %P] set tabstop=4 -- 2.51.2 From 5934c77cd0c41cb3c4ffb24dbf41693c195da105 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 2 Jan 2022 10:37:27 +0900 Subject: [PATCH 005/589] :hammer: auto complete back quote if it's Golang --- home-manager/nvim/init.vim | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 5e2b543..99da300 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -17,7 +17,6 @@ inoremap { {} inoremap [ [] inoremap < <> inoremap " "" -inoremap ` `` function! NewlineWithIndent() let nlAndIndent = "\n\t\n\\" @@ -36,7 +35,11 @@ function! NewlineWithIndent() endfunction inoremap NewlineWithIndent() -autocmd! BufNewFile,BufRead !*.go,!*.md,!*.txt inoremap ' '' +augroup quote + autocmd! + autocmd BufNewFile,BufRead !*.go,!*.md,!*.txt inoremap ' '' + autocmd BufNewFile,BufRead *.go inoremap ` `` +augroup end autocmd! BufNewFile,BufRead *.go packadd vim-goimports -- 2.51.2 From c9e1f33a90bc2017a9c473566a76eac85686f3bf Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 2 Jan 2022 12:09:22 +0900 Subject: [PATCH 006/589] :bug: fix new line --- home-manager/nvim/init.vim | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 507dd54..63cd131 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -20,14 +20,7 @@ inoremap " "" inoremap ` `` function! NewlineWithIndent() - let nlCharacter = '\n' - if &fileformat == 'dos' - let nlCharacter = '\r\n' - elseif &fileformat == 'mac' - let nlCharacter = '\r' - endif - - let nlAndIndent = nlCharacter + "\t" + nlCharacter + "\\" + let nlAndIndent = "\n\t\n\\" let open = getline(".")[col(".")-2] let close = getline(".")[col(".")-1] @@ -38,7 +31,7 @@ function! NewlineWithIndent() elseif close == "]" && open == "[" return nlAndIndent else - return nlCharacter + return "\n" endif endfunction inoremap NewlineWithIndent() -- 2.51.2 From 54145794895feeebb81de0bcdecc924612f6c633 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 6 Jan 2022 20:27:55 +0900 Subject: [PATCH 007/589] :art: change ctermfg of Comment --- home-manager/nvim/init.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index bd0a23b..5e70cc9 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -1,5 +1,6 @@ colorscheme slate +hi Comment ctermfg=244 hi LineNr ctermfg=240 hi LspErrorVirtualText ctermbg=9 hi ModeMsg ctermfg=248 -- 2.51.2 From 6d73fa45ac205891e5f257c01c14671a50ea725b Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 8 Jan 2022 18:30:42 +0900 Subject: [PATCH 008/589] :wrench: auto complete <> when editing HTML only --- home-manager/nvim/init.vim | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 5e70cc9..b044497 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -1,5 +1,7 @@ colorscheme slate +filetype on + hi Comment ctermfg=244 hi LineNr ctermfg=240 hi LspErrorVirtualText ctermbg=9 @@ -16,7 +18,6 @@ hi Underlined ctermfg=6 inoremap ( () inoremap { {} inoremap [ [] -inoremap < <> inoremap " "" function! NewlineWithIndent() @@ -36,13 +37,14 @@ function! NewlineWithIndent() endfunction inoremap NewlineWithIndent() -augroup quote +augroup pair autocmd! - autocmd BufNewFile,BufRead !*.go,!*.md,!*.txt inoremap ' '' - autocmd BufNewFile,BufRead *.go inoremap ` `` + autocmd FileType !go,!markdown,!text inoremap ' '' + autocmd FileType html inoremap < <> + autocmd FileType go inoremap ` `` augroup end -autocmd! BufNewFile,BufRead *.go packadd vim-goimports +autocmd! FileType go packadd vim-goimports set autoindent set lcs=eol:↲,tab:>_,trail:・ @@ -57,7 +59,7 @@ set statusline=%f%m%=%{eol[&fileformat]}\ [%l\ %c\ %P] set tabstop=4 -autocmd! BufNewFile,BufRead *.json set filetype=jsonc +autocmd! json set filetype=jsonc syntax on -- 2.51.2 From 09342004614e03cdb0ee939aeabdb322bfa2c590 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 9 Jan 2022 11:22:41 +0900 Subject: [PATCH 009/589] :bug: fix lack of FileType --- home-manager/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index b044497..b5170e8 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -59,7 +59,7 @@ set statusline=%f%m%=%{eol[&fileformat]}\ [%l\ %c\ %P] set tabstop=4 -autocmd! json set filetype=jsonc +autocmd! Filetype json set filetype=jsonc syntax on -- 2.51.2 From 4f5425abb0ec68493f69bfad46802a5143ab5558 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 20 Jan 2022 07:02:36 +0900 Subject: [PATCH 010/589] :wrench: add nowrap --- home-manager/nvim/init.vim | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index b5170e8..c23e039 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -39,10 +39,10 @@ inoremap NewlineWithIndent() augroup pair autocmd! - autocmd FileType !go,!markdown,!text inoremap ' '' autocmd FileType html inoremap < <> autocmd FileType go inoremap ` `` -augroup end + autocmd FileType typescript inoremap ' '' +augroup END autocmd! FileType go packadd vim-goimports @@ -50,6 +50,12 @@ set autoindent set lcs=eol:↲,tab:>_,trail:・ set list set number + +augroup wrapping + autocmd! + autocmd FileType typescript set nowrap +augroup END + set shiftwidth=4 set showmatch set splitright -- 2.51.2 From 0421b2309202638c6ce125ca3cfadc98cbb18991 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 20 Jan 2022 07:40:25 +0900 Subject: [PATCH 011/589] :fire: remove unnecessary whitespace --- home-manager/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index c23e039..4685394 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -41,7 +41,7 @@ augroup pair autocmd! autocmd FileType html inoremap < <> autocmd FileType go inoremap ` `` - autocmd FileType typescript inoremap ' '' + autocmd FileType typescript inoremap ' '' augroup END autocmd! FileType go packadd vim-goimports -- 2.51.2 From fefe4167136844ea046d2f8b34a01d22ce10c694 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Fri, 21 Jan 2022 06:38:18 +0900 Subject: [PATCH 012/589] :sparkles: add Deno LSP --- home-manager/nvim/init.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 4685394..bcaea5c 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -44,6 +44,8 @@ augroup pair autocmd FileType typescript inoremap ' '' augroup END +let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] + autocmd! FileType go packadd vim-goimports set autoindent -- 2.51.2 From 68535636f767c377de541d134684664aea8062fc Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 23 Jan 2022 12:14:16 +0900 Subject: [PATCH 013/589] :sparkle: add ' completion for scss --- home-manager/nvim/init.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index bcaea5c..44ce24a 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -41,6 +41,7 @@ augroup pair autocmd! autocmd FileType html inoremap < <> autocmd FileType go inoremap ` `` + autocmd FileType scss inoremap ' '' autocmd FileType typescript inoremap ' '' augroup END -- 2.51.2 From e9804e42426564d74cfdf64f8d9606e23de82998 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 25 Jan 2022 10:07:28 +0900 Subject: [PATCH 014/589] :sparkles: add spell check --- home-manager/nvim/init.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 44ce24a..5ccc450 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -70,6 +70,12 @@ set tabstop=4 autocmd! Filetype json set filetype=jsonc +augroup spell_check + autocmd! + autocmd FileType markdown,text set spell + autocmd FileType markdown,text set spelllang=en_us,cjk +augroup END + syntax on tnoremap -- 2.51.2 From 2c170cb4520b7e8f1e95a3f4bd833467b68bf678 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 25 Jan 2022 11:48:06 +0900 Subject: [PATCH 015/589] :hammer: refactor NewlineWithIndent --- home-manager/nvim/init.vim | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 5ccc450..173191f 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -25,11 +25,7 @@ function! NewlineWithIndent() let open = getline(".")[col(".")-2] let close = getline(".")[col(".")-1] - if close == "}" && open == "{" - return nlAndIndent - elseif close == ")" && open == "(" - return nlAndIndent - elseif close == "]" && open == "[" + if (open == "{" && close == "}") || (open == "(" && close == ")") || (open == "[" && close == "]") return nlAndIndent else return "\n" -- 2.51.2 From 3755d37a3eea51586ebf475842f28a542bc8b10d Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 25 Jan 2022 12:10:49 +0900 Subject: [PATCH 016/589] :bug: fix butting with autoindent --- home-manager/nvim/init.vim | 11 ++++++----- home-manager/nvim/spell/en.utf-8.add | 2 ++ home-manager/nvim/spell/en.utf-8.add.spl | Bin 0 -> 64 bytes 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 home-manager/nvim/spell/en.utf-8.add create mode 100644 home-manager/nvim/spell/en.utf-8.add.spl diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 173191f..e467699 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -20,18 +20,18 @@ inoremap { {} inoremap [ [] inoremap " "" -function! NewlineWithIndent() - let nlAndIndent = "\n\t\n\\" +function! NewlineInBrackets() + let nlInBrackets = "\\\" let open = getline(".")[col(".")-2] let close = getline(".")[col(".")-1] if (open == "{" && close == "}") || (open == "(" && close == ")") || (open == "[" && close == "]") - return nlAndIndent + return nlInBrackets else - return "\n" + return "\" endif endfunction -inoremap NewlineWithIndent() +inoremap NewlineInBrackets() augroup pair autocmd! @@ -57,6 +57,7 @@ augroup END set shiftwidth=4 set showmatch +set smartindent set splitright let eol = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add new file mode 100644 index 0000000..05e7551 --- /dev/null +++ b/home-manager/nvim/spell/en.utf-8.add @@ -0,0 +1,2 @@ +whitespace +goldmark diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl new file mode 100644 index 0000000000000000000000000000000000000000..fa21f4e6f03ae498595ff7240ea47e4b8c32d14a GIT binary patch literal 64 zcmWIZ^erw(&B-zP&%nT-%9LKtn9rEQn8KLLn8;Yfn9az*n8BFISi+dfSj Date: Wed, 26 Jan 2022 21:00:03 +0900 Subject: [PATCH 017/589] :sparkles: enable clipboard --- home-manager/nvim/init.vim | 1 + home-manager/nvim/spell/en.utf-8.add | 1 + home-manager/nvim/spell/en.utf-8.add.spl | Bin 64 -> 78 bytes 3 files changed, 2 insertions(+) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index e467699..48822c8 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -46,6 +46,7 @@ let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] autocmd! FileType go packadd vim-goimports set autoindent +set clipboard+=unnamedplus set lcs=eol:↲,tab:>_,trail:・ set list set number diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add index 05e7551..0557750 100644 --- a/home-manager/nvim/spell/en.utf-8.add +++ b/home-manager/nvim/spell/en.utf-8.add @@ -1,2 +1,3 @@ whitespace goldmark +Disqus diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl index fa21f4e6f03ae498595ff7240ea47e4b8c32d14a..061266e5cb5f93a8d5d03965101afa9281e3867f 100644 GIT binary patch delta 49 xcmZ?plMnOsEiOpS$uauRz`$U{oRVJ7n8{eoSjbq)Sj@=8G*M86TP~FW1^_;;3H1N~ delta 35 jcmeZs5DfG5EiOpS$uauRz`&r&lwLkjUWHpQl>r6-sfGtP -- 2.51.2 From 68b1b9432576684ff19b3180557eb87bf2dadcb1 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 7 Feb 2022 08:31:54 +0900 Subject: [PATCH 018/589] :sparkles: don't yank with d --- home-manager/nvim/init.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 48822c8..bedb268 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -43,6 +43,8 @@ augroup END let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] +nnoremap d "_d + autocmd! FileType go packadd vim-goimports set autoindent -- 2.51.2 From 18a457fc6c07ea13f96aa9c1b5ce6082e9073e09 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 10 Feb 2022 10:43:22 +0900 Subject: [PATCH 019/589] :sparkles: add mattn/emmet-vim --- home-manager/nvim/init.vim | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index bedb268..f4edc4f 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -35,7 +35,6 @@ inoremap NewlineInBrackets() augroup pair autocmd! - autocmd FileType html inoremap < <> autocmd FileType go inoremap ` `` autocmd FileType scss inoremap ' '' autocmd FileType typescript inoremap ' '' @@ -45,7 +44,11 @@ let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] nnoremap d "_d -autocmd! FileType go packadd vim-goimports +augroup plugins + autocmd! + autocmd FileType html packadd emmet-vim + autocmd FileType go packadd vim-goimports +augroup END set autoindent set clipboard+=unnamedplus -- 2.51.2 From 70bba78e37f27d24b54d2e9106fb80e5ae4ec497 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 13 Feb 2022 10:09:38 +0900 Subject: [PATCH 020/589] :sparkles: add cargo --- home-manager/nvim/spell/en.utf-8.add | 1 + home-manager/nvim/spell/en.utf-8.add.spl | Bin 78 -> 87 bytes 2 files changed, 1 insertion(+) diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add index 0557750..c56f11c 100644 --- a/home-manager/nvim/spell/en.utf-8.add +++ b/home-manager/nvim/spell/en.utf-8.add @@ -1,3 +1,4 @@ whitespace goldmark Disqus +Golang diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl index 061266e5cb5f93a8d5d03965101afa9281e3867f..4f445ebe2c15106c6034d0a9ef8c2022a31b61ce 100644 GIT binary patch literal 87 zcmWIZ^erw(&B-zP&%nT7&YY57&X~zq%vi`+%2>?E#Kf4-n8TEq!kEX%$iTpt&X~)X h$XLXf&B(x*!I;Td!kEff%vivf$e0Y0S59Ss0RUuH5EcLc delta 55 zcmWIdQw{UR!r6- Dkf;l5 -- 2.51.2 From bcbae2d913ae10c21faf13dac884e699dd77febd Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 13 Feb 2022 10:41:55 +0900 Subject: [PATCH 021/589] :hammer: reduce return in NewlineInBrackets --- home-manager/nvim/init.vim | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index f4edc4f..74ea47d 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -21,15 +21,16 @@ inoremap [ [] inoremap " "" function! NewlineInBrackets() - let nlInBrackets = "\\\" let open = getline(".")[col(".")-2] let close = getline(".")[col(".")-1] + let key = "\" + if (open == "{" && close == "}") || (open == "(" && close == ")") || (open == "[" && close == "]") - return nlInBrackets - else - return "\" + let key .= "\\" endif + + return key endfunction inoremap NewlineInBrackets() -- 2.51.2 From 565c01cb8fe08938199a69335515f7a903a7b24a Mon Sep 17 00:00:00 2001 From: akimon658 Date: Fri, 18 Feb 2022 22:23:48 +0900 Subject: [PATCH 022/589] :sparkles: add Python --- home-manager/nvim/init.vim | 3 +-- home-manager/nvim/spell/en.utf-8.add | 3 +++ home-manager/nvim/spell/en.utf-8.add.spl | Bin 87 -> 115 bytes 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 74ea47d..bf5a95b 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -37,8 +37,7 @@ inoremap NewlineInBrackets() augroup pair autocmd! autocmd FileType go inoremap ` `` - autocmd FileType scss inoremap ' '' - autocmd FileType typescript inoremap ' '' + autocmd FileType python,scss,typescript inoremap ' '' augroup END let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add index c56f11c..02ea463 100644 --- a/home-manager/nvim/spell/en.utf-8.add +++ b/home-manager/nvim/spell/en.utf-8.add @@ -2,3 +2,6 @@ whitespace goldmark Disqus Golang +Roboto +Noto +SIL diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl index 4f445ebe2c15106c6034d0a9ef8c2022a31b61ce..460ee14d1316d6db85c1800a051680672d60be2c 100644 GIT binary patch delta 95 zcmWG9776q8EiOpS$uauRz`)?emXe-VR6J2o+C?y(F_$rsv4}C7k%2Lvv4oM4fk7~z nF&{*0Br#?(<}fm`FlI1jGL|r=G8QuyFeWl4gCx~b8DIbaEPWB$ literal 87 zcmWIZ^erw(&B-zP&%nT7&YY57&X~zq%vi`+%2>?E#Kf4-n8TEq!kEX%$iTpt&X~)X h$XLXf&B(x*!I;Td!kEff%vivf$e0Y0S59Ss0RUuH5EcLc -- 2.51.2 From e0e80903f5709fabb761d03644e65a58b63ef111 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 24 Feb 2022 07:54:36 +0900 Subject: [PATCH 023/589] :sparkles: add ap/vim-css-color --- home-manager/nvim/init.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index bf5a95b..5e9fc03 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -47,6 +47,7 @@ nnoremap d "_d augroup plugins autocmd! autocmd FileType html packadd emmet-vim + autocmd FileType css,scss packadd vim-css-color autocmd FileType go packadd vim-goimports augroup END -- 2.51.2 From bc9ef2eec946546e7e07f363a01ebc218f73a97b Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 26 Feb 2022 21:43:24 +0900 Subject: [PATCH 024/589] :hammer: use ftplugin --- home-manager/nvim/after/ftplugin/css.vim | 1 + home-manager/nvim/after/ftplugin/go.vim | 5 +++ home-manager/nvim/after/ftplugin/html.vim | 1 + home-manager/nvim/after/ftplugin/markdown.vim | 5 +++ home-manager/nvim/after/ftplugin/scss.vim | 1 + home-manager/nvim/after/ftplugin/text.vim | 5 +++ .../nvim/after/ftplugin/typescript.vim | 1 + home-manager/nvim/init.vim | 31 ++---------------- home-manager/nvim/spell/en.utf-8.add | 1 + home-manager/nvim/spell/en.utf-8.add.spl | Bin 115 -> 124 bytes 10 files changed, 22 insertions(+), 29 deletions(-) create mode 100644 home-manager/nvim/after/ftplugin/css.vim create mode 100644 home-manager/nvim/after/ftplugin/go.vim create mode 100644 home-manager/nvim/after/ftplugin/html.vim create mode 100644 home-manager/nvim/after/ftplugin/markdown.vim create mode 100644 home-manager/nvim/after/ftplugin/scss.vim create mode 100644 home-manager/nvim/after/ftplugin/text.vim create mode 100644 home-manager/nvim/after/ftplugin/typescript.vim diff --git a/home-manager/nvim/after/ftplugin/css.vim b/home-manager/nvim/after/ftplugin/css.vim new file mode 100644 index 0000000..e5bd015 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/css.vim @@ -0,0 +1 @@ +packadd vim-css-color diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim new file mode 100644 index 0000000..2a86ae1 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -0,0 +1,5 @@ +inoremap ` `` + +iunmap ' + +packadd vim-goimports diff --git a/home-manager/nvim/after/ftplugin/html.vim b/home-manager/nvim/after/ftplugin/html.vim new file mode 100644 index 0000000..bd9d6ba --- /dev/null +++ b/home-manager/nvim/after/ftplugin/html.vim @@ -0,0 +1 @@ +packadd emmet-vim diff --git a/home-manager/nvim/after/ftplugin/markdown.vim b/home-manager/nvim/after/ftplugin/markdown.vim new file mode 100644 index 0000000..ef86ed6 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/markdown.vim @@ -0,0 +1,5 @@ +iunmap ' + +setlocal spell +setlocal spelllang=en_us,cjk +setlocal wrap diff --git a/home-manager/nvim/after/ftplugin/scss.vim b/home-manager/nvim/after/ftplugin/scss.vim new file mode 100644 index 0000000..e5bd015 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/scss.vim @@ -0,0 +1 @@ +packadd vim-css-color diff --git a/home-manager/nvim/after/ftplugin/text.vim b/home-manager/nvim/after/ftplugin/text.vim new file mode 100644 index 0000000..ef86ed6 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/text.vim @@ -0,0 +1,5 @@ +iunmap ' + +setlocal spell +setlocal spelllang=en_us,cjk +setlocal wrap diff --git a/home-manager/nvim/after/ftplugin/typescript.vim b/home-manager/nvim/after/ftplugin/typescript.vim new file mode 100644 index 0000000..52817c9 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/typescript.vim @@ -0,0 +1 @@ +let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 5e9fc03..acbbd21 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -18,6 +18,7 @@ hi Underlined ctermfg=6 inoremap ( () inoremap { {} inoremap [ [] +inoremap ' '' inoremap " "" function! NewlineInBrackets() @@ -34,34 +35,14 @@ function! NewlineInBrackets() endfunction inoremap NewlineInBrackets() -augroup pair - autocmd! - autocmd FileType go inoremap ` `` - autocmd FileType python,scss,typescript inoremap ' '' -augroup END - -let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] - nnoremap d "_d -augroup plugins - autocmd! - autocmd FileType html packadd emmet-vim - autocmd FileType css,scss packadd vim-css-color - autocmd FileType go packadd vim-goimports -augroup END - set autoindent set clipboard+=unnamedplus set lcs=eol:↲,tab:>_,trail:・ set list set number - -augroup wrapping - autocmd! - autocmd FileType typescript set nowrap -augroup END - +set nowrap set shiftwidth=4 set showmatch set smartindent @@ -72,14 +53,6 @@ set statusline=%f%m%=%{eol[&fileformat]}\ [%l\ %c\ %P] set tabstop=4 -autocmd! Filetype json set filetype=jsonc - -augroup spell_check - autocmd! - autocmd FileType markdown,text set spell - autocmd FileType markdown,text set spelllang=en_us,cjk -augroup END - syntax on tnoremap diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add index 02ea463..a11d73e 100644 --- a/home-manager/nvim/spell/en.utf-8.add +++ b/home-manager/nvim/spell/en.utf-8.add @@ -5,3 +5,4 @@ Golang Roboto Noto SIL +OSS diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl index 460ee14d1316d6db85c1800a051680672d60be2c..b11725f900ca0b71c558affeba1316ab41bfbae8 100644 GIT binary patch literal 124 zcmWIZ^erw(&B-zP&%nUo&z_Q=mtRy|&X~zq%vi`+%2>?E#Kf4-n8TEq!kEX%$iN_! z&X~)X$XLXf&B(x*&sYK$%V#VGsbpcy2XQr%7&Ae%aSme!VV=7}YV*z6#V=_oo IJ(U3l0HviCTL1t6 delta 103 zcmb;^HVE_dEiOpS$uauRz`)?emXe-VR9w!O$ym%-$XLo)%*e#Vn9rEQl$gSp$H>UQ vAUM%b*g!C!F(1UyNMg)n%wc3=Va#C6WGrD!Wh`baU`%9821%-=GQa=;1%4Ck -- 2.51.2 From 04c20ac471db0d3c7e5e830f3bf068b450516481 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 27 Feb 2022 09:59:41 +0900 Subject: [PATCH 025/589] :wrench: `iunmap`: add `` --- home-manager/nvim/after/ftplugin/go.vim | 4 ++-- home-manager/nvim/after/ftplugin/markdown.vim | 2 +- home-manager/nvim/after/ftplugin/text.vim | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index 2a86ae1..dde6aaa 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -1,5 +1,5 @@ -inoremap ` `` +inoremap ` `` -iunmap ' +iunmap ' packadd vim-goimports diff --git a/home-manager/nvim/after/ftplugin/markdown.vim b/home-manager/nvim/after/ftplugin/markdown.vim index ef86ed6..5557713 100644 --- a/home-manager/nvim/after/ftplugin/markdown.vim +++ b/home-manager/nvim/after/ftplugin/markdown.vim @@ -1,4 +1,4 @@ -iunmap ' +iunmap ' setlocal spell setlocal spelllang=en_us,cjk diff --git a/home-manager/nvim/after/ftplugin/text.vim b/home-manager/nvim/after/ftplugin/text.vim index ef86ed6..5557713 100644 --- a/home-manager/nvim/after/ftplugin/text.vim +++ b/home-manager/nvim/after/ftplugin/text.vim @@ -1,4 +1,4 @@ -iunmap ' +iunmap ' setlocal spell setlocal spelllang=en_us,cjk -- 2.51.2 From b888c03dc16240f1cd1f059f8f62450545a7ab8e Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 27 Feb 2022 10:56:04 +0900 Subject: [PATCH 026/589] :sparkles: add Python formatting by `yapf` --- home-manager/nvim/after/ftplugin/python.vim | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 home-manager/nvim/after/ftplugin/python.vim diff --git a/home-manager/nvim/after/ftplugin/python.vim b/home-manager/nvim/after/ftplugin/python.vim new file mode 100644 index 0000000..6e6878f --- /dev/null +++ b/home-manager/nvim/after/ftplugin/python.vim @@ -0,0 +1,4 @@ +augroup auto_format + autocmd! + autocmd BufWritePre *.py silent! execute "%!yapf --style google" +augroup END -- 2.51.2 From 349f29cb9e0239889490737c77dccdf0b1912151 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 27 Feb 2022 11:39:58 +0900 Subject: [PATCH 027/589] :sparkles: add Go formatting --- home-manager/nvim/after/ftplugin/go.vim | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index dde6aaa..a33971e 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -1,3 +1,8 @@ +augroup go_format + autocmd! + autocmd BufWritePre *.go silent! execute "%!gofmt -s" +augroup END + inoremap ` `` iunmap ' -- 2.51.2 From 09d9e09815fe63be333383df3129d17ec27b64f1 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 27 Feb 2022 11:41:59 +0900 Subject: [PATCH 028/589] :bug: fix error on unmapping --- home-manager/nvim/after/ftplugin/go.vim | 2 +- home-manager/nvim/after/ftplugin/markdown.vim | 2 +- home-manager/nvim/after/ftplugin/text.vim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index a33971e..127ba18 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -5,6 +5,6 @@ augroup END inoremap ` `` -iunmap ' +iunmap ' packadd vim-goimports diff --git a/home-manager/nvim/after/ftplugin/markdown.vim b/home-manager/nvim/after/ftplugin/markdown.vim index 5557713..ef86ed6 100644 --- a/home-manager/nvim/after/ftplugin/markdown.vim +++ b/home-manager/nvim/after/ftplugin/markdown.vim @@ -1,4 +1,4 @@ -iunmap ' +iunmap ' setlocal spell setlocal spelllang=en_us,cjk diff --git a/home-manager/nvim/after/ftplugin/text.vim b/home-manager/nvim/after/ftplugin/text.vim index 5557713..ef86ed6 100644 --- a/home-manager/nvim/after/ftplugin/text.vim +++ b/home-manager/nvim/after/ftplugin/text.vim @@ -1,4 +1,4 @@ -iunmap ' +iunmap ' setlocal spell setlocal spelllang=en_us,cjk -- 2.51.2 From ec4e1dc3289b40eac89875629bedd1c3adca2d6d Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 27 Feb 2022 12:42:10 +0900 Subject: [PATCH 029/589] :bug: fix: unmap single quote if already mapped --- home-manager/nvim/after/ftplugin/go.vim | 5 ++++- home-manager/nvim/after/ftplugin/markdown.vim | 5 ++++- home-manager/nvim/after/ftplugin/text.vim | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index 127ba18..aa80e98 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -5,6 +5,9 @@ augroup END inoremap ` `` -iunmap ' +let s:mappings_insert = execute('imap') +if (stridx(s:mappings_insert, "''") != -1) + inoremap ' ' +endif packadd vim-goimports diff --git a/home-manager/nvim/after/ftplugin/markdown.vim b/home-manager/nvim/after/ftplugin/markdown.vim index ef86ed6..b4b107b 100644 --- a/home-manager/nvim/after/ftplugin/markdown.vim +++ b/home-manager/nvim/after/ftplugin/markdown.vim @@ -1,4 +1,7 @@ -iunmap ' +let s:mappings_insert = execute('imap') +if (stridx(s:mappings_insert, "''") != -1) + inoremap ' ' +endif setlocal spell setlocal spelllang=en_us,cjk diff --git a/home-manager/nvim/after/ftplugin/text.vim b/home-manager/nvim/after/ftplugin/text.vim index ef86ed6..b4b107b 100644 --- a/home-manager/nvim/after/ftplugin/text.vim +++ b/home-manager/nvim/after/ftplugin/text.vim @@ -1,4 +1,7 @@ -iunmap ' +let s:mappings_insert = execute('imap') +if (stridx(s:mappings_insert, "''") != -1) + inoremap ' ' +endif setlocal spell setlocal spelllang=en_us,cjk -- 2.51.2 From 02bdb027046e07cb1ff1cabfb1e10d879212b507 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 27 Feb 2022 12:52:07 +0900 Subject: [PATCH 030/589] :wrench: disable `nowrap` due to popup issue --- home-manager/nvim/init.vim | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index acbbd21..06180ea 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -42,7 +42,6 @@ set clipboard+=unnamedplus set lcs=eol:↲,tab:>_,trail:・ set list set number -set nowrap set shiftwidth=4 set showmatch set smartindent -- 2.51.2 From 8382b9c06893a8622382c0f9353600978118ee4a Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 27 Feb 2022 16:18:38 +0900 Subject: [PATCH 031/589] :wrench: improve: save cursor position when formatting --- home-manager/nvim/after/ftplugin/go.vim | 2 +- home-manager/nvim/after/ftplugin/python.vim | 2 +- home-manager/nvim/init.vim | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index aa80e98..3e91552 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -1,6 +1,6 @@ augroup go_format autocmd! - autocmd BufWritePre *.go silent! execute "%!gofmt -s" + autocmd BufWritePre *.go call FormatOnSave("%!gofmt -s") augroup END inoremap ` `` diff --git a/home-manager/nvim/after/ftplugin/python.vim b/home-manager/nvim/after/ftplugin/python.vim index 6e6878f..1f575df 100644 --- a/home-manager/nvim/after/ftplugin/python.vim +++ b/home-manager/nvim/after/ftplugin/python.vim @@ -1,4 +1,4 @@ augroup auto_format autocmd! - autocmd BufWritePre *.py silent! execute "%!yapf --style google" + autocmd BufWritePre *.py FormatOnSave("%!yapf --style google") augroup END diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 06180ea..de172c8 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -2,6 +2,12 @@ colorscheme slate filetype on +function! FormatOnSave(formatCommand) + let cursor = winsaveview() + silent! execute a:formatCommand + call winrestview(cursor) +endfunction + hi Comment ctermfg=244 hi LineNr ctermfg=240 hi LspErrorVirtualText ctermbg=9 -- 2.51.2 From 55ee4b0556ce346f6b32a48cc56c1409ab2965d8 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 27 Feb 2022 17:17:49 +0900 Subject: [PATCH 032/589] :wrench: HTML indention: follow Google's style guide --- home-manager/nvim/after/ftplugin/html.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/nvim/after/ftplugin/html.vim b/home-manager/nvim/after/ftplugin/html.vim index bd9d6ba..8722cf0 100644 --- a/home-manager/nvim/after/ftplugin/html.vim +++ b/home-manager/nvim/after/ftplugin/html.vim @@ -1 +1,4 @@ packadd emmet-vim + +set expandtab +set shiftwidth=2 -- 2.51.2 From a238db0405d7f9e2afb18d7b717b3a5db6d5a66a Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 27 Feb 2022 21:45:22 +0900 Subject: [PATCH 033/589] :wrench: sign git tags by default --- home-manager/nvim/spell/en.utf-8.add | 4 ++++ home-manager/nvim/spell/en.utf-8.add.spl | Bin 124 -> 174 bytes 2 files changed, 4 insertions(+) diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add index a11d73e..15b9920 100644 --- a/home-manager/nvim/spell/en.utf-8.add +++ b/home-manager/nvim/spell/en.utf-8.add @@ -6,3 +6,7 @@ Roboto Noto SIL OSS +OGP +JSON +http +localhost diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl index b11725f900ca0b71c558affeba1316ab41bfbae8..72e377d9422035ec33aac146606f3880a958aa7e 100644 GIT binary patch delta 151 zcmb04Zonv-MnpMim)kSirUBP(a3pnSDxI%6(lB4ZI_HX{RL31bN(BLjn0 z0b?;^K4Tsu6ANQLV=`kRV-8~mV?JXsSh9pMAEHb&pD7(IWKjT;umI^{WMJ@0V$1~d aL7FldOBhobix~?T6B(01qFSj8FaQ9@cN>oY literal 124 zcmWIZ^erw(&B-zP&%nUo&z_Q=mtRy|&X~zq%vi`+%2>?E#Kf4-n8TEq!kEX%$iN_! z&X~)X$XLXf&B(x*&sYK$%V#VGsbpcy2XQr%7&Ae%aSme!VV=7}YV*z6#V=_oo IJ(U3l0HviCTL1t6 -- 2.51.2 From 655310a3ea0d9c9e8332850fb0520fb4e7d694ae Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 28 Feb 2022 09:46:59 +0900 Subject: [PATCH 034/589] :wrench: markdown: auto complete `<>` --- home-manager/nvim/after/ftplugin/markdown.vim | 2 ++ home-manager/nvim/spell/en.utf-8.add | 1 + home-manager/nvim/spell/en.utf-8.add.spl | Bin 174 -> 218 bytes 3 files changed, 3 insertions(+) diff --git a/home-manager/nvim/after/ftplugin/markdown.vim b/home-manager/nvim/after/ftplugin/markdown.vim index b4b107b..5fb569c 100644 --- a/home-manager/nvim/after/ftplugin/markdown.vim +++ b/home-manager/nvim/after/ftplugin/markdown.vim @@ -3,6 +3,8 @@ if (stridx(s:mappings_insert, "''") != -1) inoremap ' ' endif +inoremap < <> + setlocal spell setlocal spelllang=en_us,cjk setlocal wrap diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add index 15b9920..d8985e5 100644 --- a/home-manager/nvim/spell/en.utf-8.add +++ b/home-manager/nvim/spell/en.utf-8.add @@ -10,3 +10,4 @@ OGP JSON http localhost +PowerShell diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl index 72e377d9422035ec33aac146606f3880a958aa7e..db526f96f905017ac32b501f62bd1e0425e12795 100644 GIT binary patch literal 218 zcmWIZ^erw(&B-zP&%nUY#+{O$k(HB|Ur?E#Kf4-n8TEq!kEX% z$iN_$&X~)X$XLXf&B(x5!dL`t4j75yaj2Vonj5&-sj7$xT`5;N}B*sh-Z3!|dld*&`m9dzy efH9FV86>Km%D})N#u&hu&j>Lf7;XRq7ytmZ)+o0C delta 130 zcmcb`xQTV? -- 2.51.2 From 68a44da456c9876aa8c4fb7e3783cc8da32cc45b Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 2 Mar 2022 06:14:03 +0900 Subject: [PATCH 035/589] :wrench: use space indention in SCSS --- home-manager/nvim/after/ftplugin/scss.vim | 3 +++ home-manager/nvim/spell/en.utf-8.add | 5 +++++ home-manager/nvim/spell/en.utf-8.add.spl | Bin 218 -> 270 bytes 3 files changed, 8 insertions(+) diff --git a/home-manager/nvim/after/ftplugin/scss.vim b/home-manager/nvim/after/ftplugin/scss.vim index e5bd015..86b3821 100644 --- a/home-manager/nvim/after/ftplugin/scss.vim +++ b/home-manager/nvim/after/ftplugin/scss.vim @@ -1 +1,4 @@ packadd vim-css-color + +set expandtab +set shiftwidth=2 diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add index d8985e5..2f7a31e 100644 --- a/home-manager/nvim/spell/en.utf-8.add +++ b/home-manager/nvim/spell/en.utf-8.add @@ -11,3 +11,8 @@ JSON http localhost PowerShell +CSV +Netlify +shortcode +shortcodes +CSS diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl index db526f96f905017ac32b501f62bd1e0425e12795..d5c731451c2047b8260c241e1b1ecb88b0077b43 100644 GIT binary patch delta 203 zcmcb`*vF(6=IL8pkeZWY^q+x&VJ%N`N_s|CPF{XNQE@qAF;j6FBNGcF6U#&?sc40C z#$3ik#v;aSMh3 Date: Wed, 2 Mar 2022 06:16:32 +0900 Subject: [PATCH 036/589] :wrench: disable copying when press `d` on visual mode --- home-manager/nvim/init.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index de172c8..a077608 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -61,3 +61,5 @@ set tabstop=4 syntax on tnoremap + +vnoremap d "_d -- 2.51.2 From fbfffde52c435b1ca63049a3758bc68f04dce112 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 3 Mar 2022 13:10:34 +0900 Subject: [PATCH 037/589] :sparkles: plugin: add dstein64/nvim-scrollview --- home-manager/nvim/init.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index a077608..7919310 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -41,6 +41,8 @@ function! NewlineInBrackets() endfunction inoremap NewlineInBrackets() +let g:scrollview_column = 1 + nnoremap d "_d set autoindent @@ -54,7 +56,7 @@ set smartindent set splitright let eol = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} -set statusline=%f%m%=%{eol[&fileformat]}\ [%l\ %c\ %P] +set statusline=%f%m%=%{eol[&fileformat]} set tabstop=4 -- 2.51.2 From 1d01a74ffd72105a70407bcaf371b5ec8e32ac23 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 3 Mar 2022 16:41:27 +0900 Subject: [PATCH 038/589] :hammer: remove `smartindent` --- home-manager/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 7919310..fc42748 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -1,6 +1,7 @@ colorscheme slate filetype on +filetype plugin indent on function! FormatOnSave(formatCommand) let cursor = winsaveview() @@ -52,7 +53,6 @@ set list set number set shiftwidth=4 set showmatch -set smartindent set splitright let eol = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} -- 2.51.2 From e9ee7591875ddef975d8c4111849e32e4edfe6be Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 3 Mar 2022 16:49:09 +0900 Subject: [PATCH 039/589] :hammer: use `highlight` instead of `hi` --- home-manager/nvim/init.vim | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index fc42748..9c72a4a 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -9,18 +9,18 @@ function! FormatOnSave(formatCommand) call winrestview(cursor) endfunction -hi Comment ctermfg=244 -hi LineNr ctermfg=240 -hi LspErrorVirtualText ctermbg=9 -hi ModeMsg ctermfg=248 -hi Nontext ctermfg=240 -hi Pmenu ctermbg=236 ctermfg=248 -hi PmenuSel ctermbg=240 ctermfg=255 -hi SpecialKey ctermfg=240 -hi StatusLine cterm=NONE ctermbg=12 ctermfg=252 -hi TabLine cterm=NONE ctermbg=238 ctermfg=248 -hi TabLineFill cterm=NONE ctermbg=238 -hi Underlined ctermfg=6 +highlight Comment ctermfg=244 +highlight LineNr ctermfg=240 +highlight LspErrorVirtualText ctermbg=9 +highlight ModeMsg ctermfg=248 +highlight Nontext ctermfg=240 +highlight Pmenu ctermbg=236 ctermfg=248 +highlight PmenuSel ctermbg=240 ctermfg=255 +highlight SpecialKey ctermfg=240 +highlight StatusLine cterm=NONE ctermbg=12 ctermfg=252 +highlight TabLine cterm=NONE ctermbg=238 ctermfg=248 +highlight TabLineFill cterm=NONE ctermbg=238 +highlight Underlined ctermfg=6 inoremap ( () inoremap { {} -- 2.51.2 From 22c366587bc83cea74e1820a315474f721595f0c Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 3 Mar 2022 16:55:44 +0900 Subject: [PATCH 040/589] :wrench: use `relativenumber` --- home-manager/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 9c72a4a..6734847 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -50,7 +50,7 @@ set autoindent set clipboard+=unnamedplus set lcs=eol:↲,tab:>_,trail:・ set list -set number +set relativenumber set shiftwidth=4 set showmatch set splitright -- 2.51.2 From 3907c3f5463173f682a4cb663ad225fc1b94ce39 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 13 Mar 2022 07:44:25 +0900 Subject: [PATCH 041/589] :sparkles: plugin: add `itchyny/vim-gitbranch` --- home-manager/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 6734847..89b4991 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -56,7 +56,7 @@ set showmatch set splitright let eol = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} -set statusline=%f%m%=%{eol[&fileformat]} +set statusline=%f%m\ (%{gitbranch#name()})%=%{eol[&fileformat]} set tabstop=4 -- 2.51.2 From 82ae3dc20817fd93915e4018457900efbc456b2f Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 21 Mar 2022 15:10:31 +0900 Subject: [PATCH 042/589] :sparkles: add setting for typescriptreact --- .../nvim/after/ftplugin/typescriptreact.vim | 1 + home-manager/nvim/spell/en.utf-8.add | 2 ++ home-manager/nvim/spell/en.utf-8.add.spl | Bin 270 -> 315 bytes 3 files changed, 3 insertions(+) create mode 100644 home-manager/nvim/after/ftplugin/typescriptreact.vim diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.vim b/home-manager/nvim/after/ftplugin/typescriptreact.vim new file mode 100644 index 0000000..754822a --- /dev/null +++ b/home-manager/nvim/after/ftplugin/typescriptreact.vim @@ -0,0 +1 @@ +let g:lsp_settings_filetype_typescriptreact = ['typescript-language-server', 'deno'] diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add index 2f7a31e..7f36af8 100644 --- a/home-manager/nvim/spell/en.utf-8.add +++ b/home-manager/nvim/spell/en.utf-8.add @@ -16,3 +16,5 @@ Netlify shortcode shortcodes CSS +Zenn +AtCoder diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl index d5c731451c2047b8260c241e1b1ecb88b0077b43..cff16a0423dbfce4485efa933da59dc70b736827 100644 GIT binary patch literal 315 zcmWIZ^erw(&B-zP&%nTNkS{SgB|Rf6CojLCsJOg}v4k<1F`qGoF_p21k*R^Pn5npo zk%^43 zQ4V%XF=GZ}Dq{{vR62(-pD_upuS7#SHD6w(=U850?c7_%7}7)uySKw_o^jKz%kAeKlTV?JXtV Date: Mon, 21 Mar 2022 15:25:09 +0900 Subject: [PATCH 043/589] :wrench: use space indentation for TypeScript --- home-manager/nvim/after/ftplugin/typescript.vim | 3 +++ home-manager/nvim/after/ftplugin/typescriptreact.vim | 3 +++ 2 files changed, 6 insertions(+) diff --git a/home-manager/nvim/after/ftplugin/typescript.vim b/home-manager/nvim/after/ftplugin/typescript.vim index 52817c9..270648f 100644 --- a/home-manager/nvim/after/ftplugin/typescript.vim +++ b/home-manager/nvim/after/ftplugin/typescript.vim @@ -1 +1,4 @@ let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] + +set expandtab +set shiftwidth=2 diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.vim b/home-manager/nvim/after/ftplugin/typescriptreact.vim index 754822a..309007d 100644 --- a/home-manager/nvim/after/ftplugin/typescriptreact.vim +++ b/home-manager/nvim/after/ftplugin/typescriptreact.vim @@ -1 +1,4 @@ let g:lsp_settings_filetype_typescriptreact = ['typescript-language-server', 'deno'] + +set expandtab +set shiftwidth=2 -- 2.51.2 From f1d081c9e461c169de825d2598829fd5dec04641 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 22 Mar 2022 08:18:50 +0900 Subject: [PATCH 044/589] :wrench: use emmet-vim in React --- home-manager/nvim/after/ftplugin/typescriptreact.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.vim b/home-manager/nvim/after/ftplugin/typescriptreact.vim index 309007d..8ed4bf2 100644 --- a/home-manager/nvim/after/ftplugin/typescriptreact.vim +++ b/home-manager/nvim/after/ftplugin/typescriptreact.vim @@ -1,4 +1,6 @@ let g:lsp_settings_filetype_typescriptreact = ['typescript-language-server', 'deno'] +packadd emmet-vim + set expandtab set shiftwidth=2 -- 2.51.2 From c69fb3ced21c703470a9c50669990fbfe0e71d90 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 24 Mar 2022 13:52:13 +0900 Subject: [PATCH 045/589] :wrench: use spaces for JSON indention --- home-manager/nvim/after/ftplugin/json.vim | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 home-manager/nvim/after/ftplugin/json.vim diff --git a/home-manager/nvim/after/ftplugin/json.vim b/home-manager/nvim/after/ftplugin/json.vim new file mode 100644 index 0000000..33173f0 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/json.vim @@ -0,0 +1,2 @@ +set expandtab +set shiftwidth=2 -- 2.51.2 From 1f5e598adad6e778b1197cd3a3d67e5235ae63db Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 26 Mar 2022 15:18:13 +0900 Subject: [PATCH 046/589] :hammer: use `setlocal` in ftplugin --- home-manager/nvim/after/ftplugin/html.vim | 4 ++-- home-manager/nvim/after/ftplugin/json.vim | 4 ++-- home-manager/nvim/after/ftplugin/scss.vim | 4 ++-- home-manager/nvim/after/ftplugin/typescript.vim | 4 ++-- home-manager/nvim/after/ftplugin/typescriptreact.vim | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/html.vim b/home-manager/nvim/after/ftplugin/html.vim index 8722cf0..456ce7f 100644 --- a/home-manager/nvim/after/ftplugin/html.vim +++ b/home-manager/nvim/after/ftplugin/html.vim @@ -1,4 +1,4 @@ packadd emmet-vim -set expandtab -set shiftwidth=2 +setlocal expandtab +setlocal shiftwidth=2 diff --git a/home-manager/nvim/after/ftplugin/json.vim b/home-manager/nvim/after/ftplugin/json.vim index 33173f0..43b80f0 100644 --- a/home-manager/nvim/after/ftplugin/json.vim +++ b/home-manager/nvim/after/ftplugin/json.vim @@ -1,2 +1,2 @@ -set expandtab -set shiftwidth=2 +setlocal expandtab +setlocal shiftwidth=2 diff --git a/home-manager/nvim/after/ftplugin/scss.vim b/home-manager/nvim/after/ftplugin/scss.vim index 86b3821..1906963 100644 --- a/home-manager/nvim/after/ftplugin/scss.vim +++ b/home-manager/nvim/after/ftplugin/scss.vim @@ -1,4 +1,4 @@ packadd vim-css-color -set expandtab -set shiftwidth=2 +setlocal expandtab +setlocal shiftwidth=2 diff --git a/home-manager/nvim/after/ftplugin/typescript.vim b/home-manager/nvim/after/ftplugin/typescript.vim index 270648f..cc9e657 100644 --- a/home-manager/nvim/after/ftplugin/typescript.vim +++ b/home-manager/nvim/after/ftplugin/typescript.vim @@ -1,4 +1,4 @@ let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] -set expandtab -set shiftwidth=2 +setlocal expandtab +setlocal shiftwidth=2 diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.vim b/home-manager/nvim/after/ftplugin/typescriptreact.vim index 8ed4bf2..c808a55 100644 --- a/home-manager/nvim/after/ftplugin/typescriptreact.vim +++ b/home-manager/nvim/after/ftplugin/typescriptreact.vim @@ -2,5 +2,5 @@ let g:lsp_settings_filetype_typescriptreact = ['typescript-language-server', 'de packadd emmet-vim -set expandtab -set shiftwidth=2 +setlocal expandtab +setlocal shiftwidth=2 -- 2.51.2 From 8acdb6dc858134fb22be08634159b7ad6842c5d4 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 28 Mar 2022 09:50:12 +0900 Subject: [PATCH 047/589] :bug: don't show parentheses if not in git directory --- home-manager/nvim/init.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 89b4991..449a02c 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -55,8 +55,12 @@ set shiftwidth=4 set showmatch set splitright +let branch = printf(' (%s)', gitbranch#name()) +if (branch == ' ()') + let branch = '' +endif let eol = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} -set statusline=%f%m\ (%{gitbranch#name()})%=%{eol[&fileformat]} +set statusline=%f%m%{branch}%=%{eol[&fileformat]} set tabstop=4 -- 2.51.2 From 4d4d2922a38d159842f16de6be5507202158e544 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 13 Apr 2022 16:38:50 +0900 Subject: [PATCH 048/589] Use built-in LSP client --- home-manager/nvim/after/ftplugin/lua.lua | 12 +++++++++++ .../nvim/after/ftplugin/typescript.vim | 2 -- .../nvim/after/ftplugin/typescriptreact.vim | 2 -- home-manager/nvim/init.vim | 3 ++- home-manager/nvim/lua/config.lua | 21 +++++++++++++++++++ 5 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 home-manager/nvim/after/ftplugin/lua.lua create mode 100644 home-manager/nvim/lua/config.lua diff --git a/home-manager/nvim/after/ftplugin/lua.lua b/home-manager/nvim/after/ftplugin/lua.lua new file mode 100644 index 0000000..c262085 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/lua.lua @@ -0,0 +1,12 @@ +LspConfig.sumneko_lua.setup { + settings = { + Lua = { + diagnostics = { + globals = { 'vim' } + } + } + } +} + +vim.opt_local.expandtab = true +vim.opt_local.shiftwidth = 2 diff --git a/home-manager/nvim/after/ftplugin/typescript.vim b/home-manager/nvim/after/ftplugin/typescript.vim index cc9e657..43b80f0 100644 --- a/home-manager/nvim/after/ftplugin/typescript.vim +++ b/home-manager/nvim/after/ftplugin/typescript.vim @@ -1,4 +1,2 @@ -let g:lsp_settings_filetype_typescript = ['typescript-language-server', 'deno'] - setlocal expandtab setlocal shiftwidth=2 diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.vim b/home-manager/nvim/after/ftplugin/typescriptreact.vim index c808a55..456ce7f 100644 --- a/home-manager/nvim/after/ftplugin/typescriptreact.vim +++ b/home-manager/nvim/after/ftplugin/typescriptreact.vim @@ -1,5 +1,3 @@ -let g:lsp_settings_filetype_typescriptreact = ['typescript-language-server', 'deno'] - packadd emmet-vim setlocal expandtab diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 449a02c..490bef8 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -11,7 +11,6 @@ endfunction highlight Comment ctermfg=244 highlight LineNr ctermfg=240 -highlight LspErrorVirtualText ctermbg=9 highlight ModeMsg ctermfg=248 highlight Nontext ctermfg=240 highlight Pmenu ctermbg=236 ctermfg=248 @@ -44,6 +43,8 @@ inoremap NewlineInBrackets() let g:scrollview_column = 1 +lua require('config') + nnoremap d "_d set autoindent diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua new file mode 100644 index 0000000..7551699 --- /dev/null +++ b/home-manager/nvim/lua/config.lua @@ -0,0 +1,21 @@ +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + +require('cmp').setup { + sources = { + { name = 'nvim_lsp' } + } +} + +LspConfig = require('lspconfig') +local servers = { + 'denols', + 'gopls', + 'sumneko_lua' +} + +for _, lsp in ipairs(servers) do + LspConfig[lsp].setup { + capabilities = capabilities + } +end -- 2.51.2 From 2359efa0b03a2cde7c1eae6571db3a907f412b34 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 13 Apr 2022 18:08:27 +0900 Subject: [PATCH 049/589] Remove configs enabled by default --- home-manager/nvim/init.vim | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 490bef8..8678e9c 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -1,7 +1,6 @@ colorscheme slate filetype on -filetype plugin indent on function! FormatOnSave(formatCommand) let cursor = winsaveview() @@ -47,7 +46,6 @@ lua require('config') nnoremap d "_d -set autoindent set clipboard+=unnamedplus set lcs=eol:↲,tab:>_,trail:・ set list @@ -65,8 +63,6 @@ set statusline=%f%m%{branch}%=%{eol[&fileformat]} set tabstop=4 -syntax on - tnoremap vnoremap d "_d -- 2.51.2 From 77e9055ab0e46df34cb97f12842f830cbaacc962 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 13 Apr 2022 19:16:52 +0900 Subject: [PATCH 050/589] Change `colorscheme` to Mofiqul/vscode.nvim https://github.com/Mofiqul/vscode.nvim --- home-manager/nvim/init.vim | 14 -------------- home-manager/nvim/lua/config.lua | 3 +++ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 8678e9c..c4b3b3e 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -1,5 +1,3 @@ -colorscheme slate - filetype on function! FormatOnSave(formatCommand) @@ -8,18 +6,6 @@ function! FormatOnSave(formatCommand) call winrestview(cursor) endfunction -highlight Comment ctermfg=244 -highlight LineNr ctermfg=240 -highlight ModeMsg ctermfg=248 -highlight Nontext ctermfg=240 -highlight Pmenu ctermbg=236 ctermfg=248 -highlight PmenuSel ctermbg=240 ctermfg=255 -highlight SpecialKey ctermfg=240 -highlight StatusLine cterm=NONE ctermbg=12 ctermfg=252 -highlight TabLine cterm=NONE ctermbg=238 ctermfg=248 -highlight TabLineFill cterm=NONE ctermbg=238 -highlight Underlined ctermfg=6 - inoremap ( () inoremap { {} inoremap [ [] diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 7551699..0c8bab6 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -19,3 +19,6 @@ for _, lsp in ipairs(servers) do capabilities = capabilities } end + +vim.api.nvim_set_var('vscode_style', 'dark') +vim.cmd('colorscheme vscode') -- 2.51.2 From 47e331c5d675d2c29f7087d057fdb408d52b2526 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 14 Apr 2022 11:18:48 +0900 Subject: [PATCH 051/589] Use nvim-treesitter --- home-manager/nvim/lua/config.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 0c8bab6..38290a5 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -13,12 +13,17 @@ local servers = { 'gopls', 'sumneko_lua' } - for _, lsp in ipairs(servers) do LspConfig[lsp].setup { capabilities = capabilities } end +require('nvim-treesitter.configs').setup { + highlight = { + enable = true + } +} + vim.api.nvim_set_var('vscode_style', 'dark') vim.cmd('colorscheme vscode') -- 2.51.2 From 97ce0ed4cce90921b65b22a6eb5126312dc5d1c9 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 14 Apr 2022 11:36:11 +0900 Subject: [PATCH 052/589] Disable spell check --- home-manager/nvim/after/ftplugin/markdown.vim | 2 -- home-manager/nvim/after/ftplugin/text.vim | 2 -- home-manager/nvim/spell/en.utf-8.add | 20 ------------------ home-manager/nvim/spell/en.utf-8.add.spl | Bin 315 -> 0 bytes 4 files changed, 24 deletions(-) delete mode 100644 home-manager/nvim/spell/en.utf-8.add delete mode 100644 home-manager/nvim/spell/en.utf-8.add.spl diff --git a/home-manager/nvim/after/ftplugin/markdown.vim b/home-manager/nvim/after/ftplugin/markdown.vim index 5fb569c..18fce0c 100644 --- a/home-manager/nvim/after/ftplugin/markdown.vim +++ b/home-manager/nvim/after/ftplugin/markdown.vim @@ -5,6 +5,4 @@ endif inoremap < <> -setlocal spell -setlocal spelllang=en_us,cjk setlocal wrap diff --git a/home-manager/nvim/after/ftplugin/text.vim b/home-manager/nvim/after/ftplugin/text.vim index b4b107b..705ee97 100644 --- a/home-manager/nvim/after/ftplugin/text.vim +++ b/home-manager/nvim/after/ftplugin/text.vim @@ -3,6 +3,4 @@ if (stridx(s:mappings_insert, "''") != -1) inoremap ' ' endif -setlocal spell -setlocal spelllang=en_us,cjk setlocal wrap diff --git a/home-manager/nvim/spell/en.utf-8.add b/home-manager/nvim/spell/en.utf-8.add deleted file mode 100644 index 7f36af8..0000000 --- a/home-manager/nvim/spell/en.utf-8.add +++ /dev/null @@ -1,20 +0,0 @@ -whitespace -goldmark -Disqus -Golang -Roboto -Noto -SIL -OSS -OGP -JSON -http -localhost -PowerShell -CSV -Netlify -shortcode -shortcodes -CSS -Zenn -AtCoder diff --git a/home-manager/nvim/spell/en.utf-8.add.spl b/home-manager/nvim/spell/en.utf-8.add.spl deleted file mode 100644 index cff16a0423dbfce4485efa933da59dc70b736827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmWIZ^erw(&B-zP&%nTNkS{SgB|Rf6CojLCsJOg}v4k<1F`qGoF_p21k*R^Pn5npo zk%^43 zQ4V%XF=GZ}Dq{{vR62(-pD_u Date: Thu, 14 Apr 2022 19:29:41 +0900 Subject: [PATCH 053/589] Disable wrap --- home-manager/nvim/lua/config.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 38290a5..59776f6 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -27,3 +27,4 @@ require('nvim-treesitter.configs').setup { vim.api.nvim_set_var('vscode_style', 'dark') vim.cmd('colorscheme vscode') +vim.opt.wrap = false -- 2.51.2 From e5683772ad6f80142e3850ea2ad537886d40c84f Mon Sep 17 00:00:00 2001 From: akimon658 Date: Fri, 22 Apr 2022 15:18:19 +0900 Subject: [PATCH 054/589] Enable tab completion by luasnip --- home-manager/nvim/lua/config.lua | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 59776f6..26ffad5 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -1,8 +1,20 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) -require('cmp').setup { +local cmp = require('cmp') +cmp.setup { + mapping = { + [''] = cmp.mapping.confirm { + select = true + } + }, + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end + }, sources = { + { name = 'luasnip' }, { name = 'nvim_lsp' } } } -- 2.51.2 From b956008407dc513bbcdad91afa3baf0b4f6c4c47 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 23 Apr 2022 06:52:32 +0900 Subject: [PATCH 055/589] Use jiangmiao/auto-pairs https://github.com/jiangmiao/auto-pairs --- home-manager/nvim/after/ftplugin/go.vim | 7 +------ home-manager/nvim/after/ftplugin/markdown.vim | 7 +------ home-manager/nvim/after/ftplugin/text.vim | 5 +---- home-manager/nvim/init.vim | 20 ------------------- 4 files changed, 3 insertions(+), 36 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index 3e91552..7742b21 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -3,11 +3,6 @@ augroup go_format autocmd BufWritePre *.go call FormatOnSave("%!gofmt -s") augroup END -inoremap ` `` - -let s:mappings_insert = execute('imap') -if (stridx(s:mappings_insert, "''") != -1) - inoremap ' ' -endif +let b:AutoPairs = AutoPairsDefine({}, ["'"]) packadd vim-goimports diff --git a/home-manager/nvim/after/ftplugin/markdown.vim b/home-manager/nvim/after/ftplugin/markdown.vim index 18fce0c..668764c 100644 --- a/home-manager/nvim/after/ftplugin/markdown.vim +++ b/home-manager/nvim/after/ftplugin/markdown.vim @@ -1,8 +1,3 @@ -let s:mappings_insert = execute('imap') -if (stridx(s:mappings_insert, "''") != -1) - inoremap ' ' -endif - -inoremap < <> +let b:AutoPairs = AutoPairsDefine({'{{<' : '>}}'}, ["'"]) setlocal wrap diff --git a/home-manager/nvim/after/ftplugin/text.vim b/home-manager/nvim/after/ftplugin/text.vim index 705ee97..19fffec 100644 --- a/home-manager/nvim/after/ftplugin/text.vim +++ b/home-manager/nvim/after/ftplugin/text.vim @@ -1,6 +1,3 @@ -let s:mappings_insert = execute('imap') -if (stridx(s:mappings_insert, "''") != -1) - inoremap ' ' -endif +let s:AutoPairs = AutoPairsDefine({}, ["'"]) setlocal wrap diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index c4b3b3e..784a8d4 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -6,26 +6,6 @@ function! FormatOnSave(formatCommand) call winrestview(cursor) endfunction -inoremap ( () -inoremap { {} -inoremap [ [] -inoremap ' '' -inoremap " "" - -function! NewlineInBrackets() - let open = getline(".")[col(".")-2] - let close = getline(".")[col(".")-1] - - let key = "\" - - if (open == "{" && close == "}") || (open == "(" && close == ")") || (open == "[" && close == "]") - let key .= "\\" - endif - - return key -endfunction -inoremap NewlineInBrackets() - let g:scrollview_column = 1 lua require('config') -- 2.51.2 From 9c879a05d8f18e69584a5a6a7a8b363de1e53fbf Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 23 Apr 2022 08:11:21 +0900 Subject: [PATCH 056/589] lsp: Add `cssls` --- home-manager/nvim/lua/config.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 26ffad5..994511a 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -1,5 +1,6 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +capabilities.textDocument.completion.completionItem.snippetSupport = true local cmp = require('cmp') cmp.setup { @@ -21,6 +22,7 @@ cmp.setup { LspConfig = require('lspconfig') local servers = { + 'cssls', 'denols', 'gopls', 'sumneko_lua' -- 2.51.2 From 04e7feee509972bc8ccd6624d495f1283661291b Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 24 Apr 2022 07:52:26 +0900 Subject: [PATCH 057/589] Temporary disabe ap/vim-css-color as it doesn't support Treesitter --- home-manager/nvim/after/ftplugin/css.lua | 2 ++ home-manager/nvim/after/ftplugin/css.vim | 1 - home-manager/nvim/after/ftplugin/scss.lua | 2 ++ home-manager/nvim/after/ftplugin/scss.vim | 4 ---- 4 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 home-manager/nvim/after/ftplugin/css.lua delete mode 100644 home-manager/nvim/after/ftplugin/css.vim create mode 100644 home-manager/nvim/after/ftplugin/scss.lua delete mode 100644 home-manager/nvim/after/ftplugin/scss.vim diff --git a/home-manager/nvim/after/ftplugin/css.lua b/home-manager/nvim/after/ftplugin/css.lua new file mode 100644 index 0000000..7307b61 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/css.lua @@ -0,0 +1,2 @@ +vim.opt_local.expandtab = true +vim.opt_local.shiftwidth = 2 diff --git a/home-manager/nvim/after/ftplugin/css.vim b/home-manager/nvim/after/ftplugin/css.vim deleted file mode 100644 index e5bd015..0000000 --- a/home-manager/nvim/after/ftplugin/css.vim +++ /dev/null @@ -1 +0,0 @@ -packadd vim-css-color diff --git a/home-manager/nvim/after/ftplugin/scss.lua b/home-manager/nvim/after/ftplugin/scss.lua new file mode 100644 index 0000000..7307b61 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/scss.lua @@ -0,0 +1,2 @@ +vim.opt_local.expandtab = true +vim.opt_local.shiftwidth = 2 diff --git a/home-manager/nvim/after/ftplugin/scss.vim b/home-manager/nvim/after/ftplugin/scss.vim deleted file mode 100644 index 1906963..0000000 --- a/home-manager/nvim/after/ftplugin/scss.vim +++ /dev/null @@ -1,4 +0,0 @@ -packadd vim-css-color - -setlocal expandtab -setlocal shiftwidth=2 -- 2.51.2 From 375c6261a1be039bfefb26d6aecd544e5f15b264 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 28 Apr 2022 07:54:03 +0900 Subject: [PATCH 058/589] Merge akimon658/nvim-plugins into akimon658/.config --- home-manager/nvim/pack/plugins/opt/emmet-vim | 1 + home-manager/nvim/pack/plugins/opt/vim-css-color | 1 + home-manager/nvim/pack/plugins/opt/vim-goimports | 1 + home-manager/nvim/pack/plugins/opt/vscode.nvim | 1 + home-manager/nvim/pack/plugins/start/LuaSnip | 1 + home-manager/nvim/pack/plugins/start/auto-pairs | 1 + home-manager/nvim/pack/plugins/start/cmp-nvim-lsp | 1 + home-manager/nvim/pack/plugins/start/cmp_luasnip | 1 + home-manager/nvim/pack/plugins/start/fzf | 1 + home-manager/nvim/pack/plugins/start/fzf.vim | 1 + home-manager/nvim/pack/plugins/start/mkdir.nvim | 1 + home-manager/nvim/pack/plugins/start/nvim-cmp | 1 + home-manager/nvim/pack/plugins/start/nvim-lspconfig | 1 + home-manager/nvim/pack/plugins/start/nvim-scrollview | 1 + home-manager/nvim/pack/plugins/start/nvim-treesitter | 1 + home-manager/nvim/pack/plugins/start/vim-gitbranch | 1 + home-manager/nvim/pack/plugins/start/vscode.nvim | 1 + 17 files changed, 17 insertions(+) create mode 160000 home-manager/nvim/pack/plugins/opt/emmet-vim create mode 160000 home-manager/nvim/pack/plugins/opt/vim-css-color create mode 160000 home-manager/nvim/pack/plugins/opt/vim-goimports create mode 160000 home-manager/nvim/pack/plugins/opt/vscode.nvim create mode 160000 home-manager/nvim/pack/plugins/start/LuaSnip create mode 160000 home-manager/nvim/pack/plugins/start/auto-pairs create mode 160000 home-manager/nvim/pack/plugins/start/cmp-nvim-lsp create mode 160000 home-manager/nvim/pack/plugins/start/cmp_luasnip create mode 160000 home-manager/nvim/pack/plugins/start/fzf create mode 160000 home-manager/nvim/pack/plugins/start/fzf.vim create mode 160000 home-manager/nvim/pack/plugins/start/mkdir.nvim create mode 160000 home-manager/nvim/pack/plugins/start/nvim-cmp create mode 160000 home-manager/nvim/pack/plugins/start/nvim-lspconfig create mode 160000 home-manager/nvim/pack/plugins/start/nvim-scrollview create mode 160000 home-manager/nvim/pack/plugins/start/nvim-treesitter create mode 160000 home-manager/nvim/pack/plugins/start/vim-gitbranch create mode 160000 home-manager/nvim/pack/plugins/start/vscode.nvim diff --git a/home-manager/nvim/pack/plugins/opt/emmet-vim b/home-manager/nvim/pack/plugins/opt/emmet-vim new file mode 160000 index 0000000..def5d57 --- /dev/null +++ b/home-manager/nvim/pack/plugins/opt/emmet-vim @@ -0,0 +1 @@ +Subproject commit def5d57a1ae5afb1b96ebe83c4652d1c03640f4d diff --git a/home-manager/nvim/pack/plugins/opt/vim-css-color b/home-manager/nvim/pack/plugins/opt/vim-css-color new file mode 160000 index 0000000..8bf9436 --- /dev/null +++ b/home-manager/nvim/pack/plugins/opt/vim-css-color @@ -0,0 +1 @@ +Subproject commit 8bf943681f92c81a8cca19762a1ccec8bc29098a diff --git a/home-manager/nvim/pack/plugins/opt/vim-goimports b/home-manager/nvim/pack/plugins/opt/vim-goimports new file mode 160000 index 0000000..5db0dcf --- /dev/null +++ b/home-manager/nvim/pack/plugins/opt/vim-goimports @@ -0,0 +1 @@ +Subproject commit 5db0dcf7a11f6b5b89169b2e13aa7a376312cafc diff --git a/home-manager/nvim/pack/plugins/opt/vscode.nvim b/home-manager/nvim/pack/plugins/opt/vscode.nvim new file mode 160000 index 0000000..4dd664d --- /dev/null +++ b/home-manager/nvim/pack/plugins/opt/vscode.nvim @@ -0,0 +1 @@ +Subproject commit 4dd664d331537f8e83f393dac0601e7fbc8e00b4 diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip new file mode 160000 index 0000000..0e91391 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -0,0 +1 @@ +Subproject commit 0e9139119d3ca4b858ad7c181c72a97932699b9c diff --git a/home-manager/nvim/pack/plugins/start/auto-pairs b/home-manager/nvim/pack/plugins/start/auto-pairs new file mode 160000 index 0000000..39f06b8 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/auto-pairs @@ -0,0 +1 @@ +Subproject commit 39f06b873a8449af8ff6a3eee716d3da14d63a76 diff --git a/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp b/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp new file mode 160000 index 0000000..ebdfc20 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp @@ -0,0 +1 @@ +Subproject commit ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba diff --git a/home-manager/nvim/pack/plugins/start/cmp_luasnip b/home-manager/nvim/pack/plugins/start/cmp_luasnip new file mode 160000 index 0000000..b108297 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/cmp_luasnip @@ -0,0 +1 @@ +Subproject commit b10829736542e7cc9291e60bab134df1273165c9 diff --git a/home-manager/nvim/pack/plugins/start/fzf b/home-manager/nvim/pack/plugins/start/fzf new file mode 160000 index 0000000..a91a676 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/fzf @@ -0,0 +1 @@ +Subproject commit a91a67668e0830a8cf9a792c4949e03b4189f097 diff --git a/home-manager/nvim/pack/plugins/start/fzf.vim b/home-manager/nvim/pack/plugins/start/fzf.vim new file mode 160000 index 0000000..d5f1f86 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/fzf.vim @@ -0,0 +1 @@ +Subproject commit d5f1f8641b24c0fd5b10a299824362a2a1b20ae0 diff --git a/home-manager/nvim/pack/plugins/start/mkdir.nvim b/home-manager/nvim/pack/plugins/start/mkdir.nvim new file mode 160000 index 0000000..0126165 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/mkdir.nvim @@ -0,0 +1 @@ +Subproject commit 01261650382bef195dab8ac39344234b57914f09 diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp new file mode 160000 index 0000000..433af3d --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -0,0 +1 @@ +Subproject commit 433af3dffce64cbd3f99bdac9734768a6cc41951 diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig new file mode 160000 index 0000000..86df1c8 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -0,0 +1 @@ +Subproject commit 86df1c83ec69e5bbcde48de74c440b71a629b2f6 diff --git a/home-manager/nvim/pack/plugins/start/nvim-scrollview b/home-manager/nvim/pack/plugins/start/nvim-scrollview new file mode 160000 index 0000000..ba6c48b --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/nvim-scrollview @@ -0,0 +1 @@ +Subproject commit ba6c48bf7919dd48a371e7b9c683b8858053e885 diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter new file mode 160000 index 0000000..502e010 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -0,0 +1 @@ +Subproject commit 502e010d30ff4eac9abdbc73f6a7fc275d28d1ed diff --git a/home-manager/nvim/pack/plugins/start/vim-gitbranch b/home-manager/nvim/pack/plugins/start/vim-gitbranch new file mode 160000 index 0000000..1a8ba86 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/vim-gitbranch @@ -0,0 +1 @@ +Subproject commit 1a8ba866f3eaf0194783b9f8573339d6ede8f1ed diff --git a/home-manager/nvim/pack/plugins/start/vscode.nvim b/home-manager/nvim/pack/plugins/start/vscode.nvim new file mode 160000 index 0000000..4dd664d --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/vscode.nvim @@ -0,0 +1 @@ +Subproject commit 4dd664d331537f8e83f393dac0601e7fbc8e00b4 -- 2.51.2 From 85a81a766b947fbccaf30e804ffb94180635816e Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 28 Apr 2022 08:15:50 +0900 Subject: [PATCH 059/589] fix: Delete opt/vscode.nvim --- home-manager/nvim/pack/plugins/opt/vscode.nvim | 1 - 1 file changed, 1 deletion(-) delete mode 160000 home-manager/nvim/pack/plugins/opt/vscode.nvim diff --git a/home-manager/nvim/pack/plugins/opt/vscode.nvim b/home-manager/nvim/pack/plugins/opt/vscode.nvim deleted file mode 160000 index 4dd664d..0000000 --- a/home-manager/nvim/pack/plugins/opt/vscode.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4dd664d331537f8e83f393dac0601e7fbc8e00b4 -- 2.51.2 From f59fc1514bc2758fbbfcf02a35fb5696ebcc3583 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 07:34:21 +0000 Subject: [PATCH 060/589] :arrow_up: Bump nvim/pack/plugins/start/cmp_luasnip Bumps [nvim/pack/plugins/start/cmp_luasnip](https://github.com/saadparwaiz1/cmp_luasnip) from `b108297` to `a9de941`. - [Release notes](https://github.com/saadparwaiz1/cmp_luasnip/releases) - [Commits](https://github.com/saadparwaiz1/cmp_luasnip/compare/b10829736542e7cc9291e60bab134df1273165c9...a9de941bcbda508d0a45d28ae366bb3f08db2e36) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/cmp_luasnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/cmp_luasnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/cmp_luasnip b/home-manager/nvim/pack/plugins/start/cmp_luasnip index b108297..a9de941 160000 --- a/home-manager/nvim/pack/plugins/start/cmp_luasnip +++ b/home-manager/nvim/pack/plugins/start/cmp_luasnip @@ -1 +1 @@ -Subproject commit b10829736542e7cc9291e60bab134df1273165c9 +Subproject commit a9de941bcbda508d0a45d28ae366bb3f08db2e36 -- 2.51.2 From c0a268478efd04d72f51d78a48f01ac56a2681bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 07:34:30 +0000 Subject: [PATCH 061/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-treesitter Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `502e010` to `4067351`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/502e010d30ff4eac9abdbc73f6a7fc275d28d1ed...4067351ffd6e5cfd5527873f6db9845e04527b8b) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 502e010..4067351 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 502e010d30ff4eac9abdbc73f6a7fc275d28d1ed +Subproject commit 4067351ffd6e5cfd5527873f6db9845e04527b8b -- 2.51.2 From f2455d738b279b79883f8c5d7b84aed1ce31d3d8 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 2 May 2022 17:56:25 +0900 Subject: [PATCH 062/589] Disable clipboard integration --- home-manager/nvim/init.vim | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 784a8d4..9ac8f90 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -10,9 +10,6 @@ let g:scrollview_column = 1 lua require('config') -nnoremap d "_d - -set clipboard+=unnamedplus set lcs=eol:↲,tab:>_,trail:・ set list set relativenumber @@ -30,5 +27,3 @@ set statusline=%f%m%{branch}%=%{eol[&fileformat]} set tabstop=4 tnoremap - -vnoremap d "_d -- 2.51.2 From 5aee6da4f7db00ae14553ed07ba659eb63a4d25d Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 15 May 2022 16:35:34 +0900 Subject: [PATCH 063/589] Add ``/` mapping for nvim-cmp --- home-manager/nvim/lua/config.lua | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 994511a..7a175c8 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -3,15 +3,40 @@ capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) capabilities.textDocument.completion.completionItem.snippetSupport = true local cmp = require('cmp') +local luasnip = require('luasnip') +local function has_words_before() + local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line-1, line, true)[1]:sub(col, col):match('%s') == nil +end cmp.setup { mapping = { + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), [''] = cmp.mapping.confirm { select = true } }, snippet = { expand = function(args) - require('luasnip').lsp_expand(args.body) + luasnip.lsp_expand(args.body) end }, sources = { -- 2.51.2 From f94d8b348312f594a1cffaf5c16b30cbf6a85c7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 07:26:38 +0000 Subject: [PATCH 064/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-cmp Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `433af3d` to `cd694b8`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/433af3dffce64cbd3f99bdac9734768a6cc41951...cd694b8944eb1ae98f1d0e01cf837e66b15c2857) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index 433af3d..cd694b8 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit 433af3dffce64cbd3f99bdac9734768a6cc41951 +Subproject commit cd694b8944eb1ae98f1d0e01cf837e66b15c2857 -- 2.51.2 From 3d974d47731cc5175974b7cf868176d435240ee6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 07:26:40 +0000 Subject: [PATCH 065/589] :arrow_up: Bump nvim/pack/plugins/start/LuaSnip Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `0e91391` to `8ecf139`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/0e9139119d3ca4b858ad7c181c72a97932699b9c...8ecf139a11154fbe97685e58cd410611199a79f9) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 0e91391..8ecf139 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 0e9139119d3ca4b858ad7c181c72a97932699b9c +Subproject commit 8ecf139a11154fbe97685e58cd410611199a79f9 -- 2.51.2 From bdf67d587c255005e6e99959312f284322581510 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 07:26:42 +0000 Subject: [PATCH 066/589] :arrow_up: Bump nvim/pack/plugins/start/vscode.nvim Bumps [nvim/pack/plugins/start/vscode.nvim](https://github.com/Mofiqul/vscode.nvim) from `4dd664d` to `41a76d4`. - [Release notes](https://github.com/Mofiqul/vscode.nvim/releases) - [Commits](https://github.com/Mofiqul/vscode.nvim/compare/4dd664d331537f8e83f393dac0601e7fbc8e00b4...41a76d4071716e25a4268310276dce20bd1272d4) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/vscode.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/vscode.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/vscode.nvim b/home-manager/nvim/pack/plugins/start/vscode.nvim index 4dd664d..41a76d4 160000 --- a/home-manager/nvim/pack/plugins/start/vscode.nvim +++ b/home-manager/nvim/pack/plugins/start/vscode.nvim @@ -1 +1 @@ -Subproject commit 4dd664d331537f8e83f393dac0601e7fbc8e00b4 +Subproject commit 41a76d4071716e25a4268310276dce20bd1272d4 -- 2.51.2 From 2e52fa5cf4d13add89480c3870baf9bf65931667 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 07:26:48 +0000 Subject: [PATCH 067/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-lspconfig Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `86df1c8` to `0f06f7b`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/86df1c83ec69e5bbcde48de74c440b71a629b2f6...0f06f7ba286efd4ae187abd3391f1574580ff929) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index 86df1c8..0f06f7b 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 86df1c83ec69e5bbcde48de74c440b71a629b2f6 +Subproject commit 0f06f7ba286efd4ae187abd3391f1574580ff929 -- 2.51.2 From 42aa04648e54e5dee6f36929b9ec871bfbe8bed1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 07:26:51 +0000 Subject: [PATCH 068/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-treesitter Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `4067351` to `c9ebd16`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/4067351ffd6e5cfd5527873f6db9845e04527b8b...c9ebd16c2884c3ab7463c6cafa0385971db7456b) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 4067351..c9ebd16 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 4067351ffd6e5cfd5527873f6db9845e04527b8b +Subproject commit c9ebd16c2884c3ab7463c6cafa0385971db7456b -- 2.51.2 From 757af314e9fdd1c7b7f4743717de97b8b76c9658 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 18 May 2022 16:34:15 +0900 Subject: [PATCH 069/589] Use space indention by default --- home-manager/nvim/after/ftplugin/css.lua | 2 -- home-manager/nvim/after/ftplugin/go.vim | 3 +++ home-manager/nvim/after/ftplugin/html.vim | 3 --- home-manager/nvim/after/ftplugin/json.vim | 2 -- home-manager/nvim/after/ftplugin/lua.lua | 3 --- home-manager/nvim/after/ftplugin/scss.lua | 2 -- home-manager/nvim/after/ftplugin/typescript.vim | 2 -- home-manager/nvim/after/ftplugin/typescriptreact.vim | 3 --- home-manager/nvim/init.vim | 1 - home-manager/nvim/lua/config.lua | 2 ++ 10 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 home-manager/nvim/after/ftplugin/css.lua delete mode 100644 home-manager/nvim/after/ftplugin/json.vim delete mode 100644 home-manager/nvim/after/ftplugin/scss.lua delete mode 100644 home-manager/nvim/after/ftplugin/typescript.vim diff --git a/home-manager/nvim/after/ftplugin/css.lua b/home-manager/nvim/after/ftplugin/css.lua deleted file mode 100644 index 7307b61..0000000 --- a/home-manager/nvim/after/ftplugin/css.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.opt_local.expandtab = true -vim.opt_local.shiftwidth = 2 diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index 7742b21..b0ac9c1 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -6,3 +6,6 @@ augroup END let b:AutoPairs = AutoPairsDefine({}, ["'"]) packadd vim-goimports + +setlocal noexpandtab +setlocal shiftwidth=4 diff --git a/home-manager/nvim/after/ftplugin/html.vim b/home-manager/nvim/after/ftplugin/html.vim index 456ce7f..bd9d6ba 100644 --- a/home-manager/nvim/after/ftplugin/html.vim +++ b/home-manager/nvim/after/ftplugin/html.vim @@ -1,4 +1 @@ packadd emmet-vim - -setlocal expandtab -setlocal shiftwidth=2 diff --git a/home-manager/nvim/after/ftplugin/json.vim b/home-manager/nvim/after/ftplugin/json.vim deleted file mode 100644 index 43b80f0..0000000 --- a/home-manager/nvim/after/ftplugin/json.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=2 diff --git a/home-manager/nvim/after/ftplugin/lua.lua b/home-manager/nvim/after/ftplugin/lua.lua index c262085..4805776 100644 --- a/home-manager/nvim/after/ftplugin/lua.lua +++ b/home-manager/nvim/after/ftplugin/lua.lua @@ -7,6 +7,3 @@ LspConfig.sumneko_lua.setup { } } } - -vim.opt_local.expandtab = true -vim.opt_local.shiftwidth = 2 diff --git a/home-manager/nvim/after/ftplugin/scss.lua b/home-manager/nvim/after/ftplugin/scss.lua deleted file mode 100644 index 7307b61..0000000 --- a/home-manager/nvim/after/ftplugin/scss.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.opt_local.expandtab = true -vim.opt_local.shiftwidth = 2 diff --git a/home-manager/nvim/after/ftplugin/typescript.vim b/home-manager/nvim/after/ftplugin/typescript.vim deleted file mode 100644 index 43b80f0..0000000 --- a/home-manager/nvim/after/ftplugin/typescript.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal expandtab -setlocal shiftwidth=2 diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.vim b/home-manager/nvim/after/ftplugin/typescriptreact.vim index 456ce7f..bd9d6ba 100644 --- a/home-manager/nvim/after/ftplugin/typescriptreact.vim +++ b/home-manager/nvim/after/ftplugin/typescriptreact.vim @@ -1,4 +1 @@ packadd emmet-vim - -setlocal expandtab -setlocal shiftwidth=2 diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 9ac8f90..ff04a77 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -13,7 +13,6 @@ lua require('config') set lcs=eol:↲,tab:>_,trail:・ set list set relativenumber -set shiftwidth=4 set showmatch set splitright diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 7a175c8..7c75627 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -66,4 +66,6 @@ require('nvim-treesitter.configs').setup { vim.api.nvim_set_var('vscode_style', 'dark') vim.cmd('colorscheme vscode') +vim.opt.expandtab = true +vim.opt.shiftwidth = 2 vim.opt.wrap = false -- 2.51.2 From c1dd43a9a3ebf037e3ac54996f7a47f14f4229e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 07:32:49 +0000 Subject: [PATCH 070/589] :arrow_up: Bump nvim/pack/plugins/start/LuaSnip Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `8ecf139` to `07cf1a1`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/8ecf139a11154fbe97685e58cd410611199a79f9...07cf1a1fa01c7ecb2091d0cd04af2a2e70676058) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 8ecf139..07cf1a1 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 8ecf139a11154fbe97685e58cd410611199a79f9 +Subproject commit 07cf1a1fa01c7ecb2091d0cd04af2a2e70676058 -- 2.51.2 From 9627b151d905a526c06430b0eb3a5dbe6190b9cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 07:32:56 +0000 Subject: [PATCH 071/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-lspconfig Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `0f06f7b` to `b86a37c`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/0f06f7ba286efd4ae187abd3391f1574580ff929...b86a37caf7a4e53e62ba883aef5889b590260de9) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index 0f06f7b..b86a37c 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 0f06f7ba286efd4ae187abd3391f1574580ff929 +Subproject commit b86a37caf7a4e53e62ba883aef5889b590260de9 -- 2.51.2 From 6304e2bbe51d2c3af173d22eea12cae7a4eaf520 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Fri, 27 May 2022 21:38:09 +0900 Subject: [PATCH 072/589] Use 4 spaces in Dockerfile --- home-manager/nvim/after/ftplugin/dockerfile.lua | 1 + 1 file changed, 1 insertion(+) create mode 100644 home-manager/nvim/after/ftplugin/dockerfile.lua diff --git a/home-manager/nvim/after/ftplugin/dockerfile.lua b/home-manager/nvim/after/ftplugin/dockerfile.lua new file mode 100644 index 0000000..a1efa40 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/dockerfile.lua @@ -0,0 +1 @@ +vim.opt_local.shiftwidth = 4 -- 2.51.2 From b22baeca01a235550f9d8320ed8eeb26c432378b Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 29 May 2022 12:11:03 +0900 Subject: [PATCH 073/589] Enable transparent background --- home-manager/nvim/lua/config.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 7c75627..533f4fe 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -64,8 +64,10 @@ require('nvim-treesitter.configs').setup { } } -vim.api.nvim_set_var('vscode_style', 'dark') +vim.g.vscode_style = 'dark' +vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') + vim.opt.expandtab = true vim.opt.shiftwidth = 2 vim.opt.wrap = false -- 2.51.2 From bf1617cb48c705fef59f75bd121ada126e401cfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 07:28:01 +0000 Subject: [PATCH 074/589] :arrow_up: Bump nvim/pack/plugins/start/LuaSnip Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `07cf1a1` to `52f4aed`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/07cf1a1fa01c7ecb2091d0cd04af2a2e70676058...52f4aed58db32a3a03211d31d2b12c0495c45580) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 07cf1a1..52f4aed 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 07cf1a1fa01c7ecb2091d0cd04af2a2e70676058 +Subproject commit 52f4aed58db32a3a03211d31d2b12c0495c45580 -- 2.51.2 From 56f17265d7c39a3118f607208911d3d8f81eb08e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 07:28:08 +0000 Subject: [PATCH 075/589] :arrow_up: Bump nvim/pack/plugins/start/vscode.nvim Bumps [nvim/pack/plugins/start/vscode.nvim](https://github.com/Mofiqul/vscode.nvim) from `41a76d4` to `4e65d96`. - [Release notes](https://github.com/Mofiqul/vscode.nvim/releases) - [Commits](https://github.com/Mofiqul/vscode.nvim/compare/41a76d4071716e25a4268310276dce20bd1272d4...4e65d961e40a4bfdf3e854ba22dddd47810a230e) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/vscode.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/vscode.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/vscode.nvim b/home-manager/nvim/pack/plugins/start/vscode.nvim index 41a76d4..4e65d96 160000 --- a/home-manager/nvim/pack/plugins/start/vscode.nvim +++ b/home-manager/nvim/pack/plugins/start/vscode.nvim @@ -1 +1 @@ -Subproject commit 41a76d4071716e25a4268310276dce20bd1272d4 +Subproject commit 4e65d961e40a4bfdf3e854ba22dddd47810a230e -- 2.51.2 From 9f844df07e5e9664f9b814f81a33013c61bf4924 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 30 May 2022 16:53:58 +0900 Subject: [PATCH 076/589] Remove unnecessary config for vscode.nvim --- home-manager/nvim/lua/config.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 533f4fe..80d7b77 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -64,7 +64,6 @@ require('nvim-treesitter.configs').setup { } } -vim.g.vscode_style = 'dark' vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') -- 2.51.2 From b8f310fd726f1431188eac31b279a12b5c16505f Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 31 May 2022 14:25:11 +0900 Subject: [PATCH 077/589] Add keymap to find file --- home-manager/nvim/lua/config.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 80d7b77..054b6be 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -67,6 +67,7 @@ require('nvim-treesitter.configs').setup { vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') +vim.keymap.set('n', '', ':GFiles') vim.opt.expandtab = true vim.opt.shiftwidth = 2 vim.opt.wrap = false -- 2.51.2 From e17d8ccc34a22eddbe125498df821e96cd1bc636 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 31 May 2022 14:30:27 +0900 Subject: [PATCH 078/589] Show absolute line number of current line --- home-manager/nvim/init.vim | 1 - home-manager/nvim/lua/config.lua | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index ff04a77..7a6b7d6 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -12,7 +12,6 @@ lua require('config') set lcs=eol:↲,tab:>_,trail:・ set list -set relativenumber set showmatch set splitright diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 054b6be..75a5f4d 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -69,5 +69,7 @@ vim.cmd('colorscheme vscode') vim.keymap.set('n', '', ':GFiles') vim.opt.expandtab = true +vim.opt.number = true +vim.opt.relativenumber = true vim.opt.shiftwidth = 2 vim.opt.wrap = false -- 2.51.2 From 78384d8331e0dbc2c3c0b365c4c4a08cfd4b7d5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 07:22:15 +0000 Subject: [PATCH 079/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-treesitter Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `c9ebd16` to `26abd5f`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/c9ebd16c2884c3ab7463c6cafa0385971db7456b...26abd5fc328624bd4208bf5fd733ab6e2fa677c9) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index c9ebd16..26abd5f 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit c9ebd16c2884c3ab7463c6cafa0385971db7456b +Subproject commit 26abd5fc328624bd4208bf5fd733ab6e2fa677c9 -- 2.51.2 From 92b9ff940f9d75cc55f77b144af6a7ebd21f5c97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 07:22:17 +0000 Subject: [PATCH 080/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-lspconfig Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `b86a37c` to `2a455c1`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/b86a37caf7a4e53e62ba883aef5889b590260de9...2a455c148341c4faf2dd60401397fed35d084c59) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index b86a37c..2a455c1 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit b86a37caf7a4e53e62ba883aef5889b590260de9 +Subproject commit 2a455c148341c4faf2dd60401397fed35d084c59 -- 2.51.2 From 2d8de8369f07bfa4f79644f045b128e12edbd9c2 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 9 Jun 2022 10:59:52 +0900 Subject: [PATCH 081/589] Add `tsserver` --- home-manager/nvim/after/ftplugin/lua.lua | 1 + home-manager/nvim/after/ftplugin/typesctipt.lua | 6 ++++++ home-manager/nvim/lua/config.lua | 12 +++++------- 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 home-manager/nvim/after/ftplugin/typesctipt.lua diff --git a/home-manager/nvim/after/ftplugin/lua.lua b/home-manager/nvim/after/ftplugin/lua.lua index 4805776..311d32a 100644 --- a/home-manager/nvim/after/ftplugin/lua.lua +++ b/home-manager/nvim/after/ftplugin/lua.lua @@ -1,4 +1,5 @@ LspConfig.sumneko_lua.setup { + capabilities = Capabilities, settings = { Lua = { diagnostics = { diff --git a/home-manager/nvim/after/ftplugin/typesctipt.lua b/home-manager/nvim/after/ftplugin/typesctipt.lua new file mode 100644 index 0000000..5f5da3f --- /dev/null +++ b/home-manager/nvim/after/ftplugin/typesctipt.lua @@ -0,0 +1,6 @@ +LspConfig.denols.setup { + capabilities = Capabilities, + root_dir = function (fname) + return LspConfig.util.root_pattern('deno.json')(fname) + end +} diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 75a5f4d..b63a39d 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -1,7 +1,3 @@ -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) -capabilities.textDocument.completion.completionItem.snippetSupport = true - local cmp = require('cmp') local luasnip = require('luasnip') local function has_words_before() @@ -45,16 +41,18 @@ cmp.setup { } } +Capabilities = vim.lsp.protocol.make_client_capabilities() +Capabilities = require('cmp_nvim_lsp').update_capabilities(Capabilities) +Capabilities.textDocument.completion.completionItem.snippetSupport = true LspConfig = require('lspconfig') local servers = { 'cssls', - 'denols', 'gopls', - 'sumneko_lua' + 'tsserver' } for _, lsp in ipairs(servers) do LspConfig[lsp].setup { - capabilities = capabilities + capabilities = Capabilities } end -- 2.51.2 From 2cc148e632d6372fd52f7b1a814630d7713e39bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 07:26:03 +0000 Subject: [PATCH 082/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-cmp Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `cd694b8` to `df6734a`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/cd694b8944eb1ae98f1d0e01cf837e66b15c2857...df6734aa018d6feb4d76ba6bda94b1aeac2b378a) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index cd694b8..df6734a 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit cd694b8944eb1ae98f1d0e01cf837e66b15c2857 +Subproject commit df6734aa018d6feb4d76ba6bda94b1aeac2b378a -- 2.51.2 From 6dadf8ceb6a678933bb3c8eae186e2f5d805d2b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 07:26:06 +0000 Subject: [PATCH 083/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-lspconfig Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `2a455c1` to `c55e830`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/2a455c148341c4faf2dd60401397fed35d084c59...c55e830aa18bd15f36f7534947ec7471f2b43af7) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index 2a455c1..c55e830 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 2a455c148341c4faf2dd60401397fed35d084c59 +Subproject commit c55e830aa18bd15f36f7534947ec7471f2b43af7 -- 2.51.2 From 7573908933d80990817dfc1395345bf8d8275204 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 07:26:08 +0000 Subject: [PATCH 084/589] :arrow_up: Bump nvim/pack/plugins/start/fzf from `a91a676` to `7052987` Bumps [nvim/pack/plugins/start/fzf](https://github.com/junegunn/fzf) from `a91a676` to `7052987`. - [Release notes](https://github.com/junegunn/fzf/releases) - [Commits](https://github.com/junegunn/fzf/compare/a91a67668e0830a8cf9a792c4949e03b4189f097...70529878e20cf0367ca25b0aa9dbf1f51062f5e0) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/fzf dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/fzf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/fzf b/home-manager/nvim/pack/plugins/start/fzf index a91a676..7052987 160000 --- a/home-manager/nvim/pack/plugins/start/fzf +++ b/home-manager/nvim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit a91a67668e0830a8cf9a792c4949e03b4189f097 +Subproject commit 70529878e20cf0367ca25b0aa9dbf1f51062f5e0 -- 2.51.2 From 7f6ff1bda66d841a9f9deddfe620bf31d46ed0d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 07:26:11 +0000 Subject: [PATCH 085/589] :arrow_up: Bump nvim/pack/plugins/start/LuaSnip Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `52f4aed` to `e9afd03`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/52f4aed58db32a3a03211d31d2b12c0495c45580...e9afd03d1cc2494749eea4c927535505db6b4f52) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 52f4aed..e9afd03 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 52f4aed58db32a3a03211d31d2b12c0495c45580 +Subproject commit e9afd03d1cc2494749eea4c927535505db6b4f52 -- 2.51.2 From 84897bfce182f464d6cddda518bbf176299dc015 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 07:26:14 +0000 Subject: [PATCH 086/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-treesitter Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `26abd5f` to `37b9a29`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/26abd5fc328624bd4208bf5fd733ab6e2fa677c9...37b9a2971f749ab6d5ac9c8792f6e133fed027aa) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 26abd5f..37b9a29 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 26abd5fc328624bd4208bf5fd733ab6e2fa677c9 +Subproject commit 37b9a2971f749ab6d5ac9c8792f6e133fed027aa -- 2.51.2 From 7415f80a6ca7b289e8cc69a1d08960cd85d26e92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 07:19:18 +0000 Subject: [PATCH 087/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-cmp Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `df6734a` to `1cad181`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/df6734aa018d6feb4d76ba6bda94b1aeac2b378a...1cad1815e165c2b436f41a1ee20327701842a761) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index df6734a..1cad181 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit df6734aa018d6feb4d76ba6bda94b1aeac2b378a +Subproject commit 1cad1815e165c2b436f41a1ee20327701842a761 -- 2.51.2 From 62360ed5a9e24a2a4853a9a5c7d185b76a58269e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 07:19:20 +0000 Subject: [PATCH 088/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-treesitter Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `37b9a29` to `b7fbf9e`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/37b9a2971f749ab6d5ac9c8792f6e133fed027aa...b7fbf9ed2d9c9a93d24514f4b8d04de87538dc42) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 37b9a29..b7fbf9e 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 37b9a2971f749ab6d5ac9c8792f6e133fed027aa +Subproject commit b7fbf9ed2d9c9a93d24514f4b8d04de87538dc42 -- 2.51.2 From 8b40912c6f55660cd29bce00c400d960acad898c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 07:19:25 +0000 Subject: [PATCH 089/589] :arrow_up: Bump nvim/pack/plugins/start/vscode.nvim Bumps [nvim/pack/plugins/start/vscode.nvim](https://github.com/Mofiqul/vscode.nvim) from `4e65d96` to `a34d2ab`. - [Release notes](https://github.com/Mofiqul/vscode.nvim/releases) - [Commits](https://github.com/Mofiqul/vscode.nvim/compare/4e65d961e40a4bfdf3e854ba22dddd47810a230e...a34d2ab95a1abcfca19feef85ec0f094ff79f5f5) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/vscode.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/vscode.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/vscode.nvim b/home-manager/nvim/pack/plugins/start/vscode.nvim index 4e65d96..a34d2ab 160000 --- a/home-manager/nvim/pack/plugins/start/vscode.nvim +++ b/home-manager/nvim/pack/plugins/start/vscode.nvim @@ -1 +1 @@ -Subproject commit 4e65d961e40a4bfdf3e854ba22dddd47810a230e +Subproject commit a34d2ab95a1abcfca19feef85ec0f094ff79f5f5 -- 2.51.2 From 548bccaaa6880825869184a9bc5ac7a4b2090136 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 07:19:27 +0000 Subject: [PATCH 090/589] :arrow_up: Bump nvim/pack/plugins/start/LuaSnip Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `e9afd03` to `a12441e`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/e9afd03d1cc2494749eea4c927535505db6b4f52...a12441e0598e93e67235eba67c8e6fbffc896f06) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index e9afd03..a12441e 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit e9afd03d1cc2494749eea4c927535505db6b4f52 +Subproject commit a12441e0598e93e67235eba67c8e6fbffc896f06 -- 2.51.2 From 623005b90ebfa74b28cebbcced10defeb2ccc2f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 07:19:33 +0000 Subject: [PATCH 091/589] :arrow_up: Bump nvim/pack/plugins/opt/vim-goimports Bumps [nvim/pack/plugins/opt/vim-goimports](https://github.com/mattn/vim-goimports) from `5db0dcf` to `54d8cae`. - [Release notes](https://github.com/mattn/vim-goimports/releases) - [Commits](https://github.com/mattn/vim-goimports/compare/5db0dcf7a11f6b5b89169b2e13aa7a376312cafc...54d8cae948b36fa2f633a731af8c31f5c18795bf) --- updated-dependencies: - dependency-name: nvim/pack/plugins/opt/vim-goimports dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/opt/vim-goimports | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/opt/vim-goimports b/home-manager/nvim/pack/plugins/opt/vim-goimports index 5db0dcf..54d8cae 160000 --- a/home-manager/nvim/pack/plugins/opt/vim-goimports +++ b/home-manager/nvim/pack/plugins/opt/vim-goimports @@ -1 +1 @@ -Subproject commit 5db0dcf7a11f6b5b89169b2e13aa7a376312cafc +Subproject commit 54d8cae948b36fa2f633a731af8c31f5c18795bf -- 2.51.2 From 56a39590a943a1f31c9564d1b4559e341e206edb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 07:45:35 +0000 Subject: [PATCH 092/589] :arrow_up: Bump nvim/pack/plugins/start/nvim-treesitter Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `b7fbf9e` to `7d2bd76`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/b7fbf9ed2d9c9a93d24514f4b8d04de87538dc42...7d2bd76f435c180bd67c72367bd9525c251b95fa) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index b7fbf9e..7d2bd76 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit b7fbf9ed2d9c9a93d24514f4b8d04de87538dc42 +Subproject commit 7d2bd76f435c180bd67c72367bd9525c251b95fa -- 2.51.2 From b7864db66521eb63395da610c28bf5a9c2853280 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 07:45:38 +0000 Subject: [PATCH 093/589] :arrow_up: Bump nvim/pack/plugins/start/vscode.nvim Bumps [nvim/pack/plugins/start/vscode.nvim](https://github.com/Mofiqul/vscode.nvim) from `a34d2ab` to `ba65e6a`. - [Release notes](https://github.com/Mofiqul/vscode.nvim/releases) - [Commits](https://github.com/Mofiqul/vscode.nvim/compare/a34d2ab95a1abcfca19feef85ec0f094ff79f5f5...ba65e6ad9a486737dcd912a1ae58b940e2b38a5c) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/vscode.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/vscode.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/vscode.nvim b/home-manager/nvim/pack/plugins/start/vscode.nvim index a34d2ab..ba65e6a 160000 --- a/home-manager/nvim/pack/plugins/start/vscode.nvim +++ b/home-manager/nvim/pack/plugins/start/vscode.nvim @@ -1 +1 @@ -Subproject commit a34d2ab95a1abcfca19feef85ec0f094ff79f5f5 +Subproject commit ba65e6ad9a486737dcd912a1ae58b940e2b38a5c -- 2.51.2 From 20921ef6a6c06220d6570882e7b569780b9f3f07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 07:45:42 +0000 Subject: [PATCH 094/589] :arrow_up: Bump nvim/pack/plugins/start/LuaSnip Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `a12441e` to `295cc9e`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/a12441e0598e93e67235eba67c8e6fbffc896f06...295cc9e422060b3200234b42cbee6dde1dfee765) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index a12441e..295cc9e 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit a12441e0598e93e67235eba67c8e6fbffc896f06 +Subproject commit 295cc9e422060b3200234b42cbee6dde1dfee765 -- 2.51.2 From ef50d3a2216faf71f0118e1e7322541dd9d78abf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 07:45:48 +0000 Subject: [PATCH 095/589] :arrow_up: Bump nvim/pack/plugins/start/fzf.vim Bumps [nvim/pack/plugins/start/fzf.vim](https://github.com/junegunn/fzf.vim) from `d5f1f86` to `c311c0a`. - [Release notes](https://github.com/junegunn/fzf.vim/releases) - [Commits](https://github.com/junegunn/fzf.vim/compare/d5f1f8641b24c0fd5b10a299824362a2a1b20ae0...c311c0a95fc2529c26ab36a8f530e9dd4426304c) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/fzf.vim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/fzf.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/fzf.vim b/home-manager/nvim/pack/plugins/start/fzf.vim index d5f1f86..c311c0a 160000 --- a/home-manager/nvim/pack/plugins/start/fzf.vim +++ b/home-manager/nvim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit d5f1f8641b24c0fd5b10a299824362a2a1b20ae0 +Subproject commit c311c0a95fc2529c26ab36a8f530e9dd4426304c -- 2.51.2 From d2a40ad4b0e560b288f52d8f7264394ee3d48a46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 07:27:47 +0000 Subject: [PATCH 096/589] Bump nvim/pack/plugins/start/nvim-treesitter from `7d2bd76` to `568ce3c` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `7d2bd76` to `568ce3c`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/7d2bd76f435c180bd67c72367bd9525c251b95fa...568ce3c0911e21230d75d05f26cdda894ef6100b) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 7d2bd76..568ce3c 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 7d2bd76f435c180bd67c72367bd9525c251b95fa +Subproject commit 568ce3c0911e21230d75d05f26cdda894ef6100b -- 2.51.2 From 4cc41aaea91f8019ef14ebba7fe9271684fcd99a Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 11 Jul 2022 20:29:26 +0900 Subject: [PATCH 097/589] Enable `auto_install` --- home-manager/nvim/lua/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index b63a39d..35b13b7 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -57,6 +57,7 @@ for _, lsp in ipairs(servers) do end require('nvim-treesitter.configs').setup { + auto_install = true, highlight = { enable = true } @@ -64,7 +65,6 @@ require('nvim-treesitter.configs').setup { vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') - vim.keymap.set('n', '', ':GFiles') vim.opt.expandtab = true vim.opt.number = true -- 2.51.2 From 8df79d082ceeb890030cbcfce78489d10559199c Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 11 Jul 2022 20:56:19 +0900 Subject: [PATCH 098/589] Set `scrollview_character` --- home-manager/nvim/init.vim | 2 -- home-manager/nvim/lua/config.lua | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 7a6b7d6..02d4933 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -6,8 +6,6 @@ function! FormatOnSave(formatCommand) call winrestview(cursor) endfunction -let g:scrollview_column = 1 - lua require('config') set lcs=eol:↲,tab:>_,trail:・ diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 35b13b7..cf5ef0c 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -63,6 +63,8 @@ require('nvim-treesitter.configs').setup { } } +vim.g.scrollview_character = '▎' +vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') vim.keymap.set('n', '', ':GFiles') -- 2.51.2 From e0fc4c95a5f1705fae1859fdfe0c4439342af3d8 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 18 Jul 2022 09:26:47 +0900 Subject: [PATCH 099/589] Don't start `tsserver` when `deno.json` exists --- home-manager/nvim/after/ftplugin/typesctipt.lua | 6 ------ home-manager/nvim/lua/config.lua | 10 ++++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 home-manager/nvim/after/ftplugin/typesctipt.lua diff --git a/home-manager/nvim/after/ftplugin/typesctipt.lua b/home-manager/nvim/after/ftplugin/typesctipt.lua deleted file mode 100644 index 5f5da3f..0000000 --- a/home-manager/nvim/after/ftplugin/typesctipt.lua +++ /dev/null @@ -1,6 +0,0 @@ -LspConfig.denols.setup { - capabilities = Capabilities, - root_dir = function (fname) - return LspConfig.util.root_pattern('deno.json')(fname) - end -} diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index cf5ef0c..10db6e9 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -44,12 +44,18 @@ cmp.setup { Capabilities = vim.lsp.protocol.make_client_capabilities() Capabilities = require('cmp_nvim_lsp').update_capabilities(Capabilities) Capabilities.textDocument.completion.completionItem.snippetSupport = true -LspConfig = require('lspconfig') + +local tsserver = 'tsserver' +if vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 then + tsserver = 'denols' +end local servers = { 'cssls', 'gopls', - 'tsserver' + tsserver } + +LspConfig = require('lspconfig') for _, lsp in ipairs(servers) do LspConfig[lsp].setup { capabilities = Capabilities -- 2.51.2 From dc930dc48fbe54a653e95e3c822f74ccd26f920b Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 18 Jul 2022 09:38:05 +0900 Subject: [PATCH 100/589] Define all language server in `config.lua` --- home-manager/nvim/after/ftplugin/lua.lua | 10 ---------- home-manager/nvim/lua/config.lua | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 home-manager/nvim/after/ftplugin/lua.lua diff --git a/home-manager/nvim/after/ftplugin/lua.lua b/home-manager/nvim/after/ftplugin/lua.lua deleted file mode 100644 index 311d32a..0000000 --- a/home-manager/nvim/after/ftplugin/lua.lua +++ /dev/null @@ -1,10 +0,0 @@ -LspConfig.sumneko_lua.setup { - capabilities = Capabilities, - settings = { - Lua = { - diagnostics = { - globals = { 'vim' } - } - } - } -} diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 10db6e9..dbaced6 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -41,9 +41,9 @@ cmp.setup { } } -Capabilities = vim.lsp.protocol.make_client_capabilities() -Capabilities = require('cmp_nvim_lsp').update_capabilities(Capabilities) -Capabilities.textDocument.completion.completionItem.snippetSupport = true +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +capabilities.textDocument.completion.completionItem.snippetSupport = true local tsserver = 'tsserver' if vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 then @@ -52,13 +52,21 @@ end local servers = { 'cssls', 'gopls', + 'sumneko_lua', tsserver } LspConfig = require('lspconfig') for _, lsp in ipairs(servers) do LspConfig[lsp].setup { - capabilities = Capabilities + capabilities = capabilities, + settings = { + Lua = { + diagnostics = { + globals = { 'vim' } + } + } + } } end -- 2.51.2 From 7bbce232526b805a89cf6436c2983a175e9ca399 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 07:18:52 +0000 Subject: [PATCH 101/589] Bump nvim/pack/plugins/start/LuaSnip from `295cc9e` to `45fc3d8` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `295cc9e` to `45fc3d8`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/295cc9e422060b3200234b42cbee6dde1dfee765...45fc3d860cfa7a074b4d2fbf68c0249aa3a01320) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 295cc9e..45fc3d8 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 295cc9e422060b3200234b42cbee6dde1dfee765 +Subproject commit 45fc3d860cfa7a074b4d2fbf68c0249aa3a01320 -- 2.51.2 From 20dd7871ba0038b45e690faa32b431932eb054e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 07:18:54 +0000 Subject: [PATCH 102/589] Bump nvim/pack/plugins/start/vscode.nvim from `ba65e6a` to `0742e59` Bumps [nvim/pack/plugins/start/vscode.nvim](https://github.com/Mofiqul/vscode.nvim) from `ba65e6a` to `0742e59`. - [Release notes](https://github.com/Mofiqul/vscode.nvim/releases) - [Commits](https://github.com/Mofiqul/vscode.nvim/compare/ba65e6ad9a486737dcd912a1ae58b940e2b38a5c...0742e59ba17e67a22ea22db9d9a49d70f68488bc) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/vscode.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/vscode.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/vscode.nvim b/home-manager/nvim/pack/plugins/start/vscode.nvim index ba65e6a..0742e59 160000 --- a/home-manager/nvim/pack/plugins/start/vscode.nvim +++ b/home-manager/nvim/pack/plugins/start/vscode.nvim @@ -1 +1 @@ -Subproject commit ba65e6ad9a486737dcd912a1ae58b940e2b38a5c +Subproject commit 0742e59ba17e67a22ea22db9d9a49d70f68488bc -- 2.51.2 From 573dc382f801474f22134f3eae3d753cba425ad6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 07:18:57 +0000 Subject: [PATCH 103/589] Bump nvim/pack/plugins/start/nvim-treesitter from `568ce3c` to `acd4821` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `568ce3c` to `acd4821`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/568ce3c0911e21230d75d05f26cdda894ef6100b...acd4821bc1a737230ef4d6eb52f03b5fe21da3df) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 568ce3c..acd4821 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 568ce3c0911e21230d75d05f26cdda894ef6100b +Subproject commit acd4821bc1a737230ef4d6eb52f03b5fe21da3df -- 2.51.2 From c7f1c3b5ca272dfd30dd0370cf7d1ee0c24b9671 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 07:19:05 +0000 Subject: [PATCH 104/589] Bump nvim/pack/plugins/start/nvim-lspconfig from `c55e830` to `3479473` Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `c55e830` to `3479473`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/c55e830aa18bd15f36f7534947ec7471f2b43af7...347947355ba0a15d803cbd61b18f8bb8f401c793) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index c55e830..3479473 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit c55e830aa18bd15f36f7534947ec7471f2b43af7 +Subproject commit 347947355ba0a15d803cbd61b18f8bb8f401c793 -- 2.51.2 From 23f14016fa9fde9ee60c117032cfad359fbaad60 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 19 Jul 2022 08:33:47 +0900 Subject: [PATCH 105/589] Use `deno fmt` when using Deno --- home-manager/nvim/after/ftplugin/typescript.lua | 1 + home-manager/nvim/after/ftplugin/typescriptreact.lua | 3 +++ home-manager/nvim/after/ftplugin/typescriptreact.vim | 1 - home-manager/nvim/lua/config.lua | 7 +++---- home-manager/nvim/lua/ftbase/typescript.lua | 9 +++++++++ 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 home-manager/nvim/after/ftplugin/typescript.lua create mode 100644 home-manager/nvim/after/ftplugin/typescriptreact.lua delete mode 100644 home-manager/nvim/after/ftplugin/typescriptreact.vim create mode 100644 home-manager/nvim/lua/ftbase/typescript.lua diff --git a/home-manager/nvim/after/ftplugin/typescript.lua b/home-manager/nvim/after/ftplugin/typescript.lua new file mode 100644 index 0000000..ab33da9 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/typescript.lua @@ -0,0 +1 @@ +require('ftbase.typescript') diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.lua b/home-manager/nvim/after/ftplugin/typescriptreact.lua new file mode 100644 index 0000000..726354d --- /dev/null +++ b/home-manager/nvim/after/ftplugin/typescriptreact.lua @@ -0,0 +1,3 @@ +require('ftbase.typescript') + +vim.cmd('packadd emmet-vim') diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.vim b/home-manager/nvim/after/ftplugin/typescriptreact.vim deleted file mode 100644 index bd9d6ba..0000000 --- a/home-manager/nvim/after/ftplugin/typescriptreact.vim +++ /dev/null @@ -1 +0,0 @@ -packadd emmet-vim diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index dbaced6..a39b95e 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -45,10 +45,9 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) capabilities.textDocument.completion.completionItem.snippetSupport = true -local tsserver = 'tsserver' -if vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 then - tsserver = 'denols' -end +UseDeno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 +local tsserver = UseDeno and 'denols' or 'tsserver' + local servers = { 'cssls', 'gopls', diff --git a/home-manager/nvim/lua/ftbase/typescript.lua b/home-manager/nvim/lua/ftbase/typescript.lua new file mode 100644 index 0000000..b4c6311 --- /dev/null +++ b/home-manager/nvim/lua/ftbase/typescript.lua @@ -0,0 +1,9 @@ +if UseDeno then + local id = vim.api.nvim_create_augroup('ts_fmt', {}) + + vim.api.nvim_create_autocmd('BufWritePre', { + group = id, + pattern = {'*.ts'}, + command = 'call FormatOnSave("%!deno fmt -")' + }) +end -- 2.51.2 From 05db3a1a1f422d8bc2c13709892c81390fbb2719 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 19 Jul 2022 09:07:38 +0900 Subject: [PATCH 106/589] Create `lua/ftbase` --- home-manager/nvim/after/ftplugin/html.lua | 1 + home-manager/nvim/after/ftplugin/html.vim | 1 - home-manager/nvim/after/ftplugin/markdown.lua | 3 +++ home-manager/nvim/after/ftplugin/markdown.vim | 3 --- home-manager/nvim/after/ftplugin/text.lua | 3 +++ home-manager/nvim/after/ftplugin/text.vim | 3 --- home-manager/nvim/after/ftplugin/typescriptreact.lua | 3 +-- home-manager/nvim/lua/ftbase/html.lua | 1 + home-manager/nvim/lua/ftbase/text.lua | 1 + 9 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 home-manager/nvim/after/ftplugin/html.lua delete mode 100644 home-manager/nvim/after/ftplugin/html.vim create mode 100644 home-manager/nvim/after/ftplugin/markdown.lua delete mode 100644 home-manager/nvim/after/ftplugin/markdown.vim create mode 100644 home-manager/nvim/after/ftplugin/text.lua delete mode 100644 home-manager/nvim/after/ftplugin/text.vim create mode 100644 home-manager/nvim/lua/ftbase/html.lua create mode 100644 home-manager/nvim/lua/ftbase/text.lua diff --git a/home-manager/nvim/after/ftplugin/html.lua b/home-manager/nvim/after/ftplugin/html.lua new file mode 100644 index 0000000..304aa70 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/html.lua @@ -0,0 +1 @@ +require('ftbase.html') diff --git a/home-manager/nvim/after/ftplugin/html.vim b/home-manager/nvim/after/ftplugin/html.vim deleted file mode 100644 index bd9d6ba..0000000 --- a/home-manager/nvim/after/ftplugin/html.vim +++ /dev/null @@ -1 +0,0 @@ -packadd emmet-vim diff --git a/home-manager/nvim/after/ftplugin/markdown.lua b/home-manager/nvim/after/ftplugin/markdown.lua new file mode 100644 index 0000000..2acaeb3 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/markdown.lua @@ -0,0 +1,3 @@ +require('ftbase.text') + +vim.cmd("let b:AutoPairs = AutoPairsDefine({'{{<' : '>}}'}, [\"'\"])") diff --git a/home-manager/nvim/after/ftplugin/markdown.vim b/home-manager/nvim/after/ftplugin/markdown.vim deleted file mode 100644 index 668764c..0000000 --- a/home-manager/nvim/after/ftplugin/markdown.vim +++ /dev/null @@ -1,3 +0,0 @@ -let b:AutoPairs = AutoPairsDefine({'{{<' : '>}}'}, ["'"]) - -setlocal wrap diff --git a/home-manager/nvim/after/ftplugin/text.lua b/home-manager/nvim/after/ftplugin/text.lua new file mode 100644 index 0000000..6039f67 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/text.lua @@ -0,0 +1,3 @@ +require('ftbase.text') + +vim.cmd('let s:AutoPairs = AutoPairsDefine({}, ["\'"])') diff --git a/home-manager/nvim/after/ftplugin/text.vim b/home-manager/nvim/after/ftplugin/text.vim deleted file mode 100644 index 19fffec..0000000 --- a/home-manager/nvim/after/ftplugin/text.vim +++ /dev/null @@ -1,3 +0,0 @@ -let s:AutoPairs = AutoPairsDefine({}, ["'"]) - -setlocal wrap diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.lua b/home-manager/nvim/after/ftplugin/typescriptreact.lua index 726354d..2c7ca8a 100644 --- a/home-manager/nvim/after/ftplugin/typescriptreact.lua +++ b/home-manager/nvim/after/ftplugin/typescriptreact.lua @@ -1,3 +1,2 @@ +require('ftbase.html') require('ftbase.typescript') - -vim.cmd('packadd emmet-vim') diff --git a/home-manager/nvim/lua/ftbase/html.lua b/home-manager/nvim/lua/ftbase/html.lua new file mode 100644 index 0000000..08254a5 --- /dev/null +++ b/home-manager/nvim/lua/ftbase/html.lua @@ -0,0 +1 @@ +vim.cmd('packadd emmet-vim') diff --git a/home-manager/nvim/lua/ftbase/text.lua b/home-manager/nvim/lua/ftbase/text.lua new file mode 100644 index 0000000..481f90a --- /dev/null +++ b/home-manager/nvim/lua/ftbase/text.lua @@ -0,0 +1 @@ +vim.opt_local.wrap = true -- 2.51.2 From be4722c61d2164d564b62a22c962226961f33383 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 07:22:45 +0000 Subject: [PATCH 107/589] Bump nvim/pack/plugins/start/nvim-treesitter from `acd4821` to `2139fca` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `acd4821` to `2139fca`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/acd4821bc1a737230ef4d6eb52f03b5fe21da3df...2139fca70c909266a3b23a080ce4315e76da8267) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index acd4821..2139fca 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit acd4821bc1a737230ef4d6eb52f03b5fe21da3df +Subproject commit 2139fca70c909266a3b23a080ce4315e76da8267 -- 2.51.2 From 59e5ace917a10b6324b2dfb4d7aa5e6e8302c8f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 07:22:47 +0000 Subject: [PATCH 108/589] Bump nvim/pack/plugins/start/nvim-cmp from `1cad181` to `706371f` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `1cad181` to `706371f`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/1cad1815e165c2b436f41a1ee20327701842a761...706371f1300e7c0acb98b346f80dad2dd9b5f679) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index 1cad181..706371f 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit 1cad1815e165c2b436f41a1ee20327701842a761 +Subproject commit 706371f1300e7c0acb98b346f80dad2dd9b5f679 -- 2.51.2 From 0e0913d4cb73459995ae27342467b43e652fb7b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 07:22:50 +0000 Subject: [PATCH 109/589] Bump nvim/pack/plugins/start/fzf from `7052987` to `ecc418b` Bumps [nvim/pack/plugins/start/fzf](https://github.com/junegunn/fzf) from `7052987` to `ecc418b`. - [Release notes](https://github.com/junegunn/fzf/releases) - [Commits](https://github.com/junegunn/fzf/compare/70529878e20cf0367ca25b0aa9dbf1f51062f5e0...ecc418ba77e52660ffdd9ed84727b12c3f377680) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/fzf dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/fzf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/fzf b/home-manager/nvim/pack/plugins/start/fzf index 7052987..ecc418b 160000 --- a/home-manager/nvim/pack/plugins/start/fzf +++ b/home-manager/nvim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 70529878e20cf0367ca25b0aa9dbf1f51062f5e0 +Subproject commit ecc418ba77e52660ffdd9ed84727b12c3f377680 -- 2.51.2 From 1894627acf8a11523c886d5943b72250aa3449a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 07:22:53 +0000 Subject: [PATCH 110/589] Bump nvim/pack/plugins/start/LuaSnip from `45fc3d8` to `be3083b` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `45fc3d8` to `be3083b`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/45fc3d860cfa7a074b4d2fbf68c0249aa3a01320...be3083bbb8ebc21671bf7c91c27f043ebe0a8d8d) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 45fc3d8..be3083b 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 45fc3d860cfa7a074b4d2fbf68c0249aa3a01320 +Subproject commit be3083bbb8ebc21671bf7c91c27f043ebe0a8d8d -- 2.51.2 From 5833be1916be5dd406b4544c3ccf7539890e34d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 07:22:54 +0000 Subject: [PATCH 111/589] Bump nvim/pack/plugins/start/nvim-lspconfig from `3479473` to `dcb7ebb` Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `3479473` to `dcb7ebb`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/347947355ba0a15d803cbd61b18f8bb8f401c793...dcb7ebb36f0d2aafcc640f520bb1fc8a9cc1f7c8) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index 3479473..dcb7ebb 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 347947355ba0a15d803cbd61b18f8bb8f401c793 +Subproject commit dcb7ebb36f0d2aafcc640f520bb1fc8a9cc1f7c8 -- 2.51.2 From 34e873fedc475741bacfb05a1ccea8f8acca0433 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 07:22:56 +0000 Subject: [PATCH 112/589] Bump nvim/pack/plugins/opt/vim-goimports from `54d8cae` to `e50dae8` Bumps [nvim/pack/plugins/opt/vim-goimports](https://github.com/mattn/vim-goimports) from `54d8cae` to `e50dae8`. - [Release notes](https://github.com/mattn/vim-goimports/releases) - [Commits](https://github.com/mattn/vim-goimports/compare/54d8cae948b36fa2f633a731af8c31f5c18795bf...e50dae830c3cc405003bbc79e90c2dfb5c8da7f5) --- updated-dependencies: - dependency-name: nvim/pack/plugins/opt/vim-goimports dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/opt/vim-goimports | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/opt/vim-goimports b/home-manager/nvim/pack/plugins/opt/vim-goimports index 54d8cae..e50dae8 160000 --- a/home-manager/nvim/pack/plugins/opt/vim-goimports +++ b/home-manager/nvim/pack/plugins/opt/vim-goimports @@ -1 +1 @@ -Subproject commit 54d8cae948b36fa2f633a731af8c31f5c18795bf +Subproject commit e50dae830c3cc405003bbc79e90c2dfb5c8da7f5 -- 2.51.2 From ca6cc54a83363ad9d340544898182228006d65f7 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 27 Jul 2022 11:14:18 +0900 Subject: [PATCH 113/589] Use `` mapping instead of `:` --- home-manager/nvim/lua/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index a39b95e..d50665e 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -80,7 +80,7 @@ vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') -vim.keymap.set('n', '', ':GFiles') +vim.keymap.set('n', '', 'GFiles') vim.opt.expandtab = true vim.opt.number = true vim.opt.relativenumber = true -- 2.51.2 From 841e36aa2c32e0f123947f9383b39ed3b73e43fa Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 30 Jul 2022 09:47:28 +0900 Subject: [PATCH 114/589] Add lazygit --- home-manager/nvim/lua/config.lua | 1 + home-manager/nvim/pack/plugins/start/lazygit.nvim | 1 + 2 files changed, 2 insertions(+) create mode 160000 home-manager/nvim/pack/plugins/start/lazygit.nvim diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index d50665e..df20ab5 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -81,6 +81,7 @@ vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') vim.keymap.set('n', '', 'GFiles') +vim.keymap.set('n', '', 'LazyGit') vim.opt.expandtab = true vim.opt.number = true vim.opt.relativenumber = true diff --git a/home-manager/nvim/pack/plugins/start/lazygit.nvim b/home-manager/nvim/pack/plugins/start/lazygit.nvim new file mode 160000 index 0000000..9c73fd6 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/lazygit.nvim @@ -0,0 +1 @@ +Subproject commit 9c73fd69a4c1cb3b3fc35b741ac968e331642600 -- 2.51.2 From c1783d0cc298055b601f346b446a54d3aac46c71 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 30 Jul 2022 09:52:07 +0900 Subject: [PATCH 115/589] Delete vim-css-color and vim-goimports --- home-manager/nvim/pack/plugins/opt/vim-css-color | 1 - home-manager/nvim/pack/plugins/opt/vim-goimports | 1 - 2 files changed, 2 deletions(-) delete mode 160000 home-manager/nvim/pack/plugins/opt/vim-css-color delete mode 160000 home-manager/nvim/pack/plugins/opt/vim-goimports diff --git a/home-manager/nvim/pack/plugins/opt/vim-css-color b/home-manager/nvim/pack/plugins/opt/vim-css-color deleted file mode 160000 index 8bf9436..0000000 --- a/home-manager/nvim/pack/plugins/opt/vim-css-color +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8bf943681f92c81a8cca19762a1ccec8bc29098a diff --git a/home-manager/nvim/pack/plugins/opt/vim-goimports b/home-manager/nvim/pack/plugins/opt/vim-goimports deleted file mode 160000 index e50dae8..0000000 --- a/home-manager/nvim/pack/plugins/opt/vim-goimports +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e50dae830c3cc405003bbc79e90c2dfb5c8da7f5 -- 2.51.2 From 42eec98e56824684ac733f34c14b91b27406b9cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 07:49:30 +0000 Subject: [PATCH 116/589] Bump nvim/pack/plugins/start/nvim-treesitter from `2139fca` to `2282461` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `2139fca` to `2282461`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/2139fca70c909266a3b23a080ce4315e76da8267...22824614163c54ef5d366b15c8685e24d33763db) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 2139fca..2282461 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 2139fca70c909266a3b23a080ce4315e76da8267 +Subproject commit 22824614163c54ef5d366b15c8685e24d33763db -- 2.51.2 From 48a9967b43518a5120b8e16f17e058ee6c667f17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 07:49:32 +0000 Subject: [PATCH 117/589] Bump nvim/pack/plugins/start/LuaSnip from `be3083b` to `d8cacf8` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `be3083b` to `d8cacf8`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/be3083bbb8ebc21671bf7c91c27f043ebe0a8d8d...d8cacf83a214b7dd80986a8a24e4adf3fdd4f069) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index be3083b..d8cacf8 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit be3083bbb8ebc21671bf7c91c27f043ebe0a8d8d +Subproject commit d8cacf83a214b7dd80986a8a24e4adf3fdd4f069 -- 2.51.2 From 6686a511063cc60c7327c7bdaa1a4adccacf3150 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 07:49:35 +0000 Subject: [PATCH 118/589] Bump nvim/pack/plugins/start/fzf from `ecc418b` to `3a7447d` Bumps [nvim/pack/plugins/start/fzf](https://github.com/junegunn/fzf) from `ecc418b` to `3a7447d`. - [Release notes](https://github.com/junegunn/fzf/releases) - [Commits](https://github.com/junegunn/fzf/compare/ecc418ba77e52660ffdd9ed84727b12c3f377680...3a7447dcb6295e914889422be418d0ec2eaf5fe1) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/fzf dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/fzf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/fzf b/home-manager/nvim/pack/plugins/start/fzf index ecc418b..3a7447d 160000 --- a/home-manager/nvim/pack/plugins/start/fzf +++ b/home-manager/nvim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit ecc418ba77e52660ffdd9ed84727b12c3f377680 +Subproject commit 3a7447dcb6295e914889422be418d0ec2eaf5fe1 -- 2.51.2 From 73f07ea81feeb5bb568bbb189963976249166a58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 07:49:38 +0000 Subject: [PATCH 119/589] Bump nvim/pack/plugins/start/nvim-lspconfig from `dcb7ebb` to `df3be50` Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `dcb7ebb` to `df3be50`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/dcb7ebb36f0d2aafcc640f520bb1fc8a9cc1f7c8...df3be5006530ff73b57d6c302b4da7ed2b0e159d) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index dcb7ebb..df3be50 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit dcb7ebb36f0d2aafcc640f520bb1fc8a9cc1f7c8 +Subproject commit df3be5006530ff73b57d6c302b4da7ed2b0e159d -- 2.51.2 From d3c9bfa9dcd22c588b51f70d0e642dc9589f76d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 08:06:16 +0000 Subject: [PATCH 120/589] Bump nvim/pack/plugins/start/fzf.vim from `c311c0a` to `2f3e29f` Bumps [nvim/pack/plugins/start/fzf.vim](https://github.com/junegunn/fzf.vim) from `c311c0a` to `2f3e29f`. - [Release notes](https://github.com/junegunn/fzf.vim/releases) - [Commits](https://github.com/junegunn/fzf.vim/compare/c311c0a95fc2529c26ab36a8f530e9dd4426304c...2f3e29fc3722b4cf453de303f84f7fb9dabee110) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/fzf.vim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/fzf.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/fzf.vim b/home-manager/nvim/pack/plugins/start/fzf.vim index c311c0a..2f3e29f 160000 --- a/home-manager/nvim/pack/plugins/start/fzf.vim +++ b/home-manager/nvim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit c311c0a95fc2529c26ab36a8f530e9dd4426304c +Subproject commit 2f3e29fc3722b4cf453de303f84f7fb9dabee110 -- 2.51.2 From 860ae050e0ab7ac3c6bc596591490ecb6aada737 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 08:06:18 +0000 Subject: [PATCH 121/589] Bump nvim/pack/plugins/start/nvim-treesitter from `2282461` to `7e41005` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `2282461` to `7e41005`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/22824614163c54ef5d366b15c8685e24d33763db...7e410054235ea84c817fc2b93f8df359ba6545eb) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 2282461..7e41005 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 22824614163c54ef5d366b15c8685e24d33763db +Subproject commit 7e410054235ea84c817fc2b93f8df359ba6545eb -- 2.51.2 From a7b2c0e014db783f9f3bea33050209efbafd9563 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 15 Aug 2022 06:42:31 +0900 Subject: [PATCH 122/589] fix: add `call` before `FormatOnSave()` --- home-manager/nvim/after/ftplugin/python.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/python.vim b/home-manager/nvim/after/ftplugin/python.vim index 1f575df..288f348 100644 --- a/home-manager/nvim/after/ftplugin/python.vim +++ b/home-manager/nvim/after/ftplugin/python.vim @@ -1,4 +1,4 @@ augroup auto_format - autocmd! - autocmd BufWritePre *.py FormatOnSave("%!yapf --style google") + autocmd! + autocmd BufWritePre *.py call FormatOnSave("%!yapf --style google") augroup END -- 2.51.2 From 104d3b6d84f74b9d91c83de887162f35628996a6 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 15 Aug 2022 06:43:24 +0900 Subject: [PATCH 123/589] add `pylsp` --- home-manager/nvim/lua/config.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index df20ab5..c651cef 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -51,6 +51,7 @@ local tsserver = UseDeno and 'denols' or 'tsserver' local servers = { 'cssls', 'gopls', + 'pylsp', 'sumneko_lua', tsserver } -- 2.51.2 From e0e784f3e9ec4397436a22902f85b291e93ff9a6 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Mon, 15 Aug 2022 06:53:19 +0900 Subject: [PATCH 124/589] Remove `esc` mapping for terminal mode --- home-manager/nvim/init.vim | 2 -- 1 file changed, 2 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index 02d4933..c5896b8 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -21,5 +21,3 @@ let eol = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} set statusline=%f%m%{branch}%=%{eol[&fileformat]} set tabstop=4 - -tnoremap -- 2.51.2 From 5d92dad95d86cd151c882b3f5e8411f8d2fd864e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 07:18:43 +0000 Subject: [PATCH 125/589] Bump nvim/pack/plugins/start/fzf.vim from `2f3e29f` to `c491d70` Bumps [nvim/pack/plugins/start/fzf.vim](https://github.com/junegunn/fzf.vim) from `2f3e29f` to `c491d70`. - [Release notes](https://github.com/junegunn/fzf.vim/releases) - [Commits](https://github.com/junegunn/fzf.vim/compare/2f3e29fc3722b4cf453de303f84f7fb9dabee110...c491d702b76c6b4918abb80be3cfb57d1b618ffa) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/fzf.vim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/fzf.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/fzf.vim b/home-manager/nvim/pack/plugins/start/fzf.vim index 2f3e29f..c491d70 160000 --- a/home-manager/nvim/pack/plugins/start/fzf.vim +++ b/home-manager/nvim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit 2f3e29fc3722b4cf453de303f84f7fb9dabee110 +Subproject commit c491d702b76c6b4918abb80be3cfb57d1b618ffa -- 2.51.2 From 2cc08ef9b171708e95625dbc8e98f98388f8f6c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 07:18:55 +0000 Subject: [PATCH 126/589] Bump nvim/pack/plugins/start/LuaSnip from `d8cacf8` to `b8fa22f` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `d8cacf8` to `b8fa22f`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/d8cacf83a214b7dd80986a8a24e4adf3fdd4f069...b8fa22fc12df7a8c48f5c18156874d40f584265c) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index d8cacf8..b8fa22f 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit d8cacf83a214b7dd80986a8a24e4adf3fdd4f069 +Subproject commit b8fa22fc12df7a8c48f5c18156874d40f584265c -- 2.51.2 From 031c27fa5e18aa446716d714c4b65004c41c953a Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 16 Aug 2022 08:23:44 +0900 Subject: [PATCH 127/589] Add clangd and clang-format --- home-manager/nvim/after/ftplugin/cpp.lua | 7 +++++++ home-manager/nvim/lua/config.lua | 1 + 2 files changed, 8 insertions(+) create mode 100644 home-manager/nvim/after/ftplugin/cpp.lua diff --git a/home-manager/nvim/after/ftplugin/cpp.lua b/home-manager/nvim/after/ftplugin/cpp.lua new file mode 100644 index 0000000..d971ea9 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/cpp.lua @@ -0,0 +1,7 @@ +local id = vim.api.nvim_create_augroup('cpp_fmt', {}) + +vim.api.nvim_create_autocmd('BufWritePre', { + group = id, + pattern = {'*.cpp'}, + command = 'call FormatOnSave("%!clang-format")' +}) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index c651cef..40ade83 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -49,6 +49,7 @@ UseDeno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 local tsserver = UseDeno and 'denols' or 'tsserver' local servers = { + 'clangd', 'cssls', 'gopls', 'pylsp', -- 2.51.2 From 81723e7780d5919fd6abc84264b88fbbdd2d0235 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 07:16:54 +0000 Subject: [PATCH 128/589] Bump nvim/pack/plugins/start/nvim-treesitter from `7e41005` to `09b13e9` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `7e41005` to `09b13e9`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/7e410054235ea84c817fc2b93f8df359ba6545eb...09b13e9edb80d3890aa8f7dbebfdb21e34430212) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 7e41005..09b13e9 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 7e410054235ea84c817fc2b93f8df359ba6545eb +Subproject commit 09b13e9edb80d3890aa8f7dbebfdb21e34430212 -- 2.51.2 From 416ff65bac341c50a88e106a6b407b9996208a09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 07:16:56 +0000 Subject: [PATCH 129/589] Bump nvim/pack/plugins/start/nvim-cmp from `706371f` to `8287686` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `706371f` to `8287686`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/706371f1300e7c0acb98b346f80dad2dd9b5f679...828768631bf224a1a63771aefd09c1a072b6fe84) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index 706371f..8287686 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit 706371f1300e7c0acb98b346f80dad2dd9b5f679 +Subproject commit 828768631bf224a1a63771aefd09c1a072b6fe84 -- 2.51.2 From f548fd68f0e3942909b49dcf870a5da7b2e4bfb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 07:16:58 +0000 Subject: [PATCH 130/589] Bump nvim/pack/plugins/start/nvim-scrollview from `ba6c48b` to `14ce355` Bumps [nvim/pack/plugins/start/nvim-scrollview](https://github.com/dstein64/nvim-scrollview) from `ba6c48b` to `14ce355`. - [Release notes](https://github.com/dstein64/nvim-scrollview/releases) - [Commits](https://github.com/dstein64/nvim-scrollview/compare/ba6c48bf7919dd48a371e7b9c683b8858053e885...14ce355d357c4b10e7dbf4ecc9c6b3533fa69f9f) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-scrollview dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-scrollview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-scrollview b/home-manager/nvim/pack/plugins/start/nvim-scrollview index ba6c48b..14ce355 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-scrollview +++ b/home-manager/nvim/pack/plugins/start/nvim-scrollview @@ -1 +1 @@ -Subproject commit ba6c48bf7919dd48a371e7b9c683b8858053e885 +Subproject commit 14ce355d357c4b10e7dbf4ecc9c6b3533fa69f9f -- 2.51.2 From 21ff32c978227d7c5a6201660e4fd9638c17d6cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 07:17:06 +0000 Subject: [PATCH 131/589] Bump nvim/pack/plugins/start/LuaSnip from `b8fa22f` to `a82d84a` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `b8fa22f` to `a82d84a`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/b8fa22fc12df7a8c48f5c18156874d40f584265c...a82d84ae5433cf2af16124123999bff91e8f9e47) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index b8fa22f..a82d84a 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit b8fa22fc12df7a8c48f5c18156874d40f584265c +Subproject commit a82d84ae5433cf2af16124123999bff91e8f9e47 -- 2.51.2 From 707b05d0b25de963ab2fc5973a31cb45a553518d Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 23 Aug 2022 09:02:56 +0900 Subject: [PATCH 132/589] Format using `vim.lsp.buf.formatting_sync()` --- home-manager/nvim/after/ftplugin/cpp.lua | 7 ------- home-manager/nvim/after/ftplugin/go.vim | 5 ----- home-manager/nvim/after/ftplugin/python.vim | 4 ---- home-manager/nvim/after/ftplugin/typescript.lua | 1 - home-manager/nvim/after/ftplugin/typescriptreact.lua | 1 - home-manager/nvim/init.vim | 6 ------ home-manager/nvim/lua/config.lua | 10 +++++++++- home-manager/nvim/lua/ftbase/typescript.lua | 9 --------- 8 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 home-manager/nvim/after/ftplugin/cpp.lua delete mode 100644 home-manager/nvim/after/ftplugin/python.vim delete mode 100644 home-manager/nvim/after/ftplugin/typescript.lua delete mode 100644 home-manager/nvim/lua/ftbase/typescript.lua diff --git a/home-manager/nvim/after/ftplugin/cpp.lua b/home-manager/nvim/after/ftplugin/cpp.lua deleted file mode 100644 index d971ea9..0000000 --- a/home-manager/nvim/after/ftplugin/cpp.lua +++ /dev/null @@ -1,7 +0,0 @@ -local id = vim.api.nvim_create_augroup('cpp_fmt', {}) - -vim.api.nvim_create_autocmd('BufWritePre', { - group = id, - pattern = {'*.cpp'}, - command = 'call FormatOnSave("%!clang-format")' -}) diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index b0ac9c1..aa13c7e 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -1,8 +1,3 @@ -augroup go_format - autocmd! - autocmd BufWritePre *.go call FormatOnSave("%!gofmt -s") -augroup END - let b:AutoPairs = AutoPairsDefine({}, ["'"]) packadd vim-goimports diff --git a/home-manager/nvim/after/ftplugin/python.vim b/home-manager/nvim/after/ftplugin/python.vim deleted file mode 100644 index 288f348..0000000 --- a/home-manager/nvim/after/ftplugin/python.vim +++ /dev/null @@ -1,4 +0,0 @@ -augroup auto_format - autocmd! - autocmd BufWritePre *.py call FormatOnSave("%!yapf --style google") -augroup END diff --git a/home-manager/nvim/after/ftplugin/typescript.lua b/home-manager/nvim/after/ftplugin/typescript.lua deleted file mode 100644 index ab33da9..0000000 --- a/home-manager/nvim/after/ftplugin/typescript.lua +++ /dev/null @@ -1 +0,0 @@ -require('ftbase.typescript') diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.lua b/home-manager/nvim/after/ftplugin/typescriptreact.lua index 2c7ca8a..304aa70 100644 --- a/home-manager/nvim/after/ftplugin/typescriptreact.lua +++ b/home-manager/nvim/after/ftplugin/typescriptreact.lua @@ -1,2 +1 @@ require('ftbase.html') -require('ftbase.typescript') diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index c5896b8..f9859f5 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -1,11 +1,5 @@ filetype on -function! FormatOnSave(formatCommand) - let cursor = winsaveview() - silent! execute a:formatCommand - call winrestview(cursor) -endfunction - lua require('config') set lcs=eol:↲,tab:>_,trail:・ diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 40ade83..65f12c9 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -2,8 +2,9 @@ local cmp = require('cmp') local luasnip = require('luasnip') local function has_words_before() local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line-1, line, true)[1]:sub(col, col):match('%s') == nil + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil end + cmp.setup { mapping = { [''] = cmp.mapping(function(fallback) @@ -78,6 +79,13 @@ require('nvim-treesitter.configs').setup { } } +local id = vim.api.nvim_create_augroup('fmt', {}) +vim.api.nvim_create_autocmd('BufWritePre', { + group = id, + pattern = { '*' }, + command = 'lua vim.lsp.buf.formatting_sync()' +}) + vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 diff --git a/home-manager/nvim/lua/ftbase/typescript.lua b/home-manager/nvim/lua/ftbase/typescript.lua deleted file mode 100644 index b4c6311..0000000 --- a/home-manager/nvim/lua/ftbase/typescript.lua +++ /dev/null @@ -1,9 +0,0 @@ -if UseDeno then - local id = vim.api.nvim_create_augroup('ts_fmt', {}) - - vim.api.nvim_create_autocmd('BufWritePre', { - group = id, - pattern = {'*.ts'}, - command = 'call FormatOnSave("%!deno fmt -")' - }) -end -- 2.51.2 From d3ca823f648ff250cd5ef88cb0c34d4b1faedcff Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 24 Aug 2022 07:01:50 +0900 Subject: [PATCH 133/589] Setup powershell_es --- home-manager/nvim/lua/config.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 65f12c9..a6ad872 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -71,6 +71,10 @@ for _, lsp in ipairs(servers) do } } end +LspConfig.powershell_es.setup { + bundle_path = 'C:/PowerShellEditorServices', + capabilities = capabilities +} require('nvim-treesitter.configs').setup { auto_install = true, -- 2.51.2 From 4df5573fc4484c5ca0ed6c3f66f4d93654e7298b Mon Sep 17 00:00:00 2001 From: akimon658 Date: Fri, 26 Aug 2022 06:02:45 +0900 Subject: [PATCH 134/589] Add bashls --- home-manager/nvim/lua/config.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index a6ad872..e37117a 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -50,6 +50,7 @@ UseDeno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 local tsserver = UseDeno and 'denols' or 'tsserver' local servers = { + 'bashls', 'clangd', 'cssls', 'gopls', -- 2.51.2 From de6a0b7cc489ae989e6980f9c07b5851662d9fea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 07:21:12 +0000 Subject: [PATCH 135/589] Bump nvim/pack/plugins/start/nvim-lspconfig from `df3be50` to `636ce36` Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `df3be50` to `636ce36`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/df3be5006530ff73b57d6c302b4da7ed2b0e159d...636ce36c30725391486377850bf8460dc0723ae2) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index df3be50..636ce36 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit df3be5006530ff73b57d6c302b4da7ed2b0e159d +Subproject commit 636ce36c30725391486377850bf8460dc0723ae2 -- 2.51.2 From 9479fc4926687dac8d3d9cd010b8afc8f7b937f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 07:21:14 +0000 Subject: [PATCH 136/589] Bump nvim/pack/plugins/start/nvim-treesitter from `09b13e9` to `9560e3c` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `09b13e9` to `9560e3c`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/09b13e9edb80d3890aa8f7dbebfdb21e34430212...9560e3ce7d9f01b21f7f14c0b2d93f718e1ccf36) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 09b13e9..9560e3c 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 09b13e9edb80d3890aa8f7dbebfdb21e34430212 +Subproject commit 9560e3ce7d9f01b21f7f14c0b2d93f718e1ccf36 -- 2.51.2 From c18172f0346d2ead2c95cdec4ba3e81ecd3a27dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 07:21:17 +0000 Subject: [PATCH 137/589] Bump nvim/pack/plugins/start/nvim-cmp from `8287686` to `058100d` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `8287686` to `058100d`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/828768631bf224a1a63771aefd09c1a072b6fe84...058100d81316239f3874064064f0f0c5d43c2103) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index 8287686..058100d 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit 828768631bf224a1a63771aefd09c1a072b6fe84 +Subproject commit 058100d81316239f3874064064f0f0c5d43c2103 -- 2.51.2 From e07bd50f7f6c7f7eb794b25f798cfac455408ede Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 07:21:25 +0000 Subject: [PATCH 138/589] Bump nvim/pack/plugins/start/LuaSnip from `a82d84a` to `9f454cc` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `a82d84a` to `9f454cc`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/a82d84ae5433cf2af16124123999bff91e8f9e47...9f454cc75b3f8ca129ec3b59abcb75e40bfd7246) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index a82d84a..9f454cc 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit a82d84ae5433cf2af16124123999bff91e8f9e47 +Subproject commit 9f454cc75b3f8ca129ec3b59abcb75e40bfd7246 -- 2.51.2 From 55909a4364b13fe0c7e988a2b4b2f12cc433bdd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 14:32:59 +0000 Subject: [PATCH 139/589] Bump nvim/pack/plugins/start/nvim-treesitter from `9560e3c` to `223883f` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `9560e3c` to `223883f`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/9560e3ce7d9f01b21f7f14c0b2d93f718e1ccf36...223883fd698113c2ed780a1359988afdc3ec5a39) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 9560e3c..223883f 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 9560e3ce7d9f01b21f7f14c0b2d93f718e1ccf36 +Subproject commit 223883fd698113c2ed780a1359988afdc3ec5a39 -- 2.51.2 From 5898a2249c1d2457a7e533401ae136c1d5254ced Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 14:33:02 +0000 Subject: [PATCH 140/589] Bump nvim/pack/plugins/start/nvim-cmp from `058100d` to `33fbb2c` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `058100d` to `33fbb2c`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/058100d81316239f3874064064f0f0c5d43c2103...33fbb2c3d2c512bd79ea03cf11fea405cbe618a9) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index 058100d..33fbb2c 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit 058100d81316239f3874064064f0f0c5d43c2103 +Subproject commit 33fbb2c3d2c512bd79ea03cf11fea405cbe618a9 -- 2.51.2 From 68d03f7c47368595609dc6b406fd9937ededbaed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 14:33:16 +0000 Subject: [PATCH 141/589] Bump nvim/pack/plugins/start/LuaSnip from `9f454cc` to `c6a7171` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `9f454cc` to `c6a7171`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/9f454cc75b3f8ca129ec3b59abcb75e40bfd7246...c6a71716d46024d4035438eb485d8b0ba25eef4b) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 9f454cc..c6a7171 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 9f454cc75b3f8ca129ec3b59abcb75e40bfd7246 +Subproject commit c6a71716d46024d4035438eb485d8b0ba25eef4b -- 2.51.2 From 466c782e3e9a4cace48d06ae241df35919f6e5b9 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 6 Sep 2022 06:56:57 +0900 Subject: [PATCH 142/589] Use PowerShell in Neovim on Windows --- home-manager/nvim/lua/config.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index e37117a..91dadc5 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -102,3 +102,9 @@ vim.opt.number = true vim.opt.relativenumber = true vim.opt.shiftwidth = 2 vim.opt.wrap = false + +if vim.fn.has('win64') == 1 then + vim.opt.shell = 'pwsh -NoLogo' + vim.opt.shellcmdflag = '-Command' + vim.opt.shellxquote = '' +end -- 2.51.2 From 4ca430f2f5214845ee8c0b8ff56a30ad6ee857b1 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 10 Sep 2022 19:09:38 +0900 Subject: [PATCH 143/589] Set `cmdheight` to 0 --- home-manager/nvim/lua/config.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 91dadc5..9f53d74 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -97,6 +97,7 @@ vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') vim.keymap.set('n', '', 'GFiles') vim.keymap.set('n', '', 'LazyGit') +vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.number = true vim.opt.relativenumber = true -- 2.51.2 From 7d6385317edc8e0138a2dd49daa2e4d2a1ee8a83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 07:33:05 +0000 Subject: [PATCH 144/589] Bump nvim/pack/plugins/start/nvim-treesitter from `223883f` to `c42812e` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `223883f` to `c42812e`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/223883fd698113c2ed780a1359988afdc3ec5a39...c42812ecc7008291ebb51019d9753b97467e4140) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 223883f..c42812e 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 223883fd698113c2ed780a1359988afdc3ec5a39 +Subproject commit c42812ecc7008291ebb51019d9753b97467e4140 -- 2.51.2 From e4ee243bd020f161d87b9c661a08eff01ebbd5b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 07:33:12 +0000 Subject: [PATCH 145/589] Bump nvim/pack/plugins/start/nvim-scrollview from `14ce355` to `d03d1e3` Bumps [nvim/pack/plugins/start/nvim-scrollview](https://github.com/dstein64/nvim-scrollview) from `14ce355` to `d03d1e3`. - [Release notes](https://github.com/dstein64/nvim-scrollview/releases) - [Commits](https://github.com/dstein64/nvim-scrollview/compare/14ce355d357c4b10e7dbf4ecc9c6b3533fa69f9f...d03d1e305306b8b6927d63182384be0831fa3831) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-scrollview dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-scrollview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-scrollview b/home-manager/nvim/pack/plugins/start/nvim-scrollview index 14ce355..d03d1e3 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-scrollview +++ b/home-manager/nvim/pack/plugins/start/nvim-scrollview @@ -1 +1 @@ -Subproject commit 14ce355d357c4b10e7dbf4ecc9c6b3533fa69f9f +Subproject commit d03d1e305306b8b6927d63182384be0831fa3831 -- 2.51.2 From be596ec64744c4b69ab67cc225b6d5a34d1da7e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 07:33:14 +0000 Subject: [PATCH 146/589] Bump nvim/pack/plugins/start/nvim-cmp from `33fbb2c` to `913eb85` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `33fbb2c` to `913eb85`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/33fbb2c3d2c512bd79ea03cf11fea405cbe618a9...913eb8599816b0b71fe959693080917d8063b26a) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index 33fbb2c..913eb85 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit 33fbb2c3d2c512bd79ea03cf11fea405cbe618a9 +Subproject commit 913eb8599816b0b71fe959693080917d8063b26a -- 2.51.2 From a7826b52cc8832b83ad49fe097d17fc7b02f3727 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 07:33:17 +0000 Subject: [PATCH 147/589] Bump nvim/pack/plugins/start/nvim-lspconfig from `636ce36` to `8e65dbb` Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `636ce36` to `8e65dbb`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/636ce36c30725391486377850bf8460dc0723ae2...8e65dbb6e187604cdaf0e0ef2e90c790760912e7) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index 636ce36..8e65dbb 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 636ce36c30725391486377850bf8460dc0723ae2 +Subproject commit 8e65dbb6e187604cdaf0e0ef2e90c790760912e7 -- 2.51.2 From f773107bcbf97bc7fae40b9ded982ed31ab80acb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 07:33:21 +0000 Subject: [PATCH 148/589] Bump nvim/pack/plugins/start/LuaSnip from `c6a7171` to `6e506ce` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `c6a7171` to `6e506ce`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/c6a71716d46024d4035438eb485d8b0ba25eef4b...6e506ce63b7bebd1d4cb2243e0ab67abe82d9594) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index c6a7171..6e506ce 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit c6a71716d46024d4035438eb485d8b0ba25eef4b +Subproject commit 6e506ce63b7bebd1d4cb2243e0ab67abe82d9594 -- 2.51.2 From f22c3075f28ba926ef792f61204ce1582a1ef85e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 07:24:28 +0000 Subject: [PATCH 149/589] Bump nvim/pack/plugins/start/nvim-treesitter from `c42812e` to `17563f4` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `c42812e` to `17563f4`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/c42812ecc7008291ebb51019d9753b97467e4140...17563f4699f7d4049e68791b29c2af639993d96c) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index c42812e..17563f4 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit c42812ecc7008291ebb51019d9753b97467e4140 +Subproject commit 17563f4699f7d4049e68791b29c2af639993d96c -- 2.51.2 From adaf5be26143d70d29b786985a5a63d4f4c77a34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 07:24:30 +0000 Subject: [PATCH 150/589] Bump nvim/pack/plugins/start/LuaSnip from `6e506ce` to `d049b3d` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `6e506ce` to `d049b3d`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/6e506ce63b7bebd1d4cb2243e0ab67abe82d9594...d049b3dbefee5d0a6d0bfbd913dfaa89ded0457f) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 6e506ce..d049b3d 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 6e506ce63b7bebd1d4cb2243e0ab67abe82d9594 +Subproject commit d049b3dbefee5d0a6d0bfbd913dfaa89ded0457f -- 2.51.2 From 988486d508a12be48a57d0a14572630f1beb8aae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 07:24:34 +0000 Subject: [PATCH 151/589] Bump nvim/pack/plugins/start/nvim-lspconfig from `8e65dbb` to `51775b1` Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `8e65dbb` to `51775b1`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/8e65dbb6e187604cdaf0e0ef2e90c790760912e7...51775b12cfbf1b6462c7b13cd020cc09e6767aea) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index 8e65dbb..51775b1 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 8e65dbb6e187604cdaf0e0ef2e90c790760912e7 +Subproject commit 51775b12cfbf1b6462c7b13cd020cc09e6767aea -- 2.51.2 From a0dec96b6f7efa968ba4c259eec4946edaf311d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 07:39:51 +0000 Subject: [PATCH 152/589] Bump nvim/pack/plugins/start/nvim-treesitter from `17563f4` to `7ce47dd` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `17563f4` to `7ce47dd`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/17563f4699f7d4049e68791b29c2af639993d96c...7ce47ddf52766aed192e8b83eda1bea20f043d24) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 17563f4..7ce47dd 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 17563f4699f7d4049e68791b29c2af639993d96c +Subproject commit 7ce47ddf52766aed192e8b83eda1bea20f043d24 -- 2.51.2 From 2c1261809cfcfbd3ef61f0979ecc3fb33c7c5fb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 07:39:56 +0000 Subject: [PATCH 153/589] Bump nvim/pack/plugins/start/nvim-lspconfig from `51775b1` to `f11fdff` Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `51775b1` to `f11fdff`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/51775b12cfbf1b6462c7b13cd020cc09e6767aea...f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index 51775b1..f11fdff 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 51775b12cfbf1b6462c7b13cd020cc09e6767aea +Subproject commit f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda -- 2.51.2 From 75e9a8696353fa3f0e392c49761680fba40a3b41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 07:39:58 +0000 Subject: [PATCH 154/589] Bump nvim/pack/plugins/start/nvim-cmp from `913eb85` to `b0dff0e` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `913eb85` to `b0dff0e`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/913eb8599816b0b71fe959693080917d8063b26a...b0dff0ec4f2748626aae13f011d1a47071fe9abc) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index 913eb85..b0dff0e 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit 913eb8599816b0b71fe959693080917d8063b26a +Subproject commit b0dff0ec4f2748626aae13f011d1a47071fe9abc -- 2.51.2 From 21e15ab63eca3b46f82cccb7bc1c11357609654b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 07:40:01 +0000 Subject: [PATCH 155/589] Bump nvim/pack/plugins/start/LuaSnip from `d049b3d` to `8f8d493` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `d049b3d` to `8f8d493`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/d049b3dbefee5d0a6d0bfbd913dfaa89ded0457f...8f8d493e7836f2697df878ef9c128337cbf2bb84) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index d049b3d..8f8d493 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit d049b3dbefee5d0a6d0bfbd913dfaa89ded0457f +Subproject commit 8f8d493e7836f2697df878ef9c128337cbf2bb84 -- 2.51.2 From 829815dce70f5722bba89bd425d2a5323436e0a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 07:40:04 +0000 Subject: [PATCH 156/589] Bump nvim/pack/plugins/start/nvim-scrollview from `d03d1e3` to `25c2321` Bumps [nvim/pack/plugins/start/nvim-scrollview](https://github.com/dstein64/nvim-scrollview) from `d03d1e3` to `25c2321`. - [Release notes](https://github.com/dstein64/nvim-scrollview/releases) - [Commits](https://github.com/dstein64/nvim-scrollview/compare/d03d1e305306b8b6927d63182384be0831fa3831...25c23219db8b2b932a595b4d2b661406ce4459fe) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-scrollview dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-scrollview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-scrollview b/home-manager/nvim/pack/plugins/start/nvim-scrollview index d03d1e3..25c2321 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-scrollview +++ b/home-manager/nvim/pack/plugins/start/nvim-scrollview @@ -1 +1 @@ -Subproject commit d03d1e305306b8b6927d63182384be0831fa3831 +Subproject commit 25c23219db8b2b932a595b4d2b661406ce4459fe -- 2.51.2 From a6a63be8d7fb1b97c3961f7c8cda23969c11a6c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 07:21:38 +0000 Subject: [PATCH 157/589] Bump nvim/pack/plugins/start/nvim-treesitter from `7ce47dd` to `de2fa53` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `7ce47dd` to `de2fa53`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/7ce47ddf52766aed192e8b83eda1bea20f043d24...de2fa5327a566c16cdf85984f3c4fff7aafecc97) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 7ce47dd..de2fa53 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 7ce47ddf52766aed192e8b83eda1bea20f043d24 +Subproject commit de2fa5327a566c16cdf85984f3c4fff7aafecc97 -- 2.51.2 From 16fd3b98ec7f0d3cbb9b7119ffb0d422f4ba0ca3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 07:21:45 +0000 Subject: [PATCH 158/589] Bump nvim/pack/plugins/start/nvim-cmp from `b0dff0e` to `e94d348` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `b0dff0e` to `e94d348`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/b0dff0ec4f2748626aae13f011d1a47071fe9abc...e94d3489311f941788756953df23ca84f83eec95) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index b0dff0e..e94d348 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit b0dff0ec4f2748626aae13f011d1a47071fe9abc +Subproject commit e94d3489311f941788756953df23ca84f83eec95 -- 2.51.2 From 70cfaac1e912fecf9b9fa93ff718079af2ebd328 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 07:21:49 +0000 Subject: [PATCH 159/589] Bump nvim/pack/plugins/start/cmp-nvim-lsp from `ebdfc20` to `3cf38d9` Bumps [nvim/pack/plugins/start/cmp-nvim-lsp](https://github.com/hrsh7th/cmp-nvim-lsp) from `ebdfc20` to `3cf38d9`. - [Release notes](https://github.com/hrsh7th/cmp-nvim-lsp/releases) - [Commits](https://github.com/hrsh7th/cmp-nvim-lsp/compare/ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba...3cf38d9c957e95c397b66f91967758b31be4abe6) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/cmp-nvim-lsp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/cmp-nvim-lsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp b/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp index ebdfc20..3cf38d9 160000 --- a/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp +++ b/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp @@ -1 +1 @@ -Subproject commit ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba +Subproject commit 3cf38d9c957e95c397b66f91967758b31be4abe6 -- 2.51.2 From e1e864098339ee5ea73c58b8e064fa5bdfe976d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 07:21:52 +0000 Subject: [PATCH 160/589] Bump nvim/pack/plugins/start/LuaSnip from `8f8d493` to `663d544` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `8f8d493` to `663d544`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/8f8d493e7836f2697df878ef9c128337cbf2bb84...663d54482b11bca1ce94f56993b9f6ab485a13dc) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 8f8d493..663d544 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 8f8d493e7836f2697df878ef9c128337cbf2bb84 +Subproject commit 663d54482b11bca1ce94f56993b9f6ab485a13dc -- 2.51.2 From 4d134216694814a30d65367f8c04bbeaa00f68f9 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Tue, 18 Oct 2022 08:01:45 +0900 Subject: [PATCH 161/589] lsp: Use `default_capabilities()` --- home-manager/nvim/lua/config.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 9f53d74..e6bdebe 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -42,8 +42,7 @@ cmp.setup { } } -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) +local capabilities = require('cmp_nvim_lsp').default_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true UseDeno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 -- 2.51.2 From 573b768d16b24abe38f5e333f4d151eaf48f6200 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 07:27:44 +0000 Subject: [PATCH 162/589] Bump nvim/pack/plugins/start/nvim-treesitter from `de2fa53` to `682fa45` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `de2fa53` to `682fa45`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/de2fa5327a566c16cdf85984f3c4fff7aafecc97...682fa459173208997092adf872baa66a7f04692d) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index de2fa53..682fa45 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit de2fa5327a566c16cdf85984f3c4fff7aafecc97 +Subproject commit 682fa459173208997092adf872baa66a7f04692d -- 2.51.2 From 950c462f6d7346738ee078a0e32f34770b8cff2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 07:27:46 +0000 Subject: [PATCH 163/589] Bump nvim/pack/plugins/start/vscode.nvim from `0742e59` to `920145b` Bumps [nvim/pack/plugins/start/vscode.nvim](https://github.com/Mofiqul/vscode.nvim) from `0742e59` to `920145b`. - [Release notes](https://github.com/Mofiqul/vscode.nvim/releases) - [Commits](https://github.com/Mofiqul/vscode.nvim/compare/0742e59ba17e67a22ea22db9d9a49d70f68488bc...920145bc2c431f8086549957aeb085d8e4c10ab2) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/vscode.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/vscode.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/vscode.nvim b/home-manager/nvim/pack/plugins/start/vscode.nvim index 0742e59..920145b 160000 --- a/home-manager/nvim/pack/plugins/start/vscode.nvim +++ b/home-manager/nvim/pack/plugins/start/vscode.nvim @@ -1 +1 @@ -Subproject commit 0742e59ba17e67a22ea22db9d9a49d70f68488bc +Subproject commit 920145bc2c431f8086549957aeb085d8e4c10ab2 -- 2.51.2 From 24ab9e1e900c14fec5e58f0bc1cf15ced3e8f247 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 26 Oct 2022 18:22:03 +0900 Subject: [PATCH 164/589] Add a plugin nvim-treesitter-context --- home-manager/nvim/pack/plugins/start/nvim-treesitter-context | 1 + 1 file changed, 1 insertion(+) create mode 160000 home-manager/nvim/pack/plugins/start/nvim-treesitter-context diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter-context b/home-manager/nvim/pack/plugins/start/nvim-treesitter-context new file mode 160000 index 0000000..0dd5eae --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter-context @@ -0,0 +1 @@ +Subproject commit 0dd5eae6dbf226107da2c2041ffbb695d9e267c1 -- 2.51.2 From fea9b767b21acfafaf36927fde948ccede322dcf Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 29 Oct 2022 09:54:50 +0900 Subject: [PATCH 165/589] Use zenhan.exe to disable IME --- home-manager/nvim/lua/config.lua | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index e6bdebe..34ea32a 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -83,12 +83,29 @@ require('nvim-treesitter.configs').setup { } } -local id = vim.api.nvim_create_augroup('fmt', {}) -vim.api.nvim_create_autocmd('BufWritePre', { - group = id, - pattern = { '*' }, - command = 'lua vim.lsp.buf.formatting_sync()' -}) +local pattern_any = { '*' } +local autocmds = { + { + event = 'BufWritePre', + config = { + group = vim.api.nvim_create_augroup('fmt', {}), + pattern = pattern_any, + command = 'lua vim.lsp.buf.formatting_sync()' + } + }, + { + event = 'InsertLeave', + config = { + group = vim.api.nvim_create_augroup('disable_ime', {}), + pattern = pattern_any, + command = 'call system("zenhan.exe 0")' + } + } +} + +for _, autocmd in ipairs(autocmds) do + vim.api.nvim_create_autocmd(autocmd.event, autocmd.config) +end vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 -- 2.51.2 From 102236d67b330f08d6c9d4146bdf19e2825b9d74 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 29 Oct 2022 10:30:37 +0900 Subject: [PATCH 166/589] Migrate to telescope.nvim from fzf.vim --- home-manager/nvim/lua/config.lua | 2 +- home-manager/nvim/pack/plugins/start/fzf | 1 - home-manager/nvim/pack/plugins/start/fzf.vim | 1 - home-manager/nvim/pack/plugins/start/plenary.nvim | 1 + home-manager/nvim/pack/plugins/start/telescope.nvim | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 160000 home-manager/nvim/pack/plugins/start/fzf delete mode 160000 home-manager/nvim/pack/plugins/start/fzf.vim create mode 160000 home-manager/nvim/pack/plugins/start/plenary.nvim create mode 160000 home-manager/nvim/pack/plugins/start/telescope.nvim diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 34ea32a..c03decf 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -111,7 +111,7 @@ vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') -vim.keymap.set('n', '', 'GFiles') +vim.keymap.set('n', '', require('telescope.builtin').git_files) vim.keymap.set('n', '', 'LazyGit') vim.opt.cmdheight = 0 vim.opt.expandtab = true diff --git a/home-manager/nvim/pack/plugins/start/fzf b/home-manager/nvim/pack/plugins/start/fzf deleted file mode 160000 index 3a7447d..0000000 --- a/home-manager/nvim/pack/plugins/start/fzf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3a7447dcb6295e914889422be418d0ec2eaf5fe1 diff --git a/home-manager/nvim/pack/plugins/start/fzf.vim b/home-manager/nvim/pack/plugins/start/fzf.vim deleted file mode 160000 index c491d70..0000000 --- a/home-manager/nvim/pack/plugins/start/fzf.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c491d702b76c6b4918abb80be3cfb57d1b618ffa diff --git a/home-manager/nvim/pack/plugins/start/plenary.nvim b/home-manager/nvim/pack/plugins/start/plenary.nvim new file mode 160000 index 0000000..4b7e520 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/plenary.nvim @@ -0,0 +1 @@ +Subproject commit 4b7e52044bbb84242158d977a50c4cbcd85070c7 diff --git a/home-manager/nvim/pack/plugins/start/telescope.nvim b/home-manager/nvim/pack/plugins/start/telescope.nvim new file mode 160000 index 0000000..9784730 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/telescope.nvim @@ -0,0 +1 @@ +Subproject commit 97847309cbffbb33e442f07b8877d20322a26922 -- 2.51.2 From 3445a2b2193dc889ac5a272fcb21fa23590a810d Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 29 Oct 2022 10:44:02 +0900 Subject: [PATCH 167/589] lazygit: Use plenary --- home-manager/nvim/lua/config.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index c03decf..2f046f3 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -107,12 +107,13 @@ for _, autocmd in ipairs(autocmds) do vim.api.nvim_create_autocmd(autocmd.event, autocmd.config) end +vim.g.lazygit_floating_window_use_plenary = 1 vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') vim.keymap.set('n', '', require('telescope.builtin').git_files) -vim.keymap.set('n', '', 'LazyGit') +vim.keymap.set('n', '', require('lazygit').lazygit) vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.number = true -- 2.51.2 From 71c2f2d765c220ce5053e9f5b9a38d9fa8912ae7 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 29 Oct 2022 20:45:26 +0900 Subject: [PATCH 168/589] Add a keymap for `live_grep` --- home-manager/nvim/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 2f046f3..769dd22 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -1,5 +1,7 @@ +local builtin = require('telescope.builtin') local cmp = require('cmp') local luasnip = require('luasnip') + local function has_words_before() local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil @@ -112,8 +114,9 @@ vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') -vim.keymap.set('n', '', require('telescope.builtin').git_files) +vim.keymap.set('n', '', builtin.live_grep) vim.keymap.set('n', '', require('lazygit').lazygit) +vim.keymap.set('n', '', builtin.git_files) vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.number = true -- 2.51.2 From ac01209789e3e6c48ef93d6e00d781c2496db6e7 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 29 Oct 2022 20:49:20 +0900 Subject: [PATCH 169/589] Make `LspConfig` local variable --- home-manager/nvim/lua/config.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 769dd22..2462d7d 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -1,6 +1,7 @@ local builtin = require('telescope.builtin') local cmp = require('cmp') local luasnip = require('luasnip') +local lsp_config = require('lspconfig') local function has_words_before() local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) @@ -60,9 +61,8 @@ local servers = { tsserver } -LspConfig = require('lspconfig') for _, lsp in ipairs(servers) do - LspConfig[lsp].setup { + lsp_config[lsp].setup { capabilities = capabilities, settings = { Lua = { @@ -73,7 +73,8 @@ for _, lsp in ipairs(servers) do } } end -LspConfig.powershell_es.setup { + +lsp_config.powershell_es.setup { bundle_path = 'C:/PowerShellEditorServices', capabilities = capabilities } -- 2.51.2 From 0d3650485077d1843f990c5da5af2735dbf062bc Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 29 Oct 2022 22:25:03 +0900 Subject: [PATCH 170/589] Make `UseDeno` local variable --- home-manager/nvim/lua/config.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 2462d7d..11bdacc 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -48,8 +48,8 @@ cmp.setup { local capabilities = require('cmp_nvim_lsp').default_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true -UseDeno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 -local tsserver = UseDeno and 'denols' or 'tsserver' +local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 +local tsserver = use_deno and 'denols' or 'tsserver' local servers = { 'bashls', -- 2.51.2 From 0dca67f4487c649068f79e2eb5255e800e69b1d9 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 29 Oct 2022 22:44:43 +0900 Subject: [PATCH 171/589] Add type annotations ref: https://github.com/sumneko/lua-language-server/wiki/Annotations --- home-manager/nvim/lua/config.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 11bdacc..b917f34 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -3,6 +3,7 @@ local cmp = require('cmp') local luasnip = require('luasnip') local lsp_config = require('lspconfig') +---@return boolean local function has_words_before() local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil @@ -48,9 +49,12 @@ cmp.setup { local capabilities = require('cmp_nvim_lsp').default_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true +---@type boolean local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 +---@type string local tsserver = use_deno and 'denols' or 'tsserver' +---@type string[] local servers = { 'bashls', 'clangd', @@ -87,6 +91,17 @@ require('nvim-treesitter.configs').setup { } local pattern_any = { '*' } + +---@class AutoCmdConfig +---@field group any +---@field pattern string[] +---@field command string + +---@class AutoCmd +---@field event string +---@field config AutoCmdConfig + +---@type AutoCmd[] local autocmds = { { event = 'BufWritePre', -- 2.51.2 From dc7c94482f17ced5e2afd2bb998b9fa704d90ae7 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sat, 29 Oct 2022 23:02:24 +0900 Subject: [PATCH 172/589] Use `for` to define keymaps --- home-manager/nvim/lua/config.lua | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index b917f34..ab13dd4 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -130,9 +130,35 @@ vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') -vim.keymap.set('n', '', builtin.live_grep) -vim.keymap.set('n', '', require('lazygit').lazygit) -vim.keymap.set('n', '', builtin.git_files) + +---@class Keymap +---@field mode string +---@field key string +---@field action function + +---@type Keymap[] +local keymaps = { + { + mode = 'n', + key = '', + action = builtin.live_grep + }, + { + mode = 'n', + key = '', + action = require('lazygit').lazygit + }, + { + mode = 'n', + key = '', + action = builtin.git_files + } +} + +for _, map in ipairs(keymaps) do + vim.keymap.set(map.mode, map.key, map.action) +end + vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.number = true -- 2.51.2 From f0e8473818ff93b5c80a9930cd684a2d455ebdc3 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 30 Oct 2022 14:35:40 +0900 Subject: [PATCH 173/589] Add `jsonls` --- home-manager/nvim/lua/config.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index ab13dd4..4a2c59f 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -60,6 +60,7 @@ local servers = { 'clangd', 'cssls', 'gopls', + 'jsonls', 'pylsp', 'sumneko_lua', tsserver -- 2.51.2 From 38f1c4b1d65d93ce476612197502576a25933a45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:20:12 +0000 Subject: [PATCH 174/589] Bump nvim/pack/plugins/start/nvim-cmp from `e94d348` to `9bb8ee6` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `e94d348` to `9bb8ee6`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/e94d3489311f941788756953df23ca84f83eec95...9bb8ee6e2d6ab3c8cc53323b79f05886bc722faa) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index e94d348..9bb8ee6 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit e94d3489311f941788756953df23ca84f83eec95 +Subproject commit 9bb8ee6e2d6ab3c8cc53323b79f05886bc722faa -- 2.51.2 From e579a19388a1d274350abf17b0473b5e01ec8b46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:20:19 +0000 Subject: [PATCH 175/589] Bump nvim/pack/plugins/start/cmp_luasnip from `a9de941` to `1809552` Bumps [nvim/pack/plugins/start/cmp_luasnip](https://github.com/saadparwaiz1/cmp_luasnip) from `a9de941` to `1809552`. - [Release notes](https://github.com/saadparwaiz1/cmp_luasnip/releases) - [Commits](https://github.com/saadparwaiz1/cmp_luasnip/compare/a9de941bcbda508d0a45d28ae366bb3f08db2e36...18095520391186d634a0045dacaa346291096566) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/cmp_luasnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/cmp_luasnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/cmp_luasnip b/home-manager/nvim/pack/plugins/start/cmp_luasnip index a9de941..1809552 160000 --- a/home-manager/nvim/pack/plugins/start/cmp_luasnip +++ b/home-manager/nvim/pack/plugins/start/cmp_luasnip @@ -1 +1 @@ -Subproject commit a9de941bcbda508d0a45d28ae366bb3f08db2e36 +Subproject commit 18095520391186d634a0045dacaa346291096566 -- 2.51.2 From 7afda009f9f90b6487dd215d9001675576db364c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 07:20:22 +0000 Subject: [PATCH 176/589] Bump nvim/pack/plugins/start/cmp-nvim-lsp from `3cf38d9` to `78924d1` Bumps [nvim/pack/plugins/start/cmp-nvim-lsp](https://github.com/hrsh7th/cmp-nvim-lsp) from `3cf38d9` to `78924d1`. - [Release notes](https://github.com/hrsh7th/cmp-nvim-lsp/releases) - [Commits](https://github.com/hrsh7th/cmp-nvim-lsp/compare/3cf38d9c957e95c397b66f91967758b31be4abe6...78924d1d677b29b3d1fe429864185341724ee5a2) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/cmp-nvim-lsp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/cmp-nvim-lsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp b/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp index 3cf38d9..78924d1 160000 --- a/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp +++ b/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp @@ -1 +1 @@ -Subproject commit 3cf38d9c957e95c397b66f91967758b31be4abe6 +Subproject commit 78924d1d677b29b3d1fe429864185341724ee5a2 -- 2.51.2 From 5d2f9c652ed011ec41b59c836914ea9cc4bd8da3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 07:03:28 +0000 Subject: [PATCH 177/589] Bump nvim/pack/plugins/start/lazygit.nvim from `9c73fd6` to `32bffde` Bumps [nvim/pack/plugins/start/lazygit.nvim](https://github.com/kdheepak/lazygit.nvim) from `9c73fd6` to `32bffde`. - [Release notes](https://github.com/kdheepak/lazygit.nvim/releases) - [Commits](https://github.com/kdheepak/lazygit.nvim/compare/9c73fd69a4c1cb3b3fc35b741ac968e331642600...32bffdebe273e571588f25c8a708ca7297928617) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/lazygit.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/lazygit.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/lazygit.nvim b/home-manager/nvim/pack/plugins/start/lazygit.nvim index 9c73fd6..32bffde 160000 --- a/home-manager/nvim/pack/plugins/start/lazygit.nvim +++ b/home-manager/nvim/pack/plugins/start/lazygit.nvim @@ -1 +1 @@ -Subproject commit 9c73fd69a4c1cb3b3fc35b741ac968e331642600 +Subproject commit 32bffdebe273e571588f25c8a708ca7297928617 -- 2.51.2 From e05ddb744c8bb7f795995810f5b591f92dcec694 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 07:03:36 +0000 Subject: [PATCH 178/589] Bump nvim/pack/plugins/start/nvim-treesitter from `682fa45` to `00b42ac` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `682fa45` to `00b42ac`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/682fa459173208997092adf872baa66a7f04692d...00b42ac6d4c852d34619eaf2ea822266588d75e3) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 682fa45..00b42ac 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 682fa459173208997092adf872baa66a7f04692d +Subproject commit 00b42ac6d4c852d34619eaf2ea822266588d75e3 -- 2.51.2 From 01ca2e7b293dba220727dcd37e955e4b6d175ec6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 07:03:54 +0000 Subject: [PATCH 179/589] Bump nvim/pack/plugins/start/telescope.nvim from `9784730` to `cc77713` Bumps [nvim/pack/plugins/start/telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) from `9784730` to `cc77713`. - [Release notes](https://github.com/nvim-telescope/telescope.nvim/releases) - [Commits](https://github.com/nvim-telescope/telescope.nvim/compare/97847309cbffbb33e442f07b8877d20322a26922...cc77713294892c5bbce26adee665114250624e6b) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/telescope.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/telescope.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/telescope.nvim b/home-manager/nvim/pack/plugins/start/telescope.nvim index 9784730..cc77713 160000 --- a/home-manager/nvim/pack/plugins/start/telescope.nvim +++ b/home-manager/nvim/pack/plugins/start/telescope.nvim @@ -1 +1 @@ -Subproject commit 97847309cbffbb33e442f07b8877d20322a26922 +Subproject commit cc77713294892c5bbce26adee665114250624e6b -- 2.51.2 From 20af46f50d4e943c74a360bf35785edc723ad2f5 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 13 Nov 2022 11:13:52 +0900 Subject: [PATCH 180/589] Use Nerd Font --- home-manager/nvim/pack/plugins/start/nvim-web-devicons | 1 + 1 file changed, 1 insertion(+) create mode 160000 home-manager/nvim/pack/plugins/start/nvim-web-devicons diff --git a/home-manager/nvim/pack/plugins/start/nvim-web-devicons b/home-manager/nvim/pack/plugins/start/nvim-web-devicons new file mode 160000 index 0000000..c873091 --- /dev/null +++ b/home-manager/nvim/pack/plugins/start/nvim-web-devicons @@ -0,0 +1 @@ +Subproject commit c873091fe237f22c915905c4c0c3a82cbfce5f4d -- 2.51.2 From bea4a6b0c92be824b08ddf9964a85b447fc38b3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 07:03:37 +0000 Subject: [PATCH 181/589] Bump nvim/pack/plugins/start/telescope.nvim from `cc77713` to `7a4ffef` Bumps [nvim/pack/plugins/start/telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) from `cc77713` to `7a4ffef`. - [Release notes](https://github.com/nvim-telescope/telescope.nvim/releases) - [Commits](https://github.com/nvim-telescope/telescope.nvim/compare/cc77713294892c5bbce26adee665114250624e6b...7a4ffef931769c3fe7544214ed7ffde5852653f6) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/telescope.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/telescope.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/telescope.nvim b/home-manager/nvim/pack/plugins/start/telescope.nvim index cc77713..7a4ffef 160000 --- a/home-manager/nvim/pack/plugins/start/telescope.nvim +++ b/home-manager/nvim/pack/plugins/start/telescope.nvim @@ -1 +1 @@ -Subproject commit cc77713294892c5bbce26adee665114250624e6b +Subproject commit 7a4ffef931769c3fe7544214ed7ffde5852653f6 -- 2.51.2 From 658daa79e557c605487248dcfc994568b7d27d76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 07:03:41 +0000 Subject: [PATCH 182/589] Bump nvim/pack/plugins/start/nvim-cmp from `9bb8ee6` to `aee4011` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `9bb8ee6` to `aee4011`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/9bb8ee6e2d6ab3c8cc53323b79f05886bc722faa...aee40113c2ba3ab158955f233ca083ca9958d6f8) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index 9bb8ee6..aee4011 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit 9bb8ee6e2d6ab3c8cc53323b79f05886bc722faa +Subproject commit aee40113c2ba3ab158955f233ca083ca9958d6f8 -- 2.51.2 From 6f3ba9e675ecc9512309ce78db7037969185cce3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 08:01:14 +0000 Subject: [PATCH 183/589] Bump nvim/pack/plugins/start/vscode.nvim from `920145b` to `db9ee33` Bumps [nvim/pack/plugins/start/vscode.nvim](https://github.com/Mofiqul/vscode.nvim) from `920145b` to `db9ee33`. - [Release notes](https://github.com/Mofiqul/vscode.nvim/releases) - [Commits](https://github.com/Mofiqul/vscode.nvim/compare/920145bc2c431f8086549957aeb085d8e4c10ab2...db9ee339b5556aa832ca58871fd18f9467a18520) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/vscode.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/vscode.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/vscode.nvim b/home-manager/nvim/pack/plugins/start/vscode.nvim index 920145b..db9ee33 160000 --- a/home-manager/nvim/pack/plugins/start/vscode.nvim +++ b/home-manager/nvim/pack/plugins/start/vscode.nvim @@ -1 +1 @@ -Subproject commit 920145bc2c431f8086549957aeb085d8e4c10ab2 +Subproject commit db9ee339b5556aa832ca58871fd18f9467a18520 -- 2.51.2 From a599662dc80c71b4a46e6b6f0a312a875ada6f86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 08:01:37 +0000 Subject: [PATCH 184/589] Bump nvim/pack/plugins/start/cmp-nvim-lsp from `78924d1` to `0e6b2ed` Bumps [nvim/pack/plugins/start/cmp-nvim-lsp](https://github.com/hrsh7th/cmp-nvim-lsp) from `78924d1` to `0e6b2ed`. - [Release notes](https://github.com/hrsh7th/cmp-nvim-lsp/releases) - [Commits](https://github.com/hrsh7th/cmp-nvim-lsp/compare/78924d1d677b29b3d1fe429864185341724ee5a2...0e6b2ed705ddcff9738ec4ea838141654f12eeef) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/cmp-nvim-lsp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/cmp-nvim-lsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp b/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp index 78924d1..0e6b2ed 160000 --- a/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp +++ b/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp @@ -1 +1 @@ -Subproject commit 78924d1d677b29b3d1fe429864185341724ee5a2 +Subproject commit 0e6b2ed705ddcff9738ec4ea838141654f12eeef -- 2.51.2 From a2a7d3996d06c90f991feea120d0ce0713ecceec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:59:15 +0000 Subject: [PATCH 185/589] Bump nvim/pack/plugins/start/plenary.nvim from `4b7e520` to `253d348` Bumps [nvim/pack/plugins/start/plenary.nvim](https://github.com/nvim-lua/plenary.nvim) from `4b7e520` to `253d348`. - [Release notes](https://github.com/nvim-lua/plenary.nvim/releases) - [Commits](https://github.com/nvim-lua/plenary.nvim/compare/4b7e52044bbb84242158d977a50c4cbcd85070c7...253d34830709d690f013daf2853a9d21ad7accab) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/plenary.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/plenary.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/plenary.nvim b/home-manager/nvim/pack/plugins/start/plenary.nvim index 4b7e520..253d348 160000 --- a/home-manager/nvim/pack/plugins/start/plenary.nvim +++ b/home-manager/nvim/pack/plugins/start/plenary.nvim @@ -1 +1 @@ -Subproject commit 4b7e52044bbb84242158d977a50c4cbcd85070c7 +Subproject commit 253d34830709d690f013daf2853a9d21ad7accab -- 2.51.2 From 013f5efbf4372a2ef6ceeb4383be98c60c81cbae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:59:21 +0000 Subject: [PATCH 186/589] Bump nvim/pack/plugins/start/nvim-lspconfig from `f11fdff` to `f0d9150` Bumps [nvim/pack/plugins/start/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig) from `f11fdff` to `f0d9150`. - [Release notes](https://github.com/neovim/nvim-lspconfig/releases) - [Commits](https://github.com/neovim/nvim-lspconfig/compare/f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda...f0d9150fe8486d0f74757ed9d8987bfc33c7ff44) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-lspconfig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-lspconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig index f11fdff..f0d9150 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ b/home-manager/nvim/pack/plugins/start/nvim-lspconfig @@ -1 +1 @@ -Subproject commit f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda +Subproject commit f0d9150fe8486d0f74757ed9d8987bfc33c7ff44 -- 2.51.2 From 592c2c8cabb9c58bd5b358e3dcd4ac084c62553f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:59:25 +0000 Subject: [PATCH 187/589] Bump nvim/pack/plugins/start/nvim-web-devicons Bumps [nvim/pack/plugins/start/nvim-web-devicons](https://github.com/nvim-tree/nvim-web-devicons) from `c873091` to `4709a50`. - [Release notes](https://github.com/nvim-tree/nvim-web-devicons/releases) - [Commits](https://github.com/nvim-tree/nvim-web-devicons/compare/c873091fe237f22c915905c4c0c3a82cbfce5f4d...4709a504d2cd2680fb511675e64ef2790d491d36) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-web-devicons dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-web-devicons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-web-devicons b/home-manager/nvim/pack/plugins/start/nvim-web-devicons index c873091..4709a50 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-web-devicons +++ b/home-manager/nvim/pack/plugins/start/nvim-web-devicons @@ -1 +1 @@ -Subproject commit c873091fe237f22c915905c4c0c3a82cbfce5f4d +Subproject commit 4709a504d2cd2680fb511675e64ef2790d491d36 -- 2.51.2 From d81ce30b567e7159622aa22ad082f6572e0928ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:59:30 +0000 Subject: [PATCH 188/589] Bump nvim/pack/plugins/start/nvim-cmp from `aee4011` to `8202df9` Bumps [nvim/pack/plugins/start/nvim-cmp](https://github.com/hrsh7th/nvim-cmp) from `aee4011` to `8202df9`. - [Release notes](https://github.com/hrsh7th/nvim-cmp/releases) - [Commits](https://github.com/hrsh7th/nvim-cmp/compare/aee40113c2ba3ab158955f233ca083ca9958d6f8...8202df9561b90102b41dbc1ad71945534ef4ea39) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-cmp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-cmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp index aee4011..8202df9 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ b/home-manager/nvim/pack/plugins/start/nvim-cmp @@ -1 +1 @@ -Subproject commit aee40113c2ba3ab158955f233ca083ca9958d6f8 +Subproject commit 8202df9561b90102b41dbc1ad71945534ef4ea39 -- 2.51.2 From 622b47afa80375570294974301318c8c4597cbbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:59:36 +0000 Subject: [PATCH 189/589] Bump nvim/pack/plugins/start/nvim-treesitter from `00b42ac` to `ce0dba9` Bumps [nvim/pack/plugins/start/nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) from `00b42ac` to `ce0dba9`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter/compare/00b42ac6d4c852d34619eaf2ea822266588d75e3...ce0dba96f47cd8bbd46b4c3ac8fd1b9502f1002a) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter index 00b42ac..ce0dba9 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter @@ -1 +1 @@ -Subproject commit 00b42ac6d4c852d34619eaf2ea822266588d75e3 +Subproject commit ce0dba96f47cd8bbd46b4c3ac8fd1b9502f1002a -- 2.51.2 From 400ec47da61b9723e6b09dc7791811ca3cd31d20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:59:41 +0000 Subject: [PATCH 190/589] Bump nvim/pack/plugins/start/LuaSnip from `663d544` to `37ffce0` Bumps [nvim/pack/plugins/start/LuaSnip](https://github.com/L3MON4D3/LuaSnip) from `663d544` to `37ffce0`. - [Release notes](https://github.com/L3MON4D3/LuaSnip/releases) - [Commits](https://github.com/L3MON4D3/LuaSnip/compare/663d54482b11bca1ce94f56993b9f6ab485a13dc...37ffce053d4e20236efd43cecf7800e8ef40a997) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/LuaSnip dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/LuaSnip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip index 663d544..37ffce0 160000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ b/home-manager/nvim/pack/plugins/start/LuaSnip @@ -1 +1 @@ -Subproject commit 663d54482b11bca1ce94f56993b9f6ab485a13dc +Subproject commit 37ffce053d4e20236efd43cecf7800e8ef40a997 -- 2.51.2 From 68adc6383dfe3c37856ea3343048a711c0960b79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:59:50 +0000 Subject: [PATCH 191/589] Bump nvim/pack/plugins/start/telescope.nvim from `7a4ffef` to `f40e3e2` Bumps [nvim/pack/plugins/start/telescope.nvim](https://github.com/nvim-telescope/telescope.nvim) from `7a4ffef` to `f40e3e2`. - [Release notes](https://github.com/nvim-telescope/telescope.nvim/releases) - [Commits](https://github.com/nvim-telescope/telescope.nvim/compare/7a4ffef931769c3fe7544214ed7ffde5852653f6...f40e3e2304c633411ddf266075f7db5184b1db02) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/telescope.nvim dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/telescope.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/telescope.nvim b/home-manager/nvim/pack/plugins/start/telescope.nvim index 7a4ffef..f40e3e2 160000 --- a/home-manager/nvim/pack/plugins/start/telescope.nvim +++ b/home-manager/nvim/pack/plugins/start/telescope.nvim @@ -1 +1 @@ -Subproject commit 7a4ffef931769c3fe7544214ed7ffde5852653f6 +Subproject commit f40e3e2304c633411ddf266075f7db5184b1db02 -- 2.51.2 From 5dcff17d1e43beb122b5943a359e4a8a808aee5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:59:55 +0000 Subject: [PATCH 192/589] Bump nvim/pack/plugins/start/nvim-treesitter-context Bumps [nvim/pack/plugins/start/nvim-treesitter-context](https://github.com/nvim-treesitter/nvim-treesitter-context) from `0dd5eae` to `895ec44`. - [Release notes](https://github.com/nvim-treesitter/nvim-treesitter-context/releases) - [Commits](https://github.com/nvim-treesitter/nvim-treesitter-context/compare/0dd5eae6dbf226107da2c2041ffbb695d9e267c1...895ec44f5c89bc67ba5440aef3d1f2efa3d59a41) --- updated-dependencies: - dependency-name: nvim/pack/plugins/start/nvim-treesitter-context dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- home-manager/nvim/pack/plugins/start/nvim-treesitter-context | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter-context b/home-manager/nvim/pack/plugins/start/nvim-treesitter-context index 0dd5eae..895ec44 160000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter-context +++ b/home-manager/nvim/pack/plugins/start/nvim-treesitter-context @@ -1 +1 @@ -Subproject commit 0dd5eae6dbf226107da2c2041ffbb695d9e267c1 +Subproject commit 895ec44f5c89bc67ba5440aef3d1f2efa3d59a41 -- 2.51.2 From 8f53edc2054ac2b1ea5b38f6a80e330d06d7edf1 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Feb 2023 16:30:13 +0900 Subject: [PATCH 193/589] Rename `sumneko_lua` to `lua_ls` --- home-manager/nvim/lua/config.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 4a2c59f..9988971 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -25,8 +25,8 @@ cmp.setup { [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) + elseif luasnip.jumpable( -1) then + luasnip.jump( -1) else fallback() end @@ -59,10 +59,10 @@ local servers = { 'bashls', 'clangd', 'cssls', + 'lua_ls', 'gopls', 'jsonls', 'pylsp', - 'sumneko_lua', tsserver } -- 2.51.2 From e2a29b8bcbc8c211c13ad4a896b83b1c314a3f42 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Feb 2023 16:39:44 +0900 Subject: [PATCH 194/589] Use curl to download TS perser https://github.com/nvim-treesitter/nvim-treesitter/wiki/Windows-support --- home-manager/nvim/lua/config.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 9988971..57f4990 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -91,6 +91,8 @@ require('nvim-treesitter.configs').setup { } } +require('nvim-treesitter.install').prefer_git = false + local pattern_any = { '*' } ---@class AutoCmdConfig -- 2.51.2 From b1b1ab52ce13b9e6ac03f5a2428c2a44197f8310 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Feb 2023 19:35:52 +0900 Subject: [PATCH 195/589] Migrate to lazy.nvim --- home-manager/nvim/after/ftplugin/go.vim | 2 - home-manager/nvim/after/ftplugin/html.lua | 1 - home-manager/nvim/lazy-lock.json | 19 +++++ home-manager/nvim/lua/config.lua | 77 +++++++++++++++++-- home-manager/nvim/lua/ftbase/html.lua | 1 - home-manager/nvim/pack/plugins/opt/emmet-vim | 1 - home-manager/nvim/pack/plugins/start/LuaSnip | 1 - .../nvim/pack/plugins/start/auto-pairs | 1 - .../nvim/pack/plugins/start/cmp-nvim-lsp | 1 - .../nvim/pack/plugins/start/cmp_luasnip | 1 - .../nvim/pack/plugins/start/lazygit.nvim | 1 - .../nvim/pack/plugins/start/mkdir.nvim | 1 - home-manager/nvim/pack/plugins/start/nvim-cmp | 1 - .../nvim/pack/plugins/start/nvim-lspconfig | 1 - .../nvim/pack/plugins/start/nvim-scrollview | 1 - .../nvim/pack/plugins/start/nvim-treesitter | 1 - .../plugins/start/nvim-treesitter-context | 1 - .../nvim/pack/plugins/start/nvim-web-devicons | 1 - .../nvim/pack/plugins/start/plenary.nvim | 1 - .../nvim/pack/plugins/start/telescope.nvim | 1 - .../nvim/pack/plugins/start/vim-gitbranch | 1 - .../nvim/pack/plugins/start/vscode.nvim | 1 - 22 files changed, 90 insertions(+), 27 deletions(-) delete mode 100644 home-manager/nvim/after/ftplugin/html.lua create mode 100644 home-manager/nvim/lazy-lock.json delete mode 100644 home-manager/nvim/lua/ftbase/html.lua delete mode 160000 home-manager/nvim/pack/plugins/opt/emmet-vim delete mode 160000 home-manager/nvim/pack/plugins/start/LuaSnip delete mode 160000 home-manager/nvim/pack/plugins/start/auto-pairs delete mode 160000 home-manager/nvim/pack/plugins/start/cmp-nvim-lsp delete mode 160000 home-manager/nvim/pack/plugins/start/cmp_luasnip delete mode 160000 home-manager/nvim/pack/plugins/start/lazygit.nvim delete mode 160000 home-manager/nvim/pack/plugins/start/mkdir.nvim delete mode 160000 home-manager/nvim/pack/plugins/start/nvim-cmp delete mode 160000 home-manager/nvim/pack/plugins/start/nvim-lspconfig delete mode 160000 home-manager/nvim/pack/plugins/start/nvim-scrollview delete mode 160000 home-manager/nvim/pack/plugins/start/nvim-treesitter delete mode 160000 home-manager/nvim/pack/plugins/start/nvim-treesitter-context delete mode 160000 home-manager/nvim/pack/plugins/start/nvim-web-devicons delete mode 160000 home-manager/nvim/pack/plugins/start/plenary.nvim delete mode 160000 home-manager/nvim/pack/plugins/start/telescope.nvim delete mode 160000 home-manager/nvim/pack/plugins/start/vim-gitbranch delete mode 160000 home-manager/nvim/pack/plugins/start/vscode.nvim diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index aa13c7e..4a9da79 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -1,6 +1,4 @@ let b:AutoPairs = AutoPairsDefine({}, ["'"]) -packadd vim-goimports - setlocal noexpandtab setlocal shiftwidth=4 diff --git a/home-manager/nvim/after/ftplugin/html.lua b/home-manager/nvim/after/ftplugin/html.lua deleted file mode 100644 index 304aa70..0000000 --- a/home-manager/nvim/after/ftplugin/html.lua +++ /dev/null @@ -1 +0,0 @@ -require('ftbase.html') diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json new file mode 100644 index 0000000..1e3e0ac --- /dev/null +++ b/home-manager/nvim/lazy-lock.json @@ -0,0 +1,19 @@ +{ + "LuaSnip": { "branch": "master", "commit": "f7c845749aba6096f041a73a26ba64f3817bab99" }, + "auto-pairs": { "branch": "master", "commit": "39f06b873a8449af8ff6a3eee716d3da14d63a76" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" }, + "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, + "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, + "nvim-cmp": { "branch": "main", "commit": "01f697a68905f9dcae70960a9eb013695a17f9a2" }, + "nvim-lspconfig": { "branch": "master", "commit": "62856b20751b748841b0f3ec5a10b1e2f6a6dbc9" }, + "nvim-scrollview": { "branch": "main", "commit": "c0699da2f00976943d39c7b32c015c768f68e74b" }, + "nvim-treesitter": { "branch": "master", "commit": "a9f0b1c2ba1d70de9189e1ade0e65346ad08849b" }, + "nvim-treesitter-context": { "branch": "master", "commit": "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41" }, + "nvim-web-devicons": { "branch": "master", "commit": "0f23feca2bd08549b779c838b6b1308d1e76df03" }, + "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, + "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" }, + "vim-gitbranch": { "branch": "master", "commit": "1a8ba866f3eaf0194783b9f8573339d6ede8f1ed" }, + "vscode.nvim": { "branch": "main", "commit": "db9ee339b5556aa832ca58871fd18f9467a18520" } +} \ No newline at end of file diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 57f4990..2d4c0f2 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -1,3 +1,68 @@ +local lazypath = vim.fn.stdpath('data') .. 'lazy/lazy.nvim' +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + 'git', + 'clone', + '--filter=blob:none', + 'https://github.com/folke/lazy.nvim.git', + '--branch=stable', + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +-- Type definition from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua +---@class lazyPlugin +---@field [1] string +---@field dependencies string[]|lazyPlugin[] + +---@alias lazySpec string|lazyPlugin + +---@type lazySpec[] +local plugins = { + 'dstein64/nvim-scrollview', + { + 'hrsh7th/nvim-cmp', + dependencies = { + 'hrsh7th/cmp-nvim-lsp', + { + 'saadparwaiz1/cmp_luasnip', + dependencies = { 'L3MON4D3/LuaSnip' } + } + } + }, + 'itchyny/vim-gitbranch', + 'jghauser/mkdir.nvim', + 'jiangmiao/auto-pairs', + { + 'kdheepak/lazygit.nvim', + dependencies = { 'nvim-lua/plenary.nvim' } + }, + 'Mofiqul/vscode.nvim', + 'neovim/nvim-lspconfig', + { + 'nvim-telescope/telescope.nvim', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-tree/nvim-web-devicons', + 'nvim-treesitter/nvim-treesitter', + } + }, + 'nvim-treesitter/nvim-treesitter', + { + 'nvim-treesitter/nvim-treesitter-context', + dependencies = { 'nvim-treesitter/nvim-treesitter' } + } +} + +local opts = { + defaults = { + version = '*' + } +} + +require('lazy').setup(plugins, opts) + local builtin = require('telescope.builtin') local cmp = require('cmp') local luasnip = require('luasnip') @@ -95,16 +160,16 @@ require('nvim-treesitter.install').prefer_git = false local pattern_any = { '*' } ----@class AutoCmdConfig +---@class autoCmdConfig ---@field group any ---@field pattern string[] ---@field command string ----@class AutoCmd +---@class autoCmd ---@field event string ----@field config AutoCmdConfig +---@field config autoCmdConfig ----@type AutoCmd[] +---@type autoCmd[] local autocmds = { { event = 'BufWritePre', @@ -134,12 +199,12 @@ vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') ----@class Keymap +---@class keymap ---@field mode string ---@field key string ---@field action function ----@type Keymap[] +---@type keymap[] local keymaps = { { mode = 'n', diff --git a/home-manager/nvim/lua/ftbase/html.lua b/home-manager/nvim/lua/ftbase/html.lua deleted file mode 100644 index 08254a5..0000000 --- a/home-manager/nvim/lua/ftbase/html.lua +++ /dev/null @@ -1 +0,0 @@ -vim.cmd('packadd emmet-vim') diff --git a/home-manager/nvim/pack/plugins/opt/emmet-vim b/home-manager/nvim/pack/plugins/opt/emmet-vim deleted file mode 160000 index def5d57..0000000 --- a/home-manager/nvim/pack/plugins/opt/emmet-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit def5d57a1ae5afb1b96ebe83c4652d1c03640f4d diff --git a/home-manager/nvim/pack/plugins/start/LuaSnip b/home-manager/nvim/pack/plugins/start/LuaSnip deleted file mode 160000 index 37ffce0..0000000 --- a/home-manager/nvim/pack/plugins/start/LuaSnip +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 37ffce053d4e20236efd43cecf7800e8ef40a997 diff --git a/home-manager/nvim/pack/plugins/start/auto-pairs b/home-manager/nvim/pack/plugins/start/auto-pairs deleted file mode 160000 index 39f06b8..0000000 --- a/home-manager/nvim/pack/plugins/start/auto-pairs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 39f06b873a8449af8ff6a3eee716d3da14d63a76 diff --git a/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp b/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp deleted file mode 160000 index 0e6b2ed..0000000 --- a/home-manager/nvim/pack/plugins/start/cmp-nvim-lsp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0e6b2ed705ddcff9738ec4ea838141654f12eeef diff --git a/home-manager/nvim/pack/plugins/start/cmp_luasnip b/home-manager/nvim/pack/plugins/start/cmp_luasnip deleted file mode 160000 index 1809552..0000000 --- a/home-manager/nvim/pack/plugins/start/cmp_luasnip +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 18095520391186d634a0045dacaa346291096566 diff --git a/home-manager/nvim/pack/plugins/start/lazygit.nvim b/home-manager/nvim/pack/plugins/start/lazygit.nvim deleted file mode 160000 index 32bffde..0000000 --- a/home-manager/nvim/pack/plugins/start/lazygit.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 32bffdebe273e571588f25c8a708ca7297928617 diff --git a/home-manager/nvim/pack/plugins/start/mkdir.nvim b/home-manager/nvim/pack/plugins/start/mkdir.nvim deleted file mode 160000 index 0126165..0000000 --- a/home-manager/nvim/pack/plugins/start/mkdir.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 01261650382bef195dab8ac39344234b57914f09 diff --git a/home-manager/nvim/pack/plugins/start/nvim-cmp b/home-manager/nvim/pack/plugins/start/nvim-cmp deleted file mode 160000 index 8202df9..0000000 --- a/home-manager/nvim/pack/plugins/start/nvim-cmp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8202df9561b90102b41dbc1ad71945534ef4ea39 diff --git a/home-manager/nvim/pack/plugins/start/nvim-lspconfig b/home-manager/nvim/pack/plugins/start/nvim-lspconfig deleted file mode 160000 index f0d9150..0000000 --- a/home-manager/nvim/pack/plugins/start/nvim-lspconfig +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f0d9150fe8486d0f74757ed9d8987bfc33c7ff44 diff --git a/home-manager/nvim/pack/plugins/start/nvim-scrollview b/home-manager/nvim/pack/plugins/start/nvim-scrollview deleted file mode 160000 index 25c2321..0000000 --- a/home-manager/nvim/pack/plugins/start/nvim-scrollview +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25c23219db8b2b932a595b4d2b661406ce4459fe diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter b/home-manager/nvim/pack/plugins/start/nvim-treesitter deleted file mode 160000 index ce0dba9..0000000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ce0dba96f47cd8bbd46b4c3ac8fd1b9502f1002a diff --git a/home-manager/nvim/pack/plugins/start/nvim-treesitter-context b/home-manager/nvim/pack/plugins/start/nvim-treesitter-context deleted file mode 160000 index 895ec44..0000000 --- a/home-manager/nvim/pack/plugins/start/nvim-treesitter-context +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 895ec44f5c89bc67ba5440aef3d1f2efa3d59a41 diff --git a/home-manager/nvim/pack/plugins/start/nvim-web-devicons b/home-manager/nvim/pack/plugins/start/nvim-web-devicons deleted file mode 160000 index 4709a50..0000000 --- a/home-manager/nvim/pack/plugins/start/nvim-web-devicons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4709a504d2cd2680fb511675e64ef2790d491d36 diff --git a/home-manager/nvim/pack/plugins/start/plenary.nvim b/home-manager/nvim/pack/plugins/start/plenary.nvim deleted file mode 160000 index 253d348..0000000 --- a/home-manager/nvim/pack/plugins/start/plenary.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 253d34830709d690f013daf2853a9d21ad7accab diff --git a/home-manager/nvim/pack/plugins/start/telescope.nvim b/home-manager/nvim/pack/plugins/start/telescope.nvim deleted file mode 160000 index f40e3e2..0000000 --- a/home-manager/nvim/pack/plugins/start/telescope.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f40e3e2304c633411ddf266075f7db5184b1db02 diff --git a/home-manager/nvim/pack/plugins/start/vim-gitbranch b/home-manager/nvim/pack/plugins/start/vim-gitbranch deleted file mode 160000 index 1a8ba86..0000000 --- a/home-manager/nvim/pack/plugins/start/vim-gitbranch +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1a8ba866f3eaf0194783b9f8573339d6ede8f1ed diff --git a/home-manager/nvim/pack/plugins/start/vscode.nvim b/home-manager/nvim/pack/plugins/start/vscode.nvim deleted file mode 160000 index db9ee33..0000000 --- a/home-manager/nvim/pack/plugins/start/vscode.nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit db9ee339b5556aa832ca58871fd18f9467a18520 -- 2.51.2 From 1d798c9879e679cd04bc3d59babead35be4f41a9 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Feb 2023 22:35:19 +0900 Subject: [PATCH 196/589] Add cmp-nvim-lua --- home-manager/nvim/lazy-lock.json | 16 ++++++++-------- home-manager/nvim/lua/config.lua | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 1e3e0ac..c8ce059 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,19 +1,19 @@ { - "LuaSnip": { "branch": "master", "commit": "f7c845749aba6096f041a73a26ba64f3817bab99" }, - "auto-pairs": { "branch": "master", "commit": "39f06b873a8449af8ff6a3eee716d3da14d63a76" }, + "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, + "auto-pairs": { "branch": "master", "commit": "40ba005829450406e92ec6277d4308ab532dd256" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "nvim-cmp": { "branch": "main", "commit": "01f697a68905f9dcae70960a9eb013695a17f9a2" }, - "nvim-lspconfig": { "branch": "master", "commit": "62856b20751b748841b0f3ec5a10b1e2f6a6dbc9" }, - "nvim-scrollview": { "branch": "main", "commit": "c0699da2f00976943d39c7b32c015c768f68e74b" }, - "nvim-treesitter": { "branch": "master", "commit": "a9f0b1c2ba1d70de9189e1ade0e65346ad08849b" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, + "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, + "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, "nvim-treesitter-context": { "branch": "master", "commit": "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41" }, "nvim-web-devicons": { "branch": "master", "commit": "0f23feca2bd08549b779c838b6b1308d1e76df03" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, - "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" }, + "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "vim-gitbranch": { "branch": "master", "commit": "1a8ba866f3eaf0194783b9f8573339d6ede8f1ed" }, "vscode.nvim": { "branch": "main", "commit": "db9ee339b5556aa832ca58871fd18f9467a18520" } } \ No newline at end of file diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 2d4c0f2..16ab046 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -25,6 +25,7 @@ local plugins = { 'hrsh7th/nvim-cmp', dependencies = { 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-nvim-lua', { 'saadparwaiz1/cmp_luasnip', dependencies = { 'L3MON4D3/LuaSnip' } @@ -107,7 +108,8 @@ cmp.setup { }, sources = { { name = 'luasnip' }, - { name = 'nvim_lsp' } + { name = 'nvim_lsp' }, + { name = 'nvim_lua' } } } -- 2.51.2 From f2f28a82f40bda23bdb659663297cbc329e6c2cb Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Feb 2023 11:33:45 +0900 Subject: [PATCH 197/589] Revert name change of lua_ls --- home-manager/nvim/lua/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 16ab046..bf1d4a4 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -126,10 +126,10 @@ local servers = { 'bashls', 'clangd', 'cssls', - 'lua_ls', 'gopls', 'jsonls', 'pylsp', + 'sumneko_lua', tsserver } -- 2.51.2 From 4822a67281a3041b023f21f122d8149601d45312 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Feb 2023 11:41:41 +0900 Subject: [PATCH 198/589] autocmd: Use `callback` instead of `command` --- home-manager/nvim/lua/config.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index bf1d4a4..67ecc7f 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -165,7 +165,7 @@ local pattern_any = { '*' } ---@class autoCmdConfig ---@field group any ---@field pattern string[] ----@field command string +---@field callback function ---@class autoCmd ---@field event string @@ -178,7 +178,7 @@ local autocmds = { config = { group = vim.api.nvim_create_augroup('fmt', {}), pattern = pattern_any, - command = 'lua vim.lsp.buf.formatting_sync()' + callback = vim.lsp.buf.formatting_sync } }, { @@ -186,7 +186,9 @@ local autocmds = { config = { group = vim.api.nvim_create_augroup('disable_ime', {}), pattern = pattern_any, - command = 'call system("zenhan.exe 0")' + callback = function() + vim.fn.system('zenhan.exe', '0') + end } } } -- 2.51.2 From e7869bc5a16e735e0fd7f437ec4c58a2096dc7e6 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Feb 2023 12:29:17 +0900 Subject: [PATCH 199/589] Define keymaps in lazy.nvim config --- home-manager/nvim/lua/config.lua | 64 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 67ecc7f..83d669b 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -11,10 +11,18 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) --- Type definition from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua +local builtin = 'telescope.builtin' + +-- Type definitions from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua + ---@class lazyPlugin ---@field [1] string ----@field dependencies string[]|lazyPlugin[] +---@field dependencies lazySpec[] +---@field keys keymap[] + +---@class keymap +---@field [1] string +---@field [2] function ---@alias lazySpec string|lazyPlugin @@ -37,7 +45,13 @@ local plugins = { 'jiangmiao/auto-pairs', { 'kdheepak/lazygit.nvim', - dependencies = { 'nvim-lua/plenary.nvim' } + dependencies = { 'nvim-lua/plenary.nvim' }, + keys = { { + '', + function() + require('lazygit').lazygit() + end + } } }, 'Mofiqul/vscode.nvim', 'neovim/nvim-lspconfig', @@ -47,6 +61,20 @@ local plugins = { 'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons', 'nvim-treesitter/nvim-treesitter', + }, + keys = { + { + '', + function() + require(builtin).live_grep() + end + }, + { + '', + function() + require(builtin).git_files() + end + } } }, 'nvim-treesitter/nvim-treesitter', @@ -64,7 +92,6 @@ local opts = { require('lazy').setup(plugins, opts) -local builtin = require('telescope.builtin') local cmp = require('cmp') local luasnip = require('luasnip') local lsp_config = require('lspconfig') @@ -202,35 +229,6 @@ vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 vim.g.vscode_transparent = 1 vim.cmd('colorscheme vscode') - ----@class keymap ----@field mode string ----@field key string ----@field action function - ----@type keymap[] -local keymaps = { - { - mode = 'n', - key = '', - action = builtin.live_grep - }, - { - mode = 'n', - key = '', - action = require('lazygit').lazygit - }, - { - mode = 'n', - key = '', - action = builtin.git_files - } -} - -for _, map in ipairs(keymaps) do - vim.keymap.set(map.mode, map.key, map.action) -end - vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.number = true -- 2.51.2 From f7289e8be83b1feace53aa5d85bacaa1e5a0a12b Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Feb 2023 13:25:27 +0900 Subject: [PATCH 200/589] fix: Add path separetor to lazypath --- home-manager/nvim/lua/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 83d669b..c1a0492 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -1,4 +1,4 @@ -local lazypath = vim.fn.stdpath('data') .. 'lazy/lazy.nvim' +local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' if not vim.loop.fs_stat(lazypath) then vim.fn.system({ 'git', -- 2.51.2 From ea866909b62b6716af3d9e07e1bddd30500287cf Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Feb 2023 14:34:51 +0900 Subject: [PATCH 201/589] Configure plugins in lazy.nvim setting --- home-manager/nvim/lua/config.lua | 232 +++++++++++++++++-------------- 1 file changed, 126 insertions(+), 106 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index c1a0492..af94d3d 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -12,11 +12,13 @@ end vim.opt.rtp:prepend(lazypath) local builtin = 'telescope.builtin' +local cmp_nvim_lsp = 'hrsh7th/cmp-nvim-lsp' -- Type definitions from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua ---@class lazyPlugin ---@field [1] string +---@field config function ---@field dependencies lazySpec[] ---@field keys keymap[] @@ -28,16 +30,69 @@ local builtin = 'telescope.builtin' ---@type lazySpec[] local plugins = { - 'dstein64/nvim-scrollview', + { + 'dstein64/nvim-scrollview', + config = function() + vim.g.scrollview_character = '▎' + vim.g.scrollview_column = 1 + end + }, { 'hrsh7th/nvim-cmp', + config = function() + local cmp = require('cmp') + local luasnip = require('luasnip') + ---@return boolean + local function has_words_before() + local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil + end + + cmp.setup { + mapping = { + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable( -1) then + luasnip.jump( -1) + else + fallback() + end + end, { "i", "s" }), + [''] = cmp.mapping.confirm { + select = true + } + }, + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end + }, + sources = { + { name = 'luasnip' }, + { name = 'nvim_lsp' }, + { name = 'nvim_lua' } + } + } + end, dependencies = { - 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-nvim-lua', { 'saadparwaiz1/cmp_luasnip', dependencies = { 'L3MON4D3/LuaSnip' } - } + }, + cmp_nvim_lsp } }, 'itchyny/vim-gitbranch', @@ -45,6 +100,9 @@ local plugins = { 'jiangmiao/auto-pairs', { 'kdheepak/lazygit.nvim', + config = function() + vim.g.lazygit_floating_window_use_plenary = 1 + end, dependencies = { 'nvim-lua/plenary.nvim' }, keys = { { '', @@ -53,8 +111,58 @@ local plugins = { end } } }, - 'Mofiqul/vscode.nvim', - 'neovim/nvim-lspconfig', + { + 'Mofiqul/vscode.nvim', + config = function() + vim.g.vscode_transparent = 1 + vim.cmd('colorscheme vscode') + end + }, + { + 'neovim/nvim-lspconfig', + config = function() + local lsp_config = require('lspconfig') + + local capabilities = require('cmp_nvim_lsp').default_capabilities() + capabilities.textDocument.completion.completionItem.snippetSupport = true + + ---@type boolean + local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 + ---@type string + local tsserver = use_deno and 'denols' or 'tsserver' + + ---@type string[] + local servers = { + 'bashls', + 'clangd', + 'cssls', + 'gopls', + 'jsonls', + 'pylsp', + 'sumneko_lua', + tsserver + } + + for _, lsp in ipairs(servers) do + lsp_config[lsp].setup { + capabilities = capabilities, + settings = { + Lua = { + diagnostics = { + globals = { 'vim' } + } + } + } + } + end + + lsp_config.powershell_es.setup { + bundle_path = 'C:/PowerShellEditorServices', + capabilities = capabilities + } + end, + dependencies = { cmp_nvim_lsp } + }, { 'nvim-telescope/telescope.nvim', dependencies = { @@ -77,7 +185,19 @@ local plugins = { } } }, - 'nvim-treesitter/nvim-treesitter', + { + 'nvim-treesitter/nvim-treesitter', + config = function() + require('nvim-treesitter.configs').setup { + auto_install = true, + highlight = { + enable = true + } + } + + require('nvim-treesitter.install').prefer_git = false + end + }, { 'nvim-treesitter/nvim-treesitter-context', dependencies = { 'nvim-treesitter/nvim-treesitter' } @@ -92,101 +212,6 @@ local opts = { require('lazy').setup(plugins, opts) -local cmp = require('cmp') -local luasnip = require('luasnip') -local lsp_config = require('lspconfig') - ----@return boolean -local function has_words_before() - local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil -end - -cmp.setup { - mapping = { - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable( -1) then - luasnip.jump( -1) - else - fallback() - end - end, { "i", "s" }), - [''] = cmp.mapping.confirm { - select = true - } - }, - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end - }, - sources = { - { name = 'luasnip' }, - { name = 'nvim_lsp' }, - { name = 'nvim_lua' } - } -} - -local capabilities = require('cmp_nvim_lsp').default_capabilities() -capabilities.textDocument.completion.completionItem.snippetSupport = true - ----@type boolean -local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 ----@type string -local tsserver = use_deno and 'denols' or 'tsserver' - ----@type string[] -local servers = { - 'bashls', - 'clangd', - 'cssls', - 'gopls', - 'jsonls', - 'pylsp', - 'sumneko_lua', - tsserver -} - -for _, lsp in ipairs(servers) do - lsp_config[lsp].setup { - capabilities = capabilities, - settings = { - Lua = { - diagnostics = { - globals = { 'vim' } - } - } - } - } -end - -lsp_config.powershell_es.setup { - bundle_path = 'C:/PowerShellEditorServices', - capabilities = capabilities -} - -require('nvim-treesitter.configs').setup { - auto_install = true, - highlight = { - enable = true - } -} - -require('nvim-treesitter.install').prefer_git = false - local pattern_any = { '*' } ---@class autoCmdConfig @@ -224,11 +249,6 @@ for _, autocmd in ipairs(autocmds) do vim.api.nvim_create_autocmd(autocmd.event, autocmd.config) end -vim.g.lazygit_floating_window_use_plenary = 1 -vim.g.scrollview_character = '▎' -vim.g.scrollview_column = 1 -vim.g.vscode_transparent = 1 -vim.cmd('colorscheme vscode') vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.number = true -- 2.51.2 From f125084e2513062b85b2031f2321e28bba9888c6 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Feb 2023 15:03:36 +0900 Subject: [PATCH 202/589] Specify events to trigger plugins --- home-manager/nvim/lua/config.lua | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index af94d3d..1289df3 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -13,6 +13,7 @@ vim.opt.rtp:prepend(lazypath) local builtin = 'telescope.builtin' local cmp_nvim_lsp = 'hrsh7th/cmp-nvim-lsp' +local insert_enter = 'InsertEnter' -- Type definitions from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua @@ -20,6 +21,7 @@ local cmp_nvim_lsp = 'hrsh7th/cmp-nvim-lsp' ---@field [1] string ---@field config function ---@field dependencies lazySpec[] +---@field event string ---@field keys keymap[] ---@class keymap @@ -93,11 +95,18 @@ local plugins = { dependencies = { 'L3MON4D3/LuaSnip' } }, cmp_nvim_lsp - } + }, + event = insert_enter }, 'itchyny/vim-gitbranch', - 'jghauser/mkdir.nvim', - 'jiangmiao/auto-pairs', + { + 'jghauser/mkdir.nvim', + event = 'BufNewFile' + }, + { + 'jiangmiao/auto-pairs', + event = insert_enter + }, { 'kdheepak/lazygit.nvim', config = function() -- 2.51.2 From a17ccacdd90ac2640b49fed7e26de31932e7ffc6 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Feb 2023 15:34:34 +0900 Subject: [PATCH 203/589] Migrate to lualine.nvim --- home-manager/nvim/init.vim | 8 -------- home-manager/nvim/lazy-lock.json | 5 +++-- home-manager/nvim/lua/config.lua | 7 +++++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim index f9859f5..0f9bff0 100644 --- a/home-manager/nvim/init.vim +++ b/home-manager/nvim/init.vim @@ -6,12 +6,4 @@ set lcs=eol:↲,tab:>_,trail:・ set list set showmatch set splitright - -let branch = printf(' (%s)', gitbranch#name()) -if (branch == ' ()') - let branch = '' -endif -let eol = {'dos': 'CRLF', 'unix': 'LF', 'mac': 'CR'} -set statusline=%f%m%{branch}%=%{eol[&fileformat]} - set tabstop=4 diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index c8ce059..6089f09 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,16 +4,17 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "lazy.nvim": { "branch": "main", "commit": "8077428e63feb0f3bf795d53b23ba1695b28ab0e" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, + "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, "nvim-treesitter-context": { "branch": "master", "commit": "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41" }, - "nvim-web-devicons": { "branch": "master", "commit": "0f23feca2bd08549b779c838b6b1308d1e76df03" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2c2317f356c8b7da0252f5da758f71bb60bb6b2" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "vim-gitbranch": { "branch": "master", "commit": "1a8ba866f3eaf0194783b9f8573339d6ede8f1ed" }, "vscode.nvim": { "branch": "main", "commit": "db9ee339b5556aa832ca58871fd18f9467a18520" } } \ No newline at end of file diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/lua/config.lua index 1289df3..16d0ba8 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/lua/config.lua @@ -19,7 +19,7 @@ local insert_enter = 'InsertEnter' ---@class lazyPlugin ---@field [1] string ----@field config function +---@field config function|true ---@field dependencies lazySpec[] ---@field event string ---@field keys keymap[] @@ -98,7 +98,6 @@ local plugins = { }, event = insert_enter }, - 'itchyny/vim-gitbranch', { 'jghauser/mkdir.nvim', event = 'BufNewFile' @@ -172,6 +171,10 @@ local plugins = { end, dependencies = { cmp_nvim_lsp } }, + { + 'nvim-lualine/lualine.nvim', + config = true + }, { 'nvim-telescope/telescope.nvim', dependencies = { -- 2.51.2 From 81e27c1af208eaa361050c573934f00e72ea17b9 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Feb 2023 15:56:36 +0900 Subject: [PATCH 204/589] Complete migration to init.lua --- home-manager/nvim/{lua/config.lua => init.lua} | 9 +++++++++ home-manager/nvim/init.vim | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) rename home-manager/nvim/{lua/config.lua => init.lua} (97%) delete mode 100644 home-manager/nvim/init.vim diff --git a/home-manager/nvim/lua/config.lua b/home-manager/nvim/init.lua similarity index 97% rename from home-manager/nvim/lua/config.lua rename to home-manager/nvim/init.lua index 16d0ba8..2d23ef4 100644 --- a/home-manager/nvim/lua/config.lua +++ b/home-manager/nvim/init.lua @@ -263,9 +263,18 @@ end vim.opt.cmdheight = 0 vim.opt.expandtab = true +vim.opt.list = true +vim.opt.listchars = { + eol = '↲', + tab = '>_', + trail = '・' +} vim.opt.number = true vim.opt.relativenumber = true vim.opt.shiftwidth = 2 +vim.opt.showmatch = true +vim.opt.splitright = true +vim.opt.tabstop = 4 vim.opt.wrap = false if vim.fn.has('win64') == 1 then diff --git a/home-manager/nvim/init.vim b/home-manager/nvim/init.vim deleted file mode 100644 index 0f9bff0..0000000 --- a/home-manager/nvim/init.vim +++ /dev/null @@ -1,9 +0,0 @@ -filetype on - -lua require('config') - -set lcs=eol:↲,tab:>_,trail:・ -set list -set showmatch -set splitright -set tabstop=4 -- 2.51.2 From edd746bc853526d858daa73978847c068e925e3d Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Feb 2023 18:12:47 +0900 Subject: [PATCH 205/589] Disable `showmatch` --- home-manager/nvim/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 2d23ef4..7e6760b 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -272,7 +272,6 @@ vim.opt.listchars = { vim.opt.number = true vim.opt.relativenumber = true vim.opt.shiftwidth = 2 -vim.opt.showmatch = true vim.opt.splitright = true vim.opt.tabstop = 4 vim.opt.wrap = false -- 2.51.2 From e07d6ad05916b649f6f193b443f1866ad49a6de6 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 1 Mar 2023 13:47:54 +0900 Subject: [PATCH 206/589] Add `BufReadPre` event --- home-manager/nvim/init.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 7e6760b..a0e5b7d 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -13,6 +13,7 @@ vim.opt.rtp:prepend(lazypath) local builtin = 'telescope.builtin' local cmp_nvim_lsp = 'hrsh7th/cmp-nvim-lsp' +local buf_read_pre = 'BufReadPre' local insert_enter = 'InsertEnter' -- Type definitions from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua @@ -37,7 +38,8 @@ local plugins = { config = function() vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 - end + end, + event = buf_read_pre }, { 'hrsh7th/nvim-cmp', @@ -169,7 +171,8 @@ local plugins = { capabilities = capabilities } end, - dependencies = { cmp_nvim_lsp } + dependencies = { cmp_nvim_lsp }, + event = buf_read_pre }, { 'nvim-lualine/lualine.nvim', @@ -208,11 +211,13 @@ local plugins = { } require('nvim-treesitter.install').prefer_git = false - end + end, + event = buf_read_pre }, { 'nvim-treesitter/nvim-treesitter-context', - dependencies = { 'nvim-treesitter/nvim-treesitter' } + dependencies = { 'nvim-treesitter/nvim-treesitter' }, + event = buf_read_pre } } -- 2.51.2 From 1bba93f7eb7190c31723d2099c1fc217b770ae3a Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 1 Mar 2023 14:04:07 +0900 Subject: [PATCH 207/589] Add nvim-web-devicons to lualine.nvim's dependencies --- home-manager/nvim/init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index a0e5b7d..9f190ae 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -176,7 +176,10 @@ local plugins = { }, { 'nvim-lualine/lualine.nvim', - config = true + config = true, + dependencies = { + 'nvim-tree/nvim-web-devicons' + } }, { 'nvim-telescope/telescope.nvim', -- 2.51.2 From b2a48fb4cf414c554a4ff63b9282ef1970d8a0f8 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 1 Mar 2023 15:05:26 +0900 Subject: [PATCH 208/589] Add neo-tree.nvim --- home-manager/nvim/init.lua | 67 +++++++++++++++++++++----------- home-manager/nvim/lazy-lock.json | 2 + 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 9f190ae..fc3b9f4 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -12,10 +12,28 @@ end vim.opt.rtp:prepend(lazypath) local builtin = 'telescope.builtin' -local cmp_nvim_lsp = 'hrsh7th/cmp-nvim-lsp' + local buf_read_pre = 'BufReadPre' local insert_enter = 'InsertEnter' +local cmp_nvim_lsp = 'hrsh7th/cmp-nvim-lsp' +local devicons = 'nvim-tree/nvim-web-devicons' +local plenary = 'nvim-lua/plenary.nvim' +local treesitter = { + 'nvim-treesitter/nvim-treesitter', + config = function() + require('nvim-treesitter.configs').setup { + auto_install = true, + highlight = { + enable = true + } + } + + require('nvim-treesitter.install').prefer_git = false + end, + event = buf_read_pre +} + -- Type definitions from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua ---@class lazyPlugin @@ -113,7 +131,7 @@ local plugins = { config = function() vim.g.lazygit_floating_window_use_plenary = 1 end, - dependencies = { 'nvim-lua/plenary.nvim' }, + dependencies = { plenary }, keys = { { '', function() @@ -177,16 +195,34 @@ local plugins = { { 'nvim-lualine/lualine.nvim', config = true, + dependencies = { devicons } + }, + { + 'nvim-neo-tree/neo-tree.nvim', + config = function() + vim.g.neo_tree_remove_legacy_commands = 1 + + require('neo-tree').setup({ + close_if_last_window = true, + filesystem = { follow_current_file = true }, + view = { relativenumber = true }, + window = { width = 30 } + }) + + vim.cmd(':Neotree') + end, dependencies = { - 'nvim-tree/nvim-web-devicons' + 'MunifTanjim/nui.nvim', + devicons, + plenary } }, { 'nvim-telescope/telescope.nvim', dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', - 'nvim-treesitter/nvim-treesitter', + devicons, + plenary, + treesitter }, keys = { { @@ -203,25 +239,12 @@ local plugins = { } } }, - { - 'nvim-treesitter/nvim-treesitter', - config = function() - require('nvim-treesitter.configs').setup { - auto_install = true, - highlight = { - enable = true - } - } - - require('nvim-treesitter.install').prefer_git = false - end, - event = buf_read_pre - }, { 'nvim-treesitter/nvim-treesitter-context', - dependencies = { 'nvim-treesitter/nvim-treesitter' }, + dependencies = { treesitter }, event = buf_read_pre - } + }, + treesitter } local opts = { diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 6089f09..7079f9f 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,6 +8,8 @@ "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "74040b34278910d9b467fd914862e2a9a1ebacaa" }, + "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, -- 2.51.2 From f3006eef00744e391a2ad063b3d9ff8ff2b02f93 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 1 Mar 2023 16:09:40 +0900 Subject: [PATCH 209/589] Cange event of auto-pairs to `BufReadPost` --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index fc3b9f4..10b1892 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -124,7 +124,7 @@ local plugins = { }, { 'jiangmiao/auto-pairs', - event = insert_enter + event = 'BufReadPost' }, { 'kdheepak/lazygit.nvim', -- 2.51.2 From 412f045325aac6ba356622befd671d7c1db36ff4 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 1 Mar 2023 16:29:06 +0900 Subject: [PATCH 210/589] Add event `BufNewFile` to some plugins --- home-manager/nvim/init.lua | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 10b1892..80d7e5a 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -13,6 +13,7 @@ vim.opt.rtp:prepend(lazypath) local builtin = 'telescope.builtin' +local buf_new_file = 'BufNewFile' local buf_read_pre = 'BufReadPre' local insert_enter = 'InsertEnter' @@ -40,7 +41,7 @@ local treesitter = { ---@field [1] string ---@field config function|true ---@field dependencies lazySpec[] ----@field event string +---@field event string|string[] ---@field keys keymap[] ---@class keymap @@ -57,7 +58,10 @@ local plugins = { vim.g.scrollview_character = '▎' vim.g.scrollview_column = 1 end, - event = buf_read_pre + event = { + buf_new_file, + buf_read_pre + } }, { 'hrsh7th/nvim-cmp', @@ -120,11 +124,14 @@ local plugins = { }, { 'jghauser/mkdir.nvim', - event = 'BufNewFile' + event = buf_new_file }, { 'jiangmiao/auto-pairs', - event = 'BufReadPost' + event = { + 'BufReadPost', + buf_new_file + } }, { 'kdheepak/lazygit.nvim', @@ -190,7 +197,10 @@ local plugins = { } end, dependencies = { cmp_nvim_lsp }, - event = buf_read_pre + event = { + buf_new_file, + buf_read_pre + } }, { 'nvim-lualine/lualine.nvim', @@ -242,7 +252,10 @@ local plugins = { { 'nvim-treesitter/nvim-treesitter-context', dependencies = { treesitter }, - event = buf_read_pre + event = { + buf_read_pre, + buf_new_file + } }, treesitter } -- 2.51.2 From 95176ab5054b607286e30e01d44e0b59ba4098ef Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 2 Mar 2023 14:13:09 +0900 Subject: [PATCH 211/589] neo-tree: Show hidden items --- home-manager/nvim/init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 80d7e5a..cd4ef13 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -214,7 +214,10 @@ local plugins = { require('neo-tree').setup({ close_if_last_window = true, - filesystem = { follow_current_file = true }, + filesystem = { + filtered_items = { visible = true }, + follow_current_file = true + }, view = { relativenumber = true }, window = { width = 30 } }) -- 2.51.2 From ed9dabc80bf955a7aaaa9d2c7d32bebca96872a2 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 2 Mar 2023 14:56:36 +0900 Subject: [PATCH 212/589] telescope: Change the function of `` to current_buffer_fuzzy_find --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index cd4ef13..82d3357 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -241,7 +241,7 @@ local plugins = { { '', function() - require(builtin).live_grep() + require(builtin).current_buffer_fuzzy_find() end }, { -- 2.51.2 From f08444d8d2102cd9bdf260a0208383bedd022cfa Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 2 Mar 2023 15:51:38 +0900 Subject: [PATCH 213/589] lazy.nvim: Check for updates automatically --- home-manager/nvim/init.lua | 1 + home-manager/nvim/lazy-lock.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 82d3357..167e140 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -264,6 +264,7 @@ local plugins = { } local opts = { + checker = { enabled = true }, defaults = { version = '*' } diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7079f9f..3bab56f 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,11 +4,11 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "lazy.nvim": { "branch": "main", "commit": "8077428e63feb0f3bf795d53b23ba1695b28ab0e" }, + "lazy.nvim": { "branch": "main", "commit": "26d121ea13bee96b079403cee6598f04969d4983" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "74040b34278910d9b467fd914862e2a9a1ebacaa" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, -- 2.51.2 From eeaa823a4ab93072b489aa0d674b12cf977a2395 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 2 Mar 2023 16:05:12 +0900 Subject: [PATCH 214/589] Update Tree-sitter parsers after an update of the plugin --- home-manager/nvim/init.lua | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 167e140..0a78da3 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -17,11 +17,31 @@ local buf_new_file = 'BufNewFile' local buf_read_pre = 'BufReadPre' local insert_enter = 'InsertEnter' +-- Type definitions from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua + +---@class lazyPlugin +---@field [1] string +---@field build function +---@field config function|true +---@field dependencies lazySpec[] +---@field event string|string[] +---@field keys keymap[] + +---@class keymap +---@field [1] string +---@field [2] function + +---@alias lazySpec string|lazyPlugin + local cmp_nvim_lsp = 'hrsh7th/cmp-nvim-lsp' local devicons = 'nvim-tree/nvim-web-devicons' local plenary = 'nvim-lua/plenary.nvim' +---@type lazySpec local treesitter = { 'nvim-treesitter/nvim-treesitter', + build = function() + require('nvim-treesitter.install').update({ with_sync = true }) + end, config = function() require('nvim-treesitter.configs').setup { auto_install = true, @@ -35,21 +55,6 @@ local treesitter = { event = buf_read_pre } --- Type definitions from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua - ----@class lazyPlugin ----@field [1] string ----@field config function|true ----@field dependencies lazySpec[] ----@field event string|string[] ----@field keys keymap[] - ----@class keymap ----@field [1] string ----@field [2] function - ----@alias lazySpec string|lazyPlugin - ---@type lazySpec[] local plugins = { { -- 2.51.2 From 219f314328f2b997cd9caea8fde9f94717a15f55 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 2 Mar 2023 17:39:41 +0900 Subject: [PATCH 215/589] Enable `use_libuv_file_watcher` --- home-manager/nvim/init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 0a78da3..d5d3bfc 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -221,7 +221,8 @@ local plugins = { close_if_last_window = true, filesystem = { filtered_items = { visible = true }, - follow_current_file = true + follow_current_file = true, + use_libuv_file_watcher = true }, view = { relativenumber = true }, window = { width = 30 } -- 2.51.2 From bfc7492e0b4a0ee99dd4af28d41d9af7f437c132 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 3 Mar 2023 16:00:40 +0900 Subject: [PATCH 216/589] deps: Update lazy.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 3bab56f..fddd2ee 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,7 +4,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "lazy.nvim": { "branch": "main", "commit": "26d121ea13bee96b079403cee6598f04969d4983" }, + "lazy.nvim": { "branch": "main", "commit": "8d18ef44e769e98a8dc974ca85275de1d8cc7c04" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, -- 2.51.2 From fe778dfff5c3dfdd531cb878ebe427a96364ee04 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 3 Mar 2023 16:06:44 +0900 Subject: [PATCH 217/589] Add lspkind.nvim --- home-manager/nvim/init.lua | 2 ++ home-manager/nvim/lazy-lock.json | 1 + 2 files changed, 3 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index d5d3bfc..1ee04bb 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -80,6 +80,7 @@ local plugins = { end cmp.setup { + formatting = { format = require('lspkind').cmp_format() }, mapping = { [''] = cmp.mapping(function(fallback) if cmp.visible() then @@ -119,6 +120,7 @@ local plugins = { end, dependencies = { 'hrsh7th/cmp-nvim-lua', + 'onsails/lspkind.nvim', { 'saadparwaiz1/cmp_luasnip', dependencies = { 'L3MON4D3/LuaSnip' } diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index fddd2ee..cfa013a 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,6 +6,7 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "lazy.nvim": { "branch": "main", "commit": "8d18ef44e769e98a8dc974ca85275de1d8cc7c04" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, + "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4" }, -- 2.51.2 From 7e4ab631025b53a47bbbe661b45a0d26661c9794 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 3 Mar 2023 16:23:07 +0900 Subject: [PATCH 218/589] Change the type of `treesitter` to `lazyPlugin` --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 1ee04bb..cd761e9 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -36,7 +36,7 @@ local insert_enter = 'InsertEnter' local cmp_nvim_lsp = 'hrsh7th/cmp-nvim-lsp' local devicons = 'nvim-tree/nvim-web-devicons' local plenary = 'nvim-lua/plenary.nvim' ----@type lazySpec +---@type lazyPlugin local treesitter = { 'nvim-treesitter/nvim-treesitter', build = function() -- 2.51.2 From 745c5bc203ca77826cef711f51d555b4374c3545 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 3 Mar 2023 16:39:48 +0900 Subject: [PATCH 219/589] scrollview: Set highlight group --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index cd761e9..342cd29 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -60,7 +60,7 @@ local plugins = { { 'dstein64/nvim-scrollview', config = function() - vim.g.scrollview_character = '▎' + vim.api.nvim_set_hl(0, 'ScrollView', { link = 'TermCursor' }) vim.g.scrollview_column = 1 end, event = { -- 2.51.2 From 42a9facd9dc8e411c51057f0a4627d6362f4b912 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 4 Mar 2023 12:36:30 +0900 Subject: [PATCH 220/589] deps: Update nvim-web-devicons --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index cfa013a..f4c4e73 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, "nvim-treesitter-context": { "branch": "master", "commit": "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41" }, - "nvim-web-devicons": { "branch": "master", "commit": "c2c2317f356c8b7da0252f5da758f71bb60bb6b2" }, + "nvim-web-devicons": { "branch": "master", "commit": "c3c1dc4e36969370ff589b7025df8ec2e5c881a2" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "vscode.nvim": { "branch": "main", "commit": "db9ee339b5556aa832ca58871fd18f9467a18520" } -- 2.51.2 From f9bcaddc6bf851f13b82febdb4f8af304bcea21f Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 4 Mar 2023 12:56:39 +0900 Subject: [PATCH 221/589] Show diagnostics in popup window --- home-manager/nvim/init.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 342cd29..3745e5e 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -301,6 +301,14 @@ local autocmds = { callback = vim.lsp.buf.formatting_sync } }, + { + event = 'CursorHold', + config = { + group = vim.api.nvim_create_augroup('diagnostics_hover', {}), + pattern = pattern_any, + callback = vim.diagnostic.open_float + } + }, { event = 'InsertLeave', config = { @@ -317,6 +325,8 @@ for _, autocmd in ipairs(autocmds) do vim.api.nvim_create_autocmd(autocmd.event, autocmd.config) end +vim.diagnostic.config({ virtual_text = false }) + vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.list = true @@ -326,6 +336,7 @@ vim.opt.listchars = { trail = '・' } vim.opt.number = true +vim.opt.updatetime = 1000 vim.opt.relativenumber = true vim.opt.shiftwidth = 2 vim.opt.splitright = true -- 2.51.2 From 84ec1d3be831844070b37226d6622a842c31994d Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 5 Mar 2023 10:58:39 +0900 Subject: [PATCH 222/589] deps: Update lazy.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index f4c4e73..6971e15 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,7 +4,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "lazy.nvim": { "branch": "main", "commit": "8d18ef44e769e98a8dc974ca85275de1d8cc7c04" }, + "lazy.nvim": { "branch": "main", "commit": "14075657131b9a19883a8845c47f1ab65461cd6f" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, -- 2.51.2 From be723d2c63ea36ed496c9e3f93045d0940f4925b Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 5 Mar 2023 11:22:47 +0900 Subject: [PATCH 223/589] Prevent floating window to take cursor control --- home-manager/nvim/init.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 3745e5e..f70ada3 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -82,7 +82,7 @@ local plugins = { cmp.setup { formatting = { format = require('lspkind').cmp_format() }, mapping = { - [''] = cmp.mapping(function(fallback) + [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif luasnip.expand_or_jumpable() then @@ -93,16 +93,16 @@ local plugins = { fallback() end end, { "i", "s" }), - [''] = cmp.mapping(function(fallback) + [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() - elseif luasnip.jumpable( -1) then - luasnip.jump( -1) + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) else fallback() end end, { "i", "s" }), - [''] = cmp.mapping.confirm { + [''] = cmp.mapping.confirm { select = true } }, @@ -306,7 +306,9 @@ local autocmds = { config = { group = vim.api.nvim_create_augroup('diagnostics_hover', {}), pattern = pattern_any, - callback = vim.diagnostic.open_float + callback = function() + vim.diagnostic.open_float({ focusable = false }) + end } }, { -- 2.51.2 From f1e115ba3c7163a01c5624fb77aa6595c558cd85 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 5 Mar 2023 11:37:00 +0900 Subject: [PATCH 224/589] Set "*" as the default pattern for autocmd --- home-manager/nvim/init.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index f70ada3..edd5a55 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -280,8 +280,6 @@ local opts = { require('lazy').setup(plugins, opts) -local pattern_any = { '*' } - ---@class autoCmdConfig ---@field group any ---@field pattern string[] @@ -297,7 +295,6 @@ local autocmds = { event = 'BufWritePre', config = { group = vim.api.nvim_create_augroup('fmt', {}), - pattern = pattern_any, callback = vim.lsp.buf.formatting_sync } }, @@ -305,7 +302,6 @@ local autocmds = { event = 'CursorHold', config = { group = vim.api.nvim_create_augroup('diagnostics_hover', {}), - pattern = pattern_any, callback = function() vim.diagnostic.open_float({ focusable = false }) end @@ -315,7 +311,6 @@ local autocmds = { event = 'InsertLeave', config = { group = vim.api.nvim_create_augroup('disable_ime', {}), - pattern = pattern_any, callback = function() vim.fn.system('zenhan.exe', '0') end @@ -324,6 +319,9 @@ local autocmds = { } for _, autocmd in ipairs(autocmds) do + if autocmd.config.pattern == nil then + autocmd.config.pattern = { '*' } + end vim.api.nvim_create_autocmd(autocmd.event, autocmd.config) end -- 2.51.2 From 43a01ff8fe4c9f84fc136abe5a4bcff322fdd9a3 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 5 Mar 2023 12:07:16 +0900 Subject: [PATCH 225/589] Add trouble.nvim --- home-manager/nvim/init.lua | 12 +++++++++++- home-manager/nvim/lazy-lock.json | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index edd5a55..1fb8a7f 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -68,6 +68,16 @@ local plugins = { buf_read_pre } }, + { + 'folke/trouble.nvim', + dependencies = { devicons }, + keys = { { + 'm', + function() + require('trouble').toggle() + end + } } + }, { 'hrsh7th/nvim-cmp', config = function() @@ -230,7 +240,7 @@ local plugins = { window = { width = 30 } }) - vim.cmd(':Neotree') + require('neo-tree.command')._command() end, dependencies = { 'MunifTanjim/nui.nvim', diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 6971e15..7ead7bd 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -19,5 +19,6 @@ "nvim-web-devicons": { "branch": "master", "commit": "c3c1dc4e36969370ff589b7025df8ec2e5c881a2" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, + "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, "vscode.nvim": { "branch": "main", "commit": "db9ee339b5556aa832ca58871fd18f9467a18520" } } \ No newline at end of file -- 2.51.2 From 7c336d74d790c9056844e147b12e7438b46bdf5b Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 5 Mar 2023 22:01:31 +0900 Subject: [PATCH 226/589] Add indent-blankline.nvim --- home-manager/nvim/init.lua | 19 +++++++++++++++++-- home-manager/nvim/lazy-lock.json | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 1fb8a7f..7db1f47 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -163,6 +163,21 @@ local plugins = { end } } }, + { + 'lukas-reineke/indent-blankline.nvim', + config = function() + require('indent_blankline').setup({ + char = '|', + context_char = '|', + show_current_context = true + }) + end, + dependencies = { treesitter }, + event = { + buf_new_file, + buf_read_pre + } + }, { 'Mofiqul/vscode.nvim', config = function() @@ -342,8 +357,8 @@ vim.opt.expandtab = true vim.opt.list = true vim.opt.listchars = { eol = '↲', - tab = '>_', - trail = '・' + space = '・', + tab = ' ' } vim.opt.number = true vim.opt.updatetime = 1000 diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7ead7bd..3c91716 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,6 +4,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "14075657131b9a19883a8845c47f1ab65461cd6f" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, -- 2.51.2 From 39a416ef3ecc814fb11c783ab0495c1faa335504 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 6 Mar 2023 08:47:14 +0900 Subject: [PATCH 227/589] Migrate to nvim-autopairs --- home-manager/nvim/after/ftplugin/go.vim | 2 -- home-manager/nvim/after/ftplugin/markdown.lua | 2 -- home-manager/nvim/after/ftplugin/text.lua | 2 -- .../nvim/after/ftplugin/typescriptreact.lua | 1 - home-manager/nvim/init.lua | 19 ++++++++++++------- home-manager/nvim/lazy-lock.json | 2 +- 6 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 home-manager/nvim/after/ftplugin/typescriptreact.lua diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim index 4a9da79..27ff1dc 100644 --- a/home-manager/nvim/after/ftplugin/go.vim +++ b/home-manager/nvim/after/ftplugin/go.vim @@ -1,4 +1,2 @@ -let b:AutoPairs = AutoPairsDefine({}, ["'"]) - setlocal noexpandtab setlocal shiftwidth=4 diff --git a/home-manager/nvim/after/ftplugin/markdown.lua b/home-manager/nvim/after/ftplugin/markdown.lua index 2acaeb3..30a4921 100644 --- a/home-manager/nvim/after/ftplugin/markdown.lua +++ b/home-manager/nvim/after/ftplugin/markdown.lua @@ -1,3 +1 @@ require('ftbase.text') - -vim.cmd("let b:AutoPairs = AutoPairsDefine({'{{<' : '>}}'}, [\"'\"])") diff --git a/home-manager/nvim/after/ftplugin/text.lua b/home-manager/nvim/after/ftplugin/text.lua index 6039f67..30a4921 100644 --- a/home-manager/nvim/after/ftplugin/text.lua +++ b/home-manager/nvim/after/ftplugin/text.lua @@ -1,3 +1 @@ require('ftbase.text') - -vim.cmd('let s:AutoPairs = AutoPairsDefine({}, ["\'"])') diff --git a/home-manager/nvim/after/ftplugin/typescriptreact.lua b/home-manager/nvim/after/ftplugin/typescriptreact.lua deleted file mode 100644 index 304aa70..0000000 --- a/home-manager/nvim/after/ftplugin/typescriptreact.lua +++ /dev/null @@ -1 +0,0 @@ -require('ftbase.html') diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 7db1f47..3ea8848 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -143,13 +143,6 @@ local plugins = { 'jghauser/mkdir.nvim', event = buf_new_file }, - { - 'jiangmiao/auto-pairs', - event = { - 'BufReadPost', - buf_new_file - } - }, { 'kdheepak/lazygit.nvim', config = function() @@ -293,6 +286,18 @@ local plugins = { buf_new_file } }, + { + 'windwp/nvim-autopairs', + config = function() + require('nvim-autopairs').setup({ + map_c_h = true + }) + end, + event = { + 'BufReadPost', + buf_new_file + } + }, treesitter } diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 3c91716..2ae1639 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,6 +1,5 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "auto-pairs": { "branch": "master", "commit": "40ba005829450406e92ec6277d4308ab532dd256" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, @@ -12,6 +11,7 @@ "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, + "nvim-autopairs": { "branch": "master", "commit": "ab49517cfd1765b3f3de52c1f0fda6190b44e27b" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, -- 2.51.2 From 26fdc2197e8ed85e91e962ef746f51c02dfd6cbe Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 6 Mar 2023 09:13:09 +0900 Subject: [PATCH 228/589] Improve style of indent-blankline --- home-manager/nvim/init.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 3ea8848..cafed40 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -159,9 +159,14 @@ local plugins = { { 'lukas-reineke/indent-blankline.nvim', config = function() + local character = '┃' + local link_to_non_text = { link = 'NonText' } + vim.api.nvim_set_hl(0, 'IndentBlanklineChar', link_to_non_text) + vim.api.nvim_set_hl(0, 'IndentBlanklineContextChar', { fg = '#dcdcaa' }) + vim.api.nvim_set_hl(0, 'IndentBlanklineSpaceChar', link_to_non_text) require('indent_blankline').setup({ - char = '|', - context_char = '|', + char = character, + context_char = character, show_current_context = true }) end, -- 2.51.2 From cb07c564f2a3fd6867487f4154fbdc683b95029f Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 7 Mar 2023 09:17:45 +0900 Subject: [PATCH 229/589] deps: Update nvim-web-devicons --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 2ae1639..111ad36 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -17,7 +17,7 @@ "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, "nvim-treesitter-context": { "branch": "master", "commit": "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41" }, - "nvim-web-devicons": { "branch": "master", "commit": "c3c1dc4e36969370ff589b7025df8ec2e5c881a2" }, + "nvim-web-devicons": { "branch": "master", "commit": "b2060eac2fbc84e0637ea706378ff66451e7c424" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, -- 2.51.2 From 4a59206332a8743cf96e00cf82aa26cdbccacab3 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 15 Mar 2023 10:12:40 +0900 Subject: [PATCH 230/589] Update plugins --- home-manager/nvim/init.lua | 5 +++-- home-manager/nvim/lazy-lock.json | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index cafed40..7a3cd8f 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -179,8 +179,9 @@ local plugins = { { 'Mofiqul/vscode.nvim', config = function() - vim.g.vscode_transparent = 1 - vim.cmd('colorscheme vscode') + local vscode = require('vscode') + vscode.setup({ transparent = true }) + vscode.load() end }, { diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 111ad36..b9807c8 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,22 +4,22 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "14075657131b9a19883a8845c47f1ab65461cd6f" }, + "lazy.nvim": { "branch": "main", "commit": "5550f9927195dee9444eee4f26b1a22fcd88a191" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "205184aa0e0f08e8a1249d9bb37b45bae85f01b9" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, - "nvim-autopairs": { "branch": "master", "commit": "ab49517cfd1765b3f3de52c1f0fda6190b44e27b" }, + "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-treesitter-context": { "branch": "master", "commit": "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41" }, - "nvim-web-devicons": { "branch": "master", "commit": "b2060eac2fbc84e0637ea706378ff66451e7c424" }, + "nvim-treesitter-context": { "branch": "master", "commit": "cb6252b00d19c8b57e8e66de19a601df28455dd1" }, + "nvim-web-devicons": { "branch": "master", "commit": "f1b1cee3a561590a6c1637a9326c406f6e4af914" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, - "vscode.nvim": { "branch": "main", "commit": "db9ee339b5556aa832ca58871fd18f9467a18520" } + "vscode.nvim": { "branch": "main", "commit": "282d63cc7bfb5197b4c32f4e25b03c3bf3c9e8db" } } \ No newline at end of file -- 2.51.2 From a92bed1584a53087801bf60a246d28f56df73530 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 15 Mar 2023 11:23:50 +0900 Subject: [PATCH 231/589] Remove treesitter-context --- home-manager/nvim/init.lua | 8 -------- home-manager/nvim/lazy-lock.json | 1 - 2 files changed, 9 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 7a3cd8f..8817d26 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -284,14 +284,6 @@ local plugins = { } } }, - { - 'nvim-treesitter/nvim-treesitter-context', - dependencies = { treesitter }, - event = { - buf_read_pre, - buf_new_file - } - }, { 'windwp/nvim-autopairs', config = function() diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b9807c8..4d42f03 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,6 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-treesitter-context": { "branch": "master", "commit": "cb6252b00d19c8b57e8e66de19a601df28455dd1" }, "nvim-web-devicons": { "branch": "master", "commit": "f1b1cee3a561590a6c1637a9326c406f6e4af914" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, -- 2.51.2 From 1d549eb74cbe97aa6ac38f8e3303c2bd2009c8b1 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 15 Mar 2023 11:48:14 +0900 Subject: [PATCH 232/589] Add keymap `` for Neo-tree.nvim --- home-manager/nvim/init.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 8817d26..ad0c994 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -253,14 +253,18 @@ local plugins = { view = { relativenumber = true }, window = { width = 30 } }) - - require('neo-tree.command')._command() end, dependencies = { 'MunifTanjim/nui.nvim', devicons, plenary - } + }, + keys = { { + '', + function() + require('neo-tree.command')._command('toggle') + end + } } }, { 'nvim-telescope/telescope.nvim', -- 2.51.2 From d97dedd4b54aff7f7b630c9e3a49247747dc7fd2 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 16 Mar 2023 21:24:41 +0900 Subject: [PATCH 233/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 4d42f03..81ebddf 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,7 +4,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "5550f9927195dee9444eee4f26b1a22fcd88a191" }, + "lazy.nvim": { "branch": "main", "commit": "e27c9df5fe039e9d2833ef4fcf7305595d5ccda7" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, @@ -16,7 +16,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "f1b1cee3a561590a6c1637a9326c406f6e4af914" }, + "nvim-web-devicons": { "branch": "master", "commit": "2c07b4a1fe40284c61c4a40e6d0d769c198a27f5" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, -- 2.51.2 From 8a23607c8cc72bed75892a10a9e1f7bce7d23047 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 16 Mar 2023 21:40:51 +0900 Subject: [PATCH 234/589] Fix dependency relation between cmp-nvim-lsp and nvim-lspconfig --- home-manager/nvim/init.lua | 111 +++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 54 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index ad0c994..0ba0778 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -33,10 +33,58 @@ local insert_enter = 'InsertEnter' ---@alias lazySpec string|lazyPlugin -local cmp_nvim_lsp = 'hrsh7th/cmp-nvim-lsp' local devicons = 'nvim-tree/nvim-web-devicons' local plenary = 'nvim-lua/plenary.nvim' ---@type lazyPlugin +local lspconfig = { + 'neovim/nvim-lspconfig', + config = function() + local lsp_config = require('lspconfig') + + local capabilities = require('cmp_nvim_lsp').default_capabilities() + capabilities.textDocument.completion.completionItem.snippetSupport = true + + ---@type boolean + local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 + ---@type string + local tsserver = use_deno and 'denols' or 'tsserver' + + ---@type string[] + local servers = { + 'bashls', + 'clangd', + 'cssls', + 'gopls', + 'jsonls', + 'pylsp', + 'sumneko_lua', + tsserver + } + + for _, lsp in ipairs(servers) do + lsp_config[lsp].setup { + capabilities = capabilities, + settings = { + Lua = { + diagnostics = { + globals = { 'vim' } + } + } + } + } + end + + lsp_config.powershell_es.setup { + bundle_path = 'C:/PowerShellEditorServices', + capabilities = capabilities + } + end, + event = { + buf_new_file, + buf_read_pre + } +} +---@type lazyPlugin local treesitter = { 'nvim-treesitter/nvim-treesitter', build = function() @@ -92,7 +140,7 @@ local plugins = { cmp.setup { formatting = { format = require('lspkind').cmp_format() }, mapping = { - [''] = cmp.mapping(function(fallback) + [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif luasnip.expand_or_jumpable() then @@ -103,7 +151,7 @@ local plugins = { fallback() end end, { "i", "s" }), - [''] = cmp.mapping(function(fallback) + [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() elseif luasnip.jumpable(-1) then @@ -112,7 +160,7 @@ local plugins = { fallback() end end, { "i", "s" }), - [''] = cmp.mapping.confirm { + [''] = cmp.mapping.confirm { select = true } }, @@ -130,12 +178,15 @@ local plugins = { end, dependencies = { 'hrsh7th/cmp-nvim-lua', + { + 'hrsh7th/cmp-nvim-lsp', + dependencies = { lspconfig } + }, 'onsails/lspkind.nvim', { 'saadparwaiz1/cmp_luasnip', dependencies = { 'L3MON4D3/LuaSnip' } }, - cmp_nvim_lsp }, event = insert_enter }, @@ -184,55 +235,6 @@ local plugins = { vscode.load() end }, - { - 'neovim/nvim-lspconfig', - config = function() - local lsp_config = require('lspconfig') - - local capabilities = require('cmp_nvim_lsp').default_capabilities() - capabilities.textDocument.completion.completionItem.snippetSupport = true - - ---@type boolean - local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 - ---@type string - local tsserver = use_deno and 'denols' or 'tsserver' - - ---@type string[] - local servers = { - 'bashls', - 'clangd', - 'cssls', - 'gopls', - 'jsonls', - 'pylsp', - 'sumneko_lua', - tsserver - } - - for _, lsp in ipairs(servers) do - lsp_config[lsp].setup { - capabilities = capabilities, - settings = { - Lua = { - diagnostics = { - globals = { 'vim' } - } - } - } - } - end - - lsp_config.powershell_es.setup { - bundle_path = 'C:/PowerShellEditorServices', - capabilities = capabilities - } - end, - dependencies = { cmp_nvim_lsp }, - event = { - buf_new_file, - buf_read_pre - } - }, { 'nvim-lualine/lualine.nvim', config = true, @@ -300,6 +302,7 @@ local plugins = { buf_new_file } }, + lspconfig, treesitter } -- 2.51.2 From e90e03f6054a9c74c9d0f269bb5b730741db8a6c Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 16 Mar 2023 21:45:24 +0900 Subject: [PATCH 235/589] Always show signcolumn --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 0ba0778..6e5767c 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -374,6 +374,7 @@ vim.opt.number = true vim.opt.updatetime = 1000 vim.opt.relativenumber = true vim.opt.shiftwidth = 2 +vim.opt.signcolumn = 'yes' vim.opt.splitright = true vim.opt.tabstop = 4 vim.opt.wrap = false -- 2.51.2 From 707303eef669cac8b8509096705b2c5c8fc99ca9 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 16 Mar 2023 22:14:40 +0900 Subject: [PATCH 236/589] Define icons for signcolumn --- home-manager/nvim/init.lua | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 6e5767c..c2a85d9 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -362,6 +362,39 @@ end vim.diagnostic.config({ virtual_text = false }) +---@class sign +---@field msg_type string +---@field icon string + +---@type sign[] +local signs = { + { + msg_type = 'Error', + icon = '' + }, + { + msg_type = 'Warn', + icon = '' + }, + { + msg_type = 'Hint', + icon = '' + }, + { + msg_type = 'Info', + icon = '' + } +} + +for _, sign in ipairs(signs) do + local hl = 'DiagnosticSign' .. sign.msg_type + vim.fn.sign_define(hl, { + text = sign.icon, + numhl = hl, + texthl = hl + }) +end + vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.list = true -- 2.51.2 From f42f64dc256e03117aa616bf7b1fed9b266f48b1 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 17 Mar 2023 10:48:37 +0900 Subject: [PATCH 237/589] Update nvim-web-devicons --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 81ebddf..93e3876 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "2c07b4a1fe40284c61c4a40e6d0d769c198a27f5" }, + "nvim-web-devicons": { "branch": "master", "commit": "585dbc29315ca60be67d18ae6175771c3fb6791e" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, -- 2.51.2 From 3fbb9465cffe6cf13b9e33b91f68cfe04a17368e Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 17 Mar 2023 10:52:56 +0900 Subject: [PATCH 238/589] fileformats: Use LF by default --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index c2a85d9..e0a4b17 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -397,6 +397,7 @@ end vim.opt.cmdheight = 0 vim.opt.expandtab = true +vim.opt.fileformats = { 'unix', 'dos' } vim.opt.list = true vim.opt.listchars = { eol = '↲', -- 2.51.2 From 3902ce89bd72d6ca2760a422155726804f62efb0 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 17 Mar 2023 18:05:34 +0900 Subject: [PATCH 239/589] Update lazy.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 93e3876..305dd51 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,7 +4,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "e27c9df5fe039e9d2833ef4fcf7305595d5ccda7" }, + "lazy.nvim": { "branch": "main", "commit": "e2102c3a3a66ee89a2afaf779e439490eada75e3" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, -- 2.51.2 From c75ab5b0bb824efc7db89d04b120eb030c053fe8 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 17 Mar 2023 18:06:13 +0900 Subject: [PATCH 240/589] Add dependency of lspconfig --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index e0a4b17..a6adc88 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -79,6 +79,7 @@ local lspconfig = { capabilities = capabilities } end, + dependencies = { 'hrsh7th/cmp-nvim-lsp' }, event = { buf_new_file, buf_read_pre -- 2.51.2 From 609abaa1e0f9e3d85fa86002efda4f67df56a9eb Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 17 Mar 2023 18:42:35 +0900 Subject: [PATCH 241/589] Use find_files instead of git_files --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index a6adc88..3f179a2 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -286,7 +286,7 @@ local plugins = { { '', function() - require(builtin).git_files() + require(builtin).find_files() end } } -- 2.51.2 From 19cc2557bd655781c93f0830ff9df34ef0798469 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 18 Mar 2023 09:57:40 +0900 Subject: [PATCH 242/589] Update lazy.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 305dd51..b50ab33 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,7 +4,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "e2102c3a3a66ee89a2afaf779e439490eada75e3" }, + "lazy.nvim": { "branch": "main", "commit": "fdb41229ca39cf2795cbf4e6d04a52b73e6225f5" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, -- 2.51.2 From adfeac390bd614d198ffdd16db1348c78f2a1ff4 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 18 Mar 2023 09:58:40 +0900 Subject: [PATCH 243/589] Use .luarc.json instead of init.lua --- home-manager/nvim/init.lua | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 3f179a2..72c80d0 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -62,22 +62,13 @@ local lspconfig = { } for _, lsp in ipairs(servers) do - lsp_config[lsp].setup { - capabilities = capabilities, - settings = { - Lua = { - diagnostics = { - globals = { 'vim' } - } - } - } - } + lsp_config[lsp].setup({ capabilities = capabilities }) end - lsp_config.powershell_es.setup { + lsp_config.powershell_es.setup({ bundle_path = 'C:/PowerShellEditorServices', capabilities = capabilities - } + }) end, dependencies = { 'hrsh7th/cmp-nvim-lsp' }, event = { -- 2.51.2 From 970b87aba34d99514858b6d43b9ef415a8f078f4 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 18 Mar 2023 10:30:49 +0900 Subject: [PATCH 244/589] Add a keymap to search help tags via Telescope --- home-manager/nvim/init.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 72c80d0..4757ad1 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -279,6 +279,12 @@ local plugins = { function() require(builtin).find_files() end + }, + { + 'h', + function() + require(builtin).help_tags() + end } } }, -- 2.51.2 From 683c78c5e46bfd6f95b82ebbf074918028d90f31 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 18 Mar 2023 10:40:18 +0900 Subject: [PATCH 245/589] Add a keymap to close Telescope window quickly --- home-manager/nvim/init.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 4757ad1..6cedeb9 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -262,6 +262,17 @@ local plugins = { }, { 'nvim-telescope/telescope.nvim', + config = function() + require('telescope').setup({ + defaults = { + mappings = { + i = { + [''] = require('telescope.actions').close + } + } + } + }) + end, dependencies = { devicons, plenary, -- 2.51.2 From 8cef379c4a1cb3d71e1a821b0ae66738c32cfc34 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 18 Mar 2023 11:03:04 +0900 Subject: [PATCH 246/589] Change telescope prompt position to top --- home-manager/nvim/init.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 6cedeb9..0f972ad 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -265,11 +265,15 @@ local plugins = { config = function() require('telescope').setup({ defaults = { + layout_config = { + prompt_position = 'top', + }, mappings = { i = { [''] = require('telescope.actions').close } - } + }, + sorting_strategy = 'ascending' } }) end, -- 2.51.2 From fadab3c983ee11398671b39d6e05ab368a92073b Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 18 Mar 2023 20:38:18 +0900 Subject: [PATCH 247/589] Change `prompt_prefix` --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 0f972ad..8e0a516 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -273,6 +273,7 @@ local plugins = { [''] = require('telescope.actions').close } }, + prompt_prefix = '  ', sorting_strategy = 'ascending' } }) -- 2.51.2 From e390cbec3848e2803afe91a80162f141018688d2 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 18 Mar 2023 20:43:35 +0900 Subject: [PATCH 248/589] Fix `borderchars` for my environment --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 8e0a516..155bab4 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -265,6 +265,7 @@ local plugins = { config = function() require('telescope').setup({ defaults = { + borderchars = { "─", "┃", "─", "┃", "╭", "╮", "╯", "╰" }, layout_config = { prompt_position = 'top', }, -- 2.51.2 From 2312796e1918072cac52a7d39ab43efe58050b24 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 18 Mar 2023 21:32:07 +0900 Subject: [PATCH 249/589] Replace `"` with `'` --- home-manager/nvim/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 155bab4..d8e2587 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -142,7 +142,7 @@ local plugins = { else fallback() end - end, { "i", "s" }), + end, { 'i', 's' }), [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() @@ -151,7 +151,7 @@ local plugins = { else fallback() end - end, { "i", "s" }), + end, { 'i', 's' }), [''] = cmp.mapping.confirm { select = true } @@ -265,7 +265,7 @@ local plugins = { config = function() require('telescope').setup({ defaults = { - borderchars = { "─", "┃", "─", "┃", "╭", "╮", "╯", "╰" }, + borderchars = { '─', '┃', '─', '┃', '╭', '╮', '╯', '╰' }, layout_config = { prompt_position = 'top', }, -- 2.51.2 From fb9c0349909b72639da97ff3137baebf82401b68 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 19 Mar 2023 12:18:39 +0900 Subject: [PATCH 250/589] Fix `borderchars` by changing terminal font --- home-manager/nvim/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index d8e2587..67da775 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -265,7 +265,6 @@ local plugins = { config = function() require('telescope').setup({ defaults = { - borderchars = { '─', '┃', '─', '┃', '╭', '╮', '╯', '╰' }, layout_config = { prompt_position = 'top', }, -- 2.51.2 From 083c5022575bd7b529be32f7ee8fb211f23c6c43 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 19 Mar 2023 12:21:43 +0900 Subject: [PATCH 251/589] Change the character for indent-blankline.nvim --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 67da775..acd8b5f 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -202,7 +202,7 @@ local plugins = { { 'lukas-reineke/indent-blankline.nvim', config = function() - local character = '┃' + local character = '│' local link_to_non_text = { link = 'NonText' } vim.api.nvim_set_hl(0, 'IndentBlanklineChar', link_to_non_text) vim.api.nvim_set_hl(0, 'IndentBlanklineContextChar', { fg = '#dcdcaa' }) -- 2.51.2 From ce68d044181a8e7feed43ddff53d2004a279f896 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 19 Mar 2023 12:25:34 +0900 Subject: [PATCH 252/589] Enable border line for cmp window --- home-manager/nvim/init.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index acd8b5f..81ff9b1 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -128,6 +128,7 @@ local plugins = { local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil end + local bordered_window = cmp.config.window.bordered() cmp.setup { formatting = { format = require('lspkind').cmp_format() }, @@ -165,6 +166,10 @@ local plugins = { { name = 'luasnip' }, { name = 'nvim_lsp' }, { name = 'nvim_lua' } + }, + window = { + completion = bordered_window, + documentation = bordered_window } } end, -- 2.51.2 From bd8a88fc287861439146df9c2019137dc0c02d59 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 19 Mar 2023 12:45:43 +0900 Subject: [PATCH 253/589] Update neo-tree.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b50ab33..fb47325 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -9,7 +9,7 @@ "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "205184aa0e0f08e8a1249d9bb37b45bae85f01b9" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, -- 2.51.2 From 91d77edc7b2bdd4e3af5eb76c0e32543f6c8a80e Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 20 Mar 2023 07:37:19 +0900 Subject: [PATCH 254/589] Add a keymap to rename symbol --- home-manager/nvim/init.lua | 6 +++++- home-manager/nvim/lazy-lock.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 81ff9b1..97be518 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -74,7 +74,11 @@ local lspconfig = { event = { buf_new_file, buf_read_pre - } + }, + keys = { { + 'rn', + vim.lsp.buf.rename + } } } ---@type lazyPlugin local treesitter = { diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index fb47325..b06aa00 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -20,5 +20,5 @@ "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, - "vscode.nvim": { "branch": "main", "commit": "282d63cc7bfb5197b4c32f4e25b03c3bf3c9e8db" } + "vscode.nvim": { "branch": "main", "commit": "51520c4cce13a969101fbcc4eb2435214c3f5794" } } \ No newline at end of file -- 2.51.2 From c4228114df3ef3c76a9728cbab092ce4e1eb98c2 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 20 Mar 2023 12:00:06 +0900 Subject: [PATCH 255/589] Update nvim-web-devicons --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b06aa00..fc9e66c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "585dbc29315ca60be67d18ae6175771c3fb6791e" }, + "nvim-web-devicons": { "branch": "master", "commit": "467d135bbefa6fbe8380c8b6498228f8b21244a6" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, -- 2.51.2 From 500e13cdadcd1d864e719144211758954bd9a0e6 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 21 Mar 2023 10:13:17 +0900 Subject: [PATCH 256/589] Add lemminx (XML language server) --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 97be518..3543b3a 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -56,6 +56,7 @@ local lspconfig = { 'cssls', 'gopls', 'jsonls', + 'lemminx', 'pylsp', 'sumneko_lua', tsserver -- 2.51.2 From 2e9f720929fda85a00f30109c2aad1e8f92d7d90 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 21 Mar 2023 10:13:44 +0900 Subject: [PATCH 257/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index fc9e66c..ab0415c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,7 +4,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "fdb41229ca39cf2795cbf4e6d04a52b73e6225f5" }, + "lazy.nvim": { "branch": "main", "commit": "887eb75591520a01548134c4623617b639289d0b" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, @@ -16,7 +16,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "467d135bbefa6fbe8380c8b6498228f8b21244a6" }, + "nvim-web-devicons": { "branch": "master", "commit": "074e13f21f52bb45d654069bdadbcb6d7c2b65d0" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, -- 2.51.2 From f7aed7c0540d3b8b36bba9e65df3082b972b7af0 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 22 Mar 2023 14:15:54 +0900 Subject: [PATCH 258/589] Update nvim-web-devicons --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ab0415c..18da7e0 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "074e13f21f52bb45d654069bdadbcb6d7c2b65d0" }, + "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, -- 2.51.2 From 8c29ac9b8994f2c836e4c779635412743e5fd004 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 22 Mar 2023 18:29:06 +0900 Subject: [PATCH 259/589] Improve init.sh --- home-manager/nvim/lazy-lock.json | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 18da7e0..d60f890 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,24 +1,24 @@ -{ - "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, - "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "887eb75591520a01548134c4623617b639289d0b" }, - "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, - "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, - "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, - "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, - "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, - "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, - "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, - "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, - "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, - "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, - "vscode.nvim": { "branch": "main", "commit": "51520c4cce13a969101fbcc4eb2435214c3f5794" } +{ + "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, + "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, + "lazy.nvim": { "branch": "main", "commit": "887eb75591520a01548134c4623617b639289d0b" }, + "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, + "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, + "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, + "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, + "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, + "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, + "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, + "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, + "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, + "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, + "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, + "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, + "vscode.nvim": { "branch": "main", "commit": "51520c4cce13a969101fbcc4eb2435214c3f5794" } } \ No newline at end of file -- 2.51.2 From 3278895e95bae946dfc13432ef1ba79d079162a8 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 23 Mar 2023 14:26:31 +0900 Subject: [PATCH 260/589] Install lazygit in init.lua, not install.sh --- home-manager/nvim/init.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 3543b3a..9adfb9a 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -1,3 +1,9 @@ +---@param b number +---@return boolean +local function vim_true(b) + return b == 1 +end + local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' if not vim.loop.fs_stat(lazypath) then vim.fn.system({ @@ -199,6 +205,10 @@ local plugins = { { 'kdheepak/lazygit.nvim', config = function() + if !vim_true(vim.fn.executable('lazygit')) then + os.execute('go install github.com/jesseduffield/lazygit@latest') + end + vim.g.lazygit_floating_window_use_plenary = 1 end, dependencies = { plenary }, @@ -437,7 +447,7 @@ vim.opt.splitright = true vim.opt.tabstop = 4 vim.opt.wrap = false -if vim.fn.has('win64') == 1 then +if vim_true(vim.fn.has('win64')) then vim.opt.shell = 'pwsh -NoLogo' vim.opt.shellcmdflag = '-Command' vim.opt.shellxquote = '' -- 2.51.2 From 675748bb125e8976ff420e985adfc1c9f60fae4b Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 23 Mar 2023 15:08:45 +0900 Subject: [PATCH 261/589] Fix "if not" syntax --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 9adfb9a..759bd60 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -205,7 +205,7 @@ local plugins = { { 'kdheepak/lazygit.nvim', config = function() - if !vim_true(vim.fn.executable('lazygit')) then + if not vim_true(vim.fn.executable('lazygit')) then os.execute('go install github.com/jesseduffield/lazygit@latest') end -- 2.51.2 From 92d33b18006d87c526827b8caf72df7f91eb6e53 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 24 Mar 2023 09:43:26 +0900 Subject: [PATCH 262/589] Update plugins --- home-manager/nvim/lazy-lock.json | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index d60f890..5eb648c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,24 +1,24 @@ -{ - "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, - "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "887eb75591520a01548134c4623617b639289d0b" }, - "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, - "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, - "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, - "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, - "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, - "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, - "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, - "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, - "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, - "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, - "vscode.nvim": { "branch": "main", "commit": "51520c4cce13a969101fbcc4eb2435214c3f5794" } +{ + "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, + "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, + "lazy.nvim": { "branch": "main", "commit": "be77c59bf742379b6c5ad1e70d29c5fc1ee55944" }, + "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, + "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, + "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, + "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, + "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, + "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, + "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, + "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, + "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, + "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, + "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, + "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, + "vscode.nvim": { "branch": "main", "commit": "64e107c31da7d73048681b77a43f5e019d850980" } } \ No newline at end of file -- 2.51.2 From 738e871d713f3e4b72482960653df4d3ed763b6f Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 24 Mar 2023 09:43:54 +0900 Subject: [PATCH 263/589] Add yaml-language-server --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 759bd60..856f657 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -65,6 +65,7 @@ local lspconfig = { 'lemminx', 'pylsp', 'sumneko_lua', + 'yamlls', tsserver } -- 2.51.2 From aac27ff2215e7bd9fd483fd98aa1fb215fbcc7db Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 24 Mar 2023 10:31:30 +0900 Subject: [PATCH 264/589] Disabpe `keyOrdering` for yamlls --- home-manager/nvim/init.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 856f657..2483183 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -70,7 +70,12 @@ local lspconfig = { } for _, lsp in ipairs(servers) do - lsp_config[lsp].setup({ capabilities = capabilities }) + lsp_config[lsp].setup({ + capabilities = capabilities, + settings = { + yaml = { keyOrdering = false } + } + }) end lsp_config.powershell_es.setup({ -- 2.51.2 From edf9651dd0fc9c8225f6226441c13b218e9dd839 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 24 Mar 2023 11:11:12 +0900 Subject: [PATCH 265/589] Add dockerls --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 2483183..12229ac 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -60,6 +60,7 @@ local lspconfig = { 'bashls', 'clangd', 'cssls', + 'dockerls', 'gopls', 'jsonls', 'lemminx', -- 2.51.2 From 437c8b3e5e51a40c10f587c984855af8f445e9aa Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 25 Mar 2023 09:05:54 +0900 Subject: [PATCH 266/589] Add spaces between parentheses --- home-manager/nvim/init.lua | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 12229ac..ca4139b 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -334,9 +334,40 @@ local plugins = { { 'windwp/nvim-autopairs', config = function() - require('nvim-autopairs').setup({ + local npairs = require('nvim-autopairs') + local rule = require('nvim-autopairs.rule') + local brackets = { + { '(', ')' }, + { '{', '}' }, + { '[', ']' } + } + + npairs.setup({ map_c_h = true }) + + -- https://github.com/windwp/nvim-autopairs/wiki/Custom-rules#add-spaces-between-parentheses + npairs.add_rules({ + rule(' ', ' '):with_pair(function(opts) + local pair = opts.line:sub(opts.col - 1, opts.col) + return vim.tbl_contains({ + brackets[1][1] .. brackets[1][2], + brackets[2][1] .. brackets[2][2], + brackets[3][1] .. brackets[3][2] + }, pair) + end) + }) + + for _, bracket in ipairs(brackets) do + npairs.add_rules({ + rule(bracket[1] .. ' ', ' ' .. bracket[2]) + :with_pair(function() return false end) + :with_move(function(opts) + return opts.prev_char:match('.%' .. bracket[2]) ~= nil + end) + :use_key(bracket[2]) + }) + end end, event = { 'BufReadPost', -- 2.51.2 From 52572e71b41f3334b5353ee587d43a9691cc0528 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 25 Mar 2023 09:06:20 +0900 Subject: [PATCH 267/589] Update lazy.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 5eb648c..6d4aa13 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -4,7 +4,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "be77c59bf742379b6c5ad1e70d29c5fc1ee55944" }, + "lazy.nvim": { "branch": "main", "commit": "32d5f4af2fdc0c04d60e3d5b5da3fc19a2c3699e" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, -- 2.51.2 From c627928e6ffe09f21e820accf36bae39bc730ac7 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 25 Mar 2023 09:34:26 +0900 Subject: [PATCH 268/589] Add barbar.nvim --- home-manager/nvim/init.lua | 24 +++++++++++++++++++++++- home-manager/nvim/lazy-lock.json | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index ca4139b..99c77ae 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -35,7 +35,7 @@ local insert_enter = 'InsertEnter' ---@class keymap ---@field [1] string ----@field [2] function +---@field [2] function|string ---@alias lazySpec string|lazyPlugin @@ -331,6 +331,28 @@ local plugins = { } } }, + { + 'romgrk/barbar.nvim', + dependencies = { devicons }, + event = { + buf_new_file, + buf_read_pre + }, + keys = { + { + 'c', + 'BufferClose' + }, + { + '.', + 'BufferNext' + }, + { + ',', + 'BufferPrevious' + } + } + }, { 'windwp/nvim-autopairs', config = function() diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 6d4aa13..2472be7 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, + "barbar.nvim": { "branch": "master", "commit": "d0b39de8ce48e9efced88edc9244ca21e571bb98" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, -- 2.51.2 From 09b9ade04ccc0c807c04a45a6ce10e48beb2c77b Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 25 Mar 2023 15:05:59 +0900 Subject: [PATCH 269/589] Map `?` for help --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 99c77ae..c8feab4 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -324,7 +324,7 @@ local plugins = { end }, { - 'h', + '?', function() require(builtin).help_tags() end -- 2.51.2 From 6d4db0b14dc0200f834bd007747ec116427c9f50 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 25 Mar 2023 15:11:43 +0900 Subject: [PATCH 270/589] Set keymap to hover --- home-manager/nvim/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index c8feab4..d472b5c 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -489,6 +489,8 @@ for _, sign in ipairs(signs) do }) end +vim.keymap.set('n', 'h', vim.lsp.buf.hover) + vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.fileformats = { 'unix', 'dos' } -- 2.51.2 From ba67a35f16d1e2de9ca9ee4861b48ae9d8390029 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 25 Mar 2023 15:26:57 +0900 Subject: [PATCH 271/589] Handle error around installing Lazygit --- home-manager/nvim/init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index d472b5c..60c7ea3 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -213,7 +213,10 @@ local plugins = { 'kdheepak/lazygit.nvim', config = function() if not vim_true(vim.fn.executable('lazygit')) then - os.execute('go install github.com/jesseduffield/lazygit@latest') + local ok = os.execute('go install github.com/jesseduffield/lazygit@latest') + if not ok then + error('Failed to install Lazygit') + end end vim.g.lazygit_floating_window_use_plenary = 1 -- 2.51.2 From dadb1087901b2d7b632d2d3276fde861e1b999d1 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 25 Mar 2023 16:08:22 +0900 Subject: [PATCH 272/589] Migrate to neogit --- home-manager/nvim/init.lua | 30 ++++++++++-------------------- home-manager/nvim/lazy-lock.json | 2 +- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 60c7ea3..0023618 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -209,26 +209,6 @@ local plugins = { 'jghauser/mkdir.nvim', event = buf_new_file }, - { - 'kdheepak/lazygit.nvim', - config = function() - if not vim_true(vim.fn.executable('lazygit')) then - local ok = os.execute('go install github.com/jesseduffield/lazygit@latest') - if not ok then - error('Failed to install Lazygit') - end - end - - vim.g.lazygit_floating_window_use_plenary = 1 - end, - dependencies = { plenary }, - keys = { { - '', - function() - require('lazygit').lazygit() - end - } } - }, { 'lukas-reineke/indent-blankline.nvim', config = function() @@ -356,6 +336,16 @@ local plugins = { } } }, + { + 'TimUntersberger/neogit', + dependencies = { plenary }, + keys = { { + '', + function() + require('neogit').open() + end + } } + }, { 'windwp/nvim-autopairs', config = function() diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 2472be7..b07660a 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,11 +6,11 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "32d5f4af2fdc0c04d60e3d5b5da3fc19a2c3699e" }, - "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, + "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, -- 2.51.2 From d8815f64f2f940dc6710f80c7457593f3f2260d3 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 25 Mar 2023 17:26:49 +0900 Subject: [PATCH 273/589] Include hidden files to Telescope's search target --- home-manager/nvim/init.lua | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 0023618..ad5aba0 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -273,6 +273,16 @@ local plugins = { { 'nvim-telescope/telescope.nvim', config = function() + local args = require('telescope.config').values.vimgrep_arguments + local additions = { + '--hidden', + '--glob', + '!**/.git/*' + } + for _, v in ipairs(additions) do + table.insert(args, v) + end + require('telescope').setup({ defaults = { layout_config = { @@ -284,7 +294,19 @@ local plugins = { } }, prompt_prefix = '  ', - sorting_strategy = 'ascending' + sorting_strategy = 'ascending', + vimgrep_arguments = args + }, + pickers = { + find_files = { + find_command = { + 'rg', + '--files', + '--hidden', + '--glob', + '!**/.git/*' + } + } } }) end, -- 2.51.2 From a9699cc6ee226e55bd0394902fdfc6c5ac7c0e91 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 25 Mar 2023 17:34:44 +0900 Subject: [PATCH 274/589] Use `os.execute` to call zenhan.exe --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index ad5aba0..106b415 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -456,7 +456,7 @@ local autocmds = { config = { group = vim.api.nvim_create_augroup('disable_ime', {}), callback = function() - vim.fn.system('zenhan.exe', '0') + os.execute('zenhan.exe 0') end } } -- 2.51.2 From 2b0288d0e3ab2b984f223ea401a3a07ea2f52fc6 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 26 Mar 2023 12:13:00 +0900 Subject: [PATCH 275/589] Add cmp-path --- home-manager/nvim/init.lua | 4 +++- home-manager/nvim/lazy-lock.json | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 106b415..8f1bc66 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -183,7 +183,8 @@ local plugins = { sources = { { name = 'luasnip' }, { name = 'nvim_lsp' }, - { name = 'nvim_lua' } + { name = 'nvim_lua' }, + { name = 'path' } }, window = { completion = bordered_window, @@ -197,6 +198,7 @@ local plugins = { 'hrsh7th/cmp-nvim-lsp', dependencies = { lspconfig } }, + 'hrsh7th/cmp-path', 'onsails/lspkind.nvim', { 'saadparwaiz1/cmp_luasnip', diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b07660a..93702e7 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -3,9 +3,10 @@ "barbar.nvim": { "branch": "master", "commit": "d0b39de8ce48e9efced88edc9244ca21e571bb98" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "32d5f4af2fdc0c04d60e3d5b5da3fc19a2c3699e" }, + "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, -- 2.51.2 From 75ed36a63d5ae3bb0251a154d23d894271fdb2b4 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 26 Mar 2023 16:07:01 +0900 Subject: [PATCH 276/589] Add schemastore.nvim --- home-manager/nvim/init.lua | 11 ++++++++++- home-manager/nvim/lazy-lock.json | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 8f1bc66..d26f6be 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -70,10 +70,16 @@ local lspconfig = { tsserver } + local schemastore = require('schemastore') + for _, lsp in ipairs(servers) do lsp_config[lsp].setup({ capabilities = capabilities, settings = { + json = { + schemas = schemastore.json.schemas(), + validate = { enable = true } + }, yaml = { keyOrdering = false } } }) @@ -84,7 +90,10 @@ local lspconfig = { capabilities = capabilities }) end, - dependencies = { 'hrsh7th/cmp-nvim-lsp' }, + dependencies = { + 'b0o/schemastore.nvim', + 'hrsh7th/cmp-nvim-lsp' + }, event = { buf_new_file, buf_read_pre diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 93702e7..91476ca 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -20,6 +20,7 @@ "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, + "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, "vscode.nvim": { "branch": "main", "commit": "64e107c31da7d73048681b77a43f5e019d850980" } -- 2.51.2 From d88376995f84a76e7516a8b9da1faaf32d2a1dcd Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 26 Mar 2023 17:35:24 +0900 Subject: [PATCH 277/589] Add noice.nvim --- home-manager/nvim/init.lua | 11 ++++++++++- home-manager/nvim/lazy-lock.json | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index d26f6be..87af900 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -40,6 +40,7 @@ local insert_enter = 'InsertEnter' ---@alias lazySpec string|lazyPlugin local devicons = 'nvim-tree/nvim-web-devicons' +local nui = 'MunifTanjim/nui.nvim' local plenary = 'nvim-lua/plenary.nvim' ---@type lazyPlugin local lspconfig = { @@ -135,6 +136,14 @@ local plugins = { buf_read_pre } }, + { + 'folke/noice.nvim', + config = true, + dependencies = { + nui, + treesitter + } + }, { 'folke/trouble.nvim', dependencies = { devicons }, @@ -270,8 +279,8 @@ local plugins = { }) end, dependencies = { - 'MunifTanjim/nui.nvim', devicons, + nui, plenary }, keys = { { diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 91476ca..8920a88 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -12,6 +12,7 @@ "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, + "noice.nvim": { "branch": "main", "commit": "a26fca0f623d095dfac5f97a436f97efb90772df" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, -- 2.51.2 From 8ffb98278561b96c4133cff2ac1859526f413f7d Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 26 Mar 2023 20:11:13 +0900 Subject: [PATCH 278/589] Structure plugins --- home-manager/nvim/init.lua | 420 +----------------- home-manager/nvim/lua/plugins/autopairs.lua | 46 ++ home-manager/nvim/lua/plugins/barbar.lua | 27 ++ home-manager/nvim/lua/plugins/cmp.lua | 74 +++ home-manager/nvim/lua/plugins/devicons.lua | 7 + .../nvim/lua/plugins/indent-blankline.lua | 25 ++ home-manager/nvim/lua/plugins/lspconfig.lua | 66 +++ home-manager/nvim/lua/plugins/lualine.lua | 8 + home-manager/nvim/lua/plugins/mkdir.lua | 7 + home-manager/nvim/lua/plugins/neo-tree.lua | 31 ++ home-manager/nvim/lua/plugins/neogit.lua | 18 + home-manager/nvim/lua/plugins/noice.lua | 10 + home-manager/nvim/lua/plugins/nui.lua | 7 + home-manager/nvim/lua/plugins/plenary.lua | 7 + home-manager/nvim/lua/plugins/scrollview.lua | 16 + home-manager/nvim/lua/plugins/telescope.lua | 71 +++ home-manager/nvim/lua/plugins/treesitter.lua | 20 + home-manager/nvim/lua/plugins/trouble.lua | 13 + home-manager/nvim/lua/plugins/vscode.lua | 11 + home-manager/nvim/lua/vim_event/init.lua | 7 + 20 files changed, 472 insertions(+), 419 deletions(-) create mode 100644 home-manager/nvim/lua/plugins/autopairs.lua create mode 100644 home-manager/nvim/lua/plugins/barbar.lua create mode 100644 home-manager/nvim/lua/plugins/cmp.lua create mode 100644 home-manager/nvim/lua/plugins/devicons.lua create mode 100644 home-manager/nvim/lua/plugins/indent-blankline.lua create mode 100644 home-manager/nvim/lua/plugins/lspconfig.lua create mode 100644 home-manager/nvim/lua/plugins/lualine.lua create mode 100644 home-manager/nvim/lua/plugins/mkdir.lua create mode 100644 home-manager/nvim/lua/plugins/neo-tree.lua create mode 100644 home-manager/nvim/lua/plugins/neogit.lua create mode 100644 home-manager/nvim/lua/plugins/noice.lua create mode 100644 home-manager/nvim/lua/plugins/nui.lua create mode 100644 home-manager/nvim/lua/plugins/plenary.lua create mode 100644 home-manager/nvim/lua/plugins/scrollview.lua create mode 100644 home-manager/nvim/lua/plugins/telescope.lua create mode 100644 home-manager/nvim/lua/plugins/treesitter.lua create mode 100644 home-manager/nvim/lua/plugins/trouble.lua create mode 100644 home-manager/nvim/lua/plugins/vscode.lua create mode 100644 home-manager/nvim/lua/vim_event/init.lua diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 87af900..d31e497 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -17,424 +17,6 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -local builtin = 'telescope.builtin' - -local buf_new_file = 'BufNewFile' -local buf_read_pre = 'BufReadPre' -local insert_enter = 'InsertEnter' - --- Type definitions from https://github.com/folke/lazy.nvim/blob/main/lua/lazy/types.lua - ----@class lazyPlugin ----@field [1] string ----@field build function ----@field config function|true ----@field dependencies lazySpec[] ----@field event string|string[] ----@field keys keymap[] - ----@class keymap ----@field [1] string ----@field [2] function|string - ----@alias lazySpec string|lazyPlugin - -local devicons = 'nvim-tree/nvim-web-devicons' -local nui = 'MunifTanjim/nui.nvim' -local plenary = 'nvim-lua/plenary.nvim' ----@type lazyPlugin -local lspconfig = { - 'neovim/nvim-lspconfig', - config = function() - local lsp_config = require('lspconfig') - - local capabilities = require('cmp_nvim_lsp').default_capabilities() - capabilities.textDocument.completion.completionItem.snippetSupport = true - - ---@type boolean - local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 - ---@type string - local tsserver = use_deno and 'denols' or 'tsserver' - - ---@type string[] - local servers = { - 'bashls', - 'clangd', - 'cssls', - 'dockerls', - 'gopls', - 'jsonls', - 'lemminx', - 'pylsp', - 'sumneko_lua', - 'yamlls', - tsserver - } - - local schemastore = require('schemastore') - - for _, lsp in ipairs(servers) do - lsp_config[lsp].setup({ - capabilities = capabilities, - settings = { - json = { - schemas = schemastore.json.schemas(), - validate = { enable = true } - }, - yaml = { keyOrdering = false } - } - }) - end - - lsp_config.powershell_es.setup({ - bundle_path = 'C:/PowerShellEditorServices', - capabilities = capabilities - }) - end, - dependencies = { - 'b0o/schemastore.nvim', - 'hrsh7th/cmp-nvim-lsp' - }, - event = { - buf_new_file, - buf_read_pre - }, - keys = { { - 'rn', - vim.lsp.buf.rename - } } -} ----@type lazyPlugin -local treesitter = { - 'nvim-treesitter/nvim-treesitter', - build = function() - require('nvim-treesitter.install').update({ with_sync = true }) - end, - config = function() - require('nvim-treesitter.configs').setup { - auto_install = true, - highlight = { - enable = true - } - } - - require('nvim-treesitter.install').prefer_git = false - end, - event = buf_read_pre -} - ----@type lazySpec[] -local plugins = { - { - 'dstein64/nvim-scrollview', - config = function() - vim.api.nvim_set_hl(0, 'ScrollView', { link = 'TermCursor' }) - vim.g.scrollview_column = 1 - end, - event = { - buf_new_file, - buf_read_pre - } - }, - { - 'folke/noice.nvim', - config = true, - dependencies = { - nui, - treesitter - } - }, - { - 'folke/trouble.nvim', - dependencies = { devicons }, - keys = { { - 'm', - function() - require('trouble').toggle() - end - } } - }, - { - 'hrsh7th/nvim-cmp', - config = function() - local cmp = require('cmp') - local luasnip = require('luasnip') - ---@return boolean - local function has_words_before() - local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil - end - local bordered_window = cmp.config.window.bordered() - - cmp.setup { - formatting = { format = require('lspkind').cmp_format() }, - mapping = { - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { 'i', 's' }), - [''] = cmp.mapping.confirm { - select = true - } - }, - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end - }, - sources = { - { name = 'luasnip' }, - { name = 'nvim_lsp' }, - { name = 'nvim_lua' }, - { name = 'path' } - }, - window = { - completion = bordered_window, - documentation = bordered_window - } - } - end, - dependencies = { - 'hrsh7th/cmp-nvim-lua', - { - 'hrsh7th/cmp-nvim-lsp', - dependencies = { lspconfig } - }, - 'hrsh7th/cmp-path', - 'onsails/lspkind.nvim', - { - 'saadparwaiz1/cmp_luasnip', - dependencies = { 'L3MON4D3/LuaSnip' } - }, - }, - event = insert_enter - }, - { - 'jghauser/mkdir.nvim', - event = buf_new_file - }, - { - 'lukas-reineke/indent-blankline.nvim', - config = function() - local character = '│' - local link_to_non_text = { link = 'NonText' } - vim.api.nvim_set_hl(0, 'IndentBlanklineChar', link_to_non_text) - vim.api.nvim_set_hl(0, 'IndentBlanklineContextChar', { fg = '#dcdcaa' }) - vim.api.nvim_set_hl(0, 'IndentBlanklineSpaceChar', link_to_non_text) - require('indent_blankline').setup({ - char = character, - context_char = character, - show_current_context = true - }) - end, - dependencies = { treesitter }, - event = { - buf_new_file, - buf_read_pre - } - }, - { - 'Mofiqul/vscode.nvim', - config = function() - local vscode = require('vscode') - vscode.setup({ transparent = true }) - vscode.load() - end - }, - { - 'nvim-lualine/lualine.nvim', - config = true, - dependencies = { devicons } - }, - { - 'nvim-neo-tree/neo-tree.nvim', - config = function() - vim.g.neo_tree_remove_legacy_commands = 1 - - require('neo-tree').setup({ - close_if_last_window = true, - filesystem = { - filtered_items = { visible = true }, - follow_current_file = true, - use_libuv_file_watcher = true - }, - view = { relativenumber = true }, - window = { width = 30 } - }) - end, - dependencies = { - devicons, - nui, - plenary - }, - keys = { { - '', - function() - require('neo-tree.command')._command('toggle') - end - } } - }, - { - 'nvim-telescope/telescope.nvim', - config = function() - local args = require('telescope.config').values.vimgrep_arguments - local additions = { - '--hidden', - '--glob', - '!**/.git/*' - } - for _, v in ipairs(additions) do - table.insert(args, v) - end - - require('telescope').setup({ - defaults = { - layout_config = { - prompt_position = 'top', - }, - mappings = { - i = { - [''] = require('telescope.actions').close - } - }, - prompt_prefix = '  ', - sorting_strategy = 'ascending', - vimgrep_arguments = args - }, - pickers = { - find_files = { - find_command = { - 'rg', - '--files', - '--hidden', - '--glob', - '!**/.git/*' - } - } - } - }) - end, - dependencies = { - devicons, - plenary, - treesitter - }, - keys = { - { - '', - function() - require(builtin).current_buffer_fuzzy_find() - end - }, - { - '', - function() - require(builtin).find_files() - end - }, - { - '?', - function() - require(builtin).help_tags() - end - } - } - }, - { - 'romgrk/barbar.nvim', - dependencies = { devicons }, - event = { - buf_new_file, - buf_read_pre - }, - keys = { - { - 'c', - 'BufferClose' - }, - { - '.', - 'BufferNext' - }, - { - ',', - 'BufferPrevious' - } - } - }, - { - 'TimUntersberger/neogit', - dependencies = { plenary }, - keys = { { - '', - function() - require('neogit').open() - end - } } - }, - { - 'windwp/nvim-autopairs', - config = function() - local npairs = require('nvim-autopairs') - local rule = require('nvim-autopairs.rule') - local brackets = { - { '(', ')' }, - { '{', '}' }, - { '[', ']' } - } - - npairs.setup({ - map_c_h = true - }) - - -- https://github.com/windwp/nvim-autopairs/wiki/Custom-rules#add-spaces-between-parentheses - npairs.add_rules({ - rule(' ', ' '):with_pair(function(opts) - local pair = opts.line:sub(opts.col - 1, opts.col) - return vim.tbl_contains({ - brackets[1][1] .. brackets[1][2], - brackets[2][1] .. brackets[2][2], - brackets[3][1] .. brackets[3][2] - }, pair) - end) - }) - - for _, bracket in ipairs(brackets) do - npairs.add_rules({ - rule(bracket[1] .. ' ', ' ' .. bracket[2]) - :with_pair(function() return false end) - :with_move(function(opts) - return opts.prev_char:match('.%' .. bracket[2]) ~= nil - end) - :use_key(bracket[2]) - }) - end - end, - event = { - 'BufReadPost', - buf_new_file - } - }, - lspconfig, - treesitter -} - local opts = { checker = { enabled = true }, defaults = { @@ -442,7 +24,7 @@ local opts = { } } -require('lazy').setup(plugins, opts) +require('lazy').setup('plugins', opts) ---@class autoCmdConfig ---@field group any diff --git a/home-manager/nvim/lua/plugins/autopairs.lua b/home-manager/nvim/lua/plugins/autopairs.lua new file mode 100644 index 0000000..d9ce3c2 --- /dev/null +++ b/home-manager/nvim/lua/plugins/autopairs.lua @@ -0,0 +1,46 @@ +---@type LazyPluginSpec +local autopairs = { + 'windwp/nvim-autopairs', + config = function() + local npairs = require('nvim-autopairs') + local rule = require('nvim-autopairs.rule') + local brackets = { + { '(', ')' }, + { '{', '}' }, + { '[', ']' } + } + + npairs.setup({ + map_c_h = true + }) + + -- https://github.com/windwp/nvim-autopairs/wiki/Custom-rules#add-spaces-between-parentheses + npairs.add_rules({ + rule(' ', ' '):with_pair(function(opts) + local pair = opts.line:sub(opts.col - 1, opts.col) + return vim.tbl_contains({ + brackets[1][1] .. brackets[1][2], + brackets[2][1] .. brackets[2][2], + brackets[3][1] .. brackets[3][2] + }, pair) + end) + }) + + for _, bracket in ipairs(brackets) do + npairs.add_rules({ + rule(bracket[1] .. ' ', ' ' .. bracket[2]) + :with_pair(function() return false end) + :with_move(function(opts) + return opts.prev_char:match('.%' .. bracket[2]) ~= nil + end) + :use_key(bracket[2]) + }) + end + end, + event = { + 'BufReadPost', + require('vim_event').buf_new_file + } +} + +return autopairs diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua new file mode 100644 index 0000000..e4834ba --- /dev/null +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -0,0 +1,27 @@ +local event = require('vim_event') + +---@type LazyPluginSpec +local barbar = { + 'romgrk/barbar.nvim', + dependencies = { require('plugins.devicons') }, + event = { + event.buf_new_file, + event.buf_read_pre + }, + keys = { + { + 'c', + 'BufferClose' + }, + { + '.', + 'BufferNext' + }, + { + ',', + 'BufferPrevious' + } + } +} + +return barbar diff --git a/home-manager/nvim/lua/plugins/cmp.lua b/home-manager/nvim/lua/plugins/cmp.lua new file mode 100644 index 0000000..4ac6f05 --- /dev/null +++ b/home-manager/nvim/lua/plugins/cmp.lua @@ -0,0 +1,74 @@ +---@type LazyPluginSpec +local cmp = { + 'hrsh7th/nvim-cmp', + config = function() + local cmp = require('cmp') + local luasnip = require('luasnip') + ---@return boolean + local function has_words_before() + local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil + end + local bordered_window = cmp.config.window.bordered() + + cmp.setup({ + formatting = { format = require('lspkind').cmp_format() }, + mapping = { + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { 'i', 's' }), + [''] = cmp.mapping.confirm { + select = true + } + }, + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end + }, + sources = { + { name = 'luasnip' }, + { name = 'nvim_lsp' }, + { name = 'nvim_lua' }, + { name = 'path' } + }, + window = { + completion = bordered_window, + documentation = bordered_window + } + }) + end, + dependencies = { + 'hrsh7th/cmp-nvim-lua', + { + 'hrsh7th/cmp-nvim-lsp', + dependencies = { require('plugins.lspconfig') } + }, + 'hrsh7th/cmp-path', + 'onsails/lspkind.nvim', + { + 'saadparwaiz1/cmp_luasnip', + dependencies = { 'L3MON4D3/LuaSnip' } + }, + }, + event = require('vim_event').insert_enter +} + +return cmp diff --git a/home-manager/nvim/lua/plugins/devicons.lua b/home-manager/nvim/lua/plugins/devicons.lua new file mode 100644 index 0000000..91bb693 --- /dev/null +++ b/home-manager/nvim/lua/plugins/devicons.lua @@ -0,0 +1,7 @@ +---@type LazyPluginSpec +local devicons = { + 'nvim-tree/nvim-web-devicons', + lazy = true +} + +return devicons diff --git a/home-manager/nvim/lua/plugins/indent-blankline.lua b/home-manager/nvim/lua/plugins/indent-blankline.lua new file mode 100644 index 0000000..2f0e88c --- /dev/null +++ b/home-manager/nvim/lua/plugins/indent-blankline.lua @@ -0,0 +1,25 @@ +local event = require('vim_event') + +---@type LazyPluginSpec +local indent_blankline = { + 'lukas-reineke/indent-blankline.nvim', + config = function() + local character = '│' + local link_to_non_text = { link = 'NonText' } + vim.api.nvim_set_hl(0, 'IndentBlanklineChar', link_to_non_text) + vim.api.nvim_set_hl(0, 'IndentBlanklineContextChar', { fg = '#dcdcaa' }) + vim.api.nvim_set_hl(0, 'IndentBlanklineSpaceChar', link_to_non_text) + require('indent_blankline').setup({ + char = character, + context_char = character, + show_current_context = true + }) + end, + dependencies = { require('plugins.treesitter') }, + event = { + event.buf_new_file, + event.buf_read_pre + } +} + +return indent_blankline diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua new file mode 100644 index 0000000..12fc665 --- /dev/null +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -0,0 +1,66 @@ +local event = require('vim_event') + +---@type LazyPluginSpec +local lspconfig = { + 'neovim/nvim-lspconfig', + config = function() + local lsp_config = require('lspconfig') + + local capabilities = require('cmp_nvim_lsp').default_capabilities() + capabilities.textDocument.completion.completionItem.snippetSupport = true + + ---@type boolean + local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 + ---@type string + local tsserver = use_deno and 'denols' or 'tsserver' + + ---@type string[] + local servers = { + 'bashls', + 'clangd', + 'cssls', + 'dockerls', + 'gopls', + 'jsonls', + 'lemminx', + 'pylsp', + 'sumneko_lua', + 'yamlls', + tsserver + } + + local schemastore = require('schemastore') + + for _, lsp in ipairs(servers) do + lsp_config[lsp].setup({ + capabilities = capabilities, + settings = { + json = { + schemas = schemastore.json.schemas(), + validate = { enable = true } + }, + yaml = { keyOrdering = false } + } + }) + end + + lsp_config.powershell_es.setup({ + bundle_path = 'C:/PowerShellEditorServices', + capabilities = capabilities + }) + end, + dependencies = { + 'b0o/schemastore.nvim', + 'hrsh7th/cmp-nvim-lsp' + }, + event = { + event.buf_new_file, + event.buf_read_pre + }, + keys = { { + 'rn', + vim.lsp.buf.rename + } } +} + +return lspconfig diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua new file mode 100644 index 0000000..455a51e --- /dev/null +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -0,0 +1,8 @@ +---@type LazyPluginSpec +local lualine = { + 'nvim-lualine/lualine.nvim', + config = true, + dependencies = { require('plugins.devicons') } +} + +return lualine diff --git a/home-manager/nvim/lua/plugins/mkdir.lua b/home-manager/nvim/lua/plugins/mkdir.lua new file mode 100644 index 0000000..e6b61e8 --- /dev/null +++ b/home-manager/nvim/lua/plugins/mkdir.lua @@ -0,0 +1,7 @@ +---@type LazyPluginSpec +local mkdir = { + 'jghauser/mkdir.nvim', + event = require('vim_event').buf_new_file +} + +return mkdir diff --git a/home-manager/nvim/lua/plugins/neo-tree.lua b/home-manager/nvim/lua/plugins/neo-tree.lua new file mode 100644 index 0000000..05b9516 --- /dev/null +++ b/home-manager/nvim/lua/plugins/neo-tree.lua @@ -0,0 +1,31 @@ +---@type LazyPluginSpec +local neo_tree = { + 'nvim-neo-tree/neo-tree.nvim', + config = function() + vim.g.neo_tree_remove_legacy_commands = 1 + + require('neo-tree').setup({ + close_if_last_window = true, + filesystem = { + filtered_items = { visible = true }, + follow_current_file = true, + use_libuv_file_watcher = true + }, + view = { relativenumber = true }, + window = { width = 30 } + }) + end, + dependencies = { + require('plugins.devicons'), + require('plugins.nui'), + require('plugins.plenary') + }, + keys = { { + '', + function() + require('neo-tree.command')._command('toggle') + end + } } +} + +return neo_tree diff --git a/home-manager/nvim/lua/plugins/neogit.lua b/home-manager/nvim/lua/plugins/neogit.lua new file mode 100644 index 0000000..1f4bd60 --- /dev/null +++ b/home-manager/nvim/lua/plugins/neogit.lua @@ -0,0 +1,18 @@ +---@type LazyPluginSpec +local neogit = { + 'TimUntersberger/neogit', + config = function() + require('neogit').setup({ + disable_commit_confirmation = true + }) + end, + dependencies = { require('plugins.plenary') }, + keys = { { + '', + function() + require('neogit').open() + end + } } +} + +return neogit diff --git a/home-manager/nvim/lua/plugins/noice.lua b/home-manager/nvim/lua/plugins/noice.lua new file mode 100644 index 0000000..c144bbf --- /dev/null +++ b/home-manager/nvim/lua/plugins/noice.lua @@ -0,0 +1,10 @@ +---@type LazyPluginSpec +local noice = { + 'folke/noice.nvim', + config = true, + dependencies = { + require('plugins.nui'), + require('plugins.treesitter') + } +} +return noice diff --git a/home-manager/nvim/lua/plugins/nui.lua b/home-manager/nvim/lua/plugins/nui.lua new file mode 100644 index 0000000..9d95a66 --- /dev/null +++ b/home-manager/nvim/lua/plugins/nui.lua @@ -0,0 +1,7 @@ +---@type LazyPluginSpec +local nui = { + 'MunifTanjim/nui.nvim', + lazy = true +} + +return nui diff --git a/home-manager/nvim/lua/plugins/plenary.lua b/home-manager/nvim/lua/plugins/plenary.lua new file mode 100644 index 0000000..595eafc --- /dev/null +++ b/home-manager/nvim/lua/plugins/plenary.lua @@ -0,0 +1,7 @@ +---@type LazyPluginSpec +local plenary = { + 'nvim-lua/plenary.nvim', + lazy = true +} + +return plenary diff --git a/home-manager/nvim/lua/plugins/scrollview.lua b/home-manager/nvim/lua/plugins/scrollview.lua new file mode 100644 index 0000000..f2be332 --- /dev/null +++ b/home-manager/nvim/lua/plugins/scrollview.lua @@ -0,0 +1,16 @@ +local event = require('vim_event') + +---@type LazyPluginSpec +local scrollview = { + 'dstein64/nvim-scrollview', + config = function() + vim.api.nvim_set_hl(0, 'ScrollView', { link = 'TermCursor' }) + vim.g.scrollview_column = 1 + end, + event = { + event.buf_new_file, + event.buf_read_pre + } +} + +return scrollview diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua new file mode 100644 index 0000000..a3e4fb0 --- /dev/null +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -0,0 +1,71 @@ +local builtin = 'telescope.builtin' + +---@type LazyPluginSpec +local telescope = { + 'nvim-telescope/telescope.nvim', + config = function() + local args = require('telescope.config').values.vimgrep_arguments + local additions = { + '--hidden', + '--glob', + '!**/.git/*' + } + for _, v in ipairs(additions) do + table.insert(args, v) + end + + require('telescope').setup({ + defaults = { + layout_config = { + prompt_position = 'top', + }, + mappings = { + i = { + [''] = require('telescope.actions').close + } + }, + prompt_prefix = '  ', + sorting_strategy = 'ascending', + vimgrep_arguments = args + }, + pickers = { + find_files = { + find_command = { + 'rg', + '--files', + '--hidden', + '--glob', + '!**/.git/*' + } + } + } + }) + end, + dependencies = { + require('plugins.devicons'), + require('plugins.plenary'), + require('plugins.treesitter') + }, + keys = { + { + '', + function() + require(builtin).current_buffer_fuzzy_find() + end + }, + { + '', + function() + require(builtin).find_files() + end + }, + { + '?', + function() + require(builtin).help_tags() + end + } + } +} + +return telescope diff --git a/home-manager/nvim/lua/plugins/treesitter.lua b/home-manager/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..19d0d7a --- /dev/null +++ b/home-manager/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,20 @@ +---@type LazyPluginSpec +local treesitter = { + 'nvim-treesitter/nvim-treesitter', + build = function() + require('nvim-treesitter.install').update({ with_sync = true }) + end, + config = function() + require('nvim-treesitter.configs').setup { + auto_install = true, + highlight = { + enable = true + } + } + + require('nvim-treesitter.install').prefer_git = false + end, + event = require('vim_event').buf_read_pre +} + +return treesitter diff --git a/home-manager/nvim/lua/plugins/trouble.lua b/home-manager/nvim/lua/plugins/trouble.lua new file mode 100644 index 0000000..b5c9681 --- /dev/null +++ b/home-manager/nvim/lua/plugins/trouble.lua @@ -0,0 +1,13 @@ +---@type LazyPluginSpec +local trouble = { + 'folke/trouble.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + keys = { { + 'm', + function() + require('trouble').toggle() + end + } } +} + +return trouble diff --git a/home-manager/nvim/lua/plugins/vscode.lua b/home-manager/nvim/lua/plugins/vscode.lua new file mode 100644 index 0000000..665273a --- /dev/null +++ b/home-manager/nvim/lua/plugins/vscode.lua @@ -0,0 +1,11 @@ +---@type LazyPluginSpec +local vscode_plugin = { + 'Mofiqul/vscode.nvim', + config = function() + local vscode = require('vscode') + vscode.setup({ transparent = true }) + vscode.load() + end +} + +return vscode_plugin diff --git a/home-manager/nvim/lua/vim_event/init.lua b/home-manager/nvim/lua/vim_event/init.lua new file mode 100644 index 0000000..e104809 --- /dev/null +++ b/home-manager/nvim/lua/vim_event/init.lua @@ -0,0 +1,7 @@ +local M = { + buf_new_file = 'BufNewFile', + buf_read_pre = 'BufReadPre', + insert_enter = 'InsertEnter' +} + +return M -- 2.51.2 From e73a4c63db66f2e255d521878c955980f41f8eb0 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 26 Mar 2023 22:23:15 +0900 Subject: [PATCH 279/589] Add nvim-notify --- home-manager/nvim/init.lua | 1 + home-manager/nvim/lazy-lock.json | 5 +++-- home-manager/nvim/lua/plugins/noice.lua | 9 +++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index d31e497..22f51e1 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -124,6 +124,7 @@ vim.opt.shiftwidth = 2 vim.opt.signcolumn = 'yes' vim.opt.splitright = true vim.opt.tabstop = 4 +vim.opt.termguicolors = true vim.opt.wrap = false if vim_true(vim.fn.has('win64')) then diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 8920a88..9de401d 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -12,17 +12,18 @@ "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, - "noice.nvim": { "branch": "main", "commit": "a26fca0f623d095dfac5f97a436f97efb90772df" }, + "noice.nvim": { "branch": "main", "commit": "1da4edfba3e9278e98fc9723d7235d9ab3889744" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, + "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "trouble.nvim": { "branch": "main", "commit": "67337644e38144b444d026b0df2dc5fa0038930f" }, + "trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" }, "vscode.nvim": { "branch": "main", "commit": "64e107c31da7d73048681b77a43f5e019d850980" } } \ No newline at end of file diff --git a/home-manager/nvim/lua/plugins/noice.lua b/home-manager/nvim/lua/plugins/noice.lua index c144bbf..2d5df09 100644 --- a/home-manager/nvim/lua/plugins/noice.lua +++ b/home-manager/nvim/lua/plugins/noice.lua @@ -3,6 +3,15 @@ local noice = { 'folke/noice.nvim', config = true, dependencies = { + { + 'rcarriga/nvim-notify', + config = function() + require('notify').setup({ + background_colour = '#000000', + stages = 'fade' + }) + end + }, require('plugins.nui'), require('plugins.treesitter') } -- 2.51.2 From 48df656be52e1538e6490430bcf975d7f20ce096 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Mar 2023 10:41:12 +0900 Subject: [PATCH 280/589] Update autopairs --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 9de401d..03bb47c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -14,7 +14,7 @@ "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, "noice.nvim": { "branch": "main", "commit": "1da4edfba3e9278e98fc9723d7235d9ab3889744" }, "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, - "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, + "nvim-autopairs": { "branch": "master", "commit": "0fd6519d44eac3a6736aafdb3fe9da916c3701d4" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, -- 2.51.2 From 8942820956c713123a8e641313f6c754e61e9a62 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Mar 2023 10:42:10 +0900 Subject: [PATCH 281/589] Use `os.execute` instead of `vim.fn.system` --- home-manager/nvim/init.lua | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 22f51e1..f0b63b7 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -1,19 +1,7 @@ ----@param b number ----@return boolean -local function vim_true(b) - return b == 1 -end - +---@type string local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - 'git', - 'clone', - '--filter=blob:none', - 'https://github.com/folke/lazy.nvim.git', - '--branch=stable', - lazypath, - }) + os.execute('git clone --filter=blob:none https://github.com/folke/lazy.nvim.git --branch=stable ' .. lazypath) end vim.opt.rtp:prepend(lazypath) @@ -127,7 +115,7 @@ vim.opt.tabstop = 4 vim.opt.termguicolors = true vim.opt.wrap = false -if vim_true(vim.fn.has('win64')) then +if vim.fn.has('win64') == 1 then vim.opt.shell = 'pwsh -NoLogo' vim.opt.shellcmdflag = '-Command' vim.opt.shellxquote = '' -- 2.51.2 From ca9a0bcda260a276053089e841c124938aa6d446 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Mar 2023 10:48:04 +0900 Subject: [PATCH 282/589] Map space to `` key --- home-manager/nvim/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index f0b63b7..2bebd7c 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -1,3 +1,5 @@ +vim.g.mapleader = ' ' + ---@type string local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' if not vim.loop.fs_stat(lazypath) then -- 2.51.2 From 73322646082aa39fa9c8ec2ed226b39b1b566b81 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Mar 2023 10:59:02 +0900 Subject: [PATCH 283/589] Add a keymap to call `:Telescope live_grep` --- home-manager/nvim/lua/plugins/telescope.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua index a3e4fb0..e3e23b9 100644 --- a/home-manager/nvim/lua/plugins/telescope.lua +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -59,6 +59,12 @@ local telescope = { require(builtin).find_files() end }, + { + 'f', + function() + require(builtin).live_grep() + end + }, { '?', function() -- 2.51.2 From 714270d28ad0c63c30c140a4f4bee5730913c308 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Mar 2023 11:16:57 +0900 Subject: [PATCH 284/589] Add a keymap to jump certain tab --- home-manager/nvim/lua/plugins/barbar.lua | 41 ++++++++++++++++-------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua index e4834ba..e49f4f4 100644 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -1,5 +1,31 @@ local event = require('vim_event') +---@type LazyKeys[] +local keys = { + { + 'c', + 'BufferClose' + }, + { + '.', + 'BufferNext' + }, + { + ',', + 'BufferPrevious' + }, + { + 't0', + 'BufferLast' + } +} +for i = 1, 9 do + table.insert(keys, { + string.format('t%d', i), + string.format('BufferGoto %d', i) + }) +end + ---@type LazyPluginSpec local barbar = { 'romgrk/barbar.nvim', @@ -8,20 +34,7 @@ local barbar = { event.buf_new_file, event.buf_read_pre }, - keys = { - { - 'c', - 'BufferClose' - }, - { - '.', - 'BufferNext' - }, - { - ',', - 'BufferPrevious' - } - } + keys = keys } return barbar -- 2.51.2 From d73a0f9119f4e846a85745e40283d396cfe2f1ae Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Mar 2023 11:47:47 +0900 Subject: [PATCH 285/589] Add nvim-surround --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/autopairs.lua | 6 ++++-- home-manager/nvim/lua/plugins/surround.lua | 13 +++++++++++++ home-manager/nvim/lua/vim_event/init.lua | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 home-manager/nvim/lua/plugins/surround.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 03bb47c..718f72c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -19,6 +19,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, + "nvim-surround": { "branch": "main", "commit": "056f69ed494198ff6ea0070cfc66997cfe0a6c8b" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, diff --git a/home-manager/nvim/lua/plugins/autopairs.lua b/home-manager/nvim/lua/plugins/autopairs.lua index d9ce3c2..204823d 100644 --- a/home-manager/nvim/lua/plugins/autopairs.lua +++ b/home-manager/nvim/lua/plugins/autopairs.lua @@ -1,3 +1,5 @@ +local event = require('vim_event') + ---@type LazyPluginSpec local autopairs = { 'windwp/nvim-autopairs', @@ -38,8 +40,8 @@ local autopairs = { end end, event = { - 'BufReadPost', - require('vim_event').buf_new_file + event.buf_new_file, + event.buf_read_post } } diff --git a/home-manager/nvim/lua/plugins/surround.lua b/home-manager/nvim/lua/plugins/surround.lua new file mode 100644 index 0000000..fb9767a --- /dev/null +++ b/home-manager/nvim/lua/plugins/surround.lua @@ -0,0 +1,13 @@ +local event = require('vim_event') + +---@type LazyPluginSpec +local surround = { + 'kylechui/nvim-surround', + config = true, + event = { + event.buf_new_file, + event.buf_read_post + } +} + +return surround diff --git a/home-manager/nvim/lua/vim_event/init.lua b/home-manager/nvim/lua/vim_event/init.lua index e104809..2191ca5 100644 --- a/home-manager/nvim/lua/vim_event/init.lua +++ b/home-manager/nvim/lua/vim_event/init.lua @@ -1,5 +1,6 @@ local M = { buf_new_file = 'BufNewFile', + buf_read_post = 'BufReadPost', buf_read_pre = 'BufReadPre', insert_enter = 'InsertEnter' } -- 2.51.2 From 367b61edc2f1aa1b3cb839f7785f95b993c323de Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Mar 2023 17:20:33 +0900 Subject: [PATCH 286/589] Update nvim-surround --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 718f72c..8a967dd 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -19,7 +19,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, - "nvim-surround": { "branch": "main", "commit": "056f69ed494198ff6ea0070cfc66997cfe0a6c8b" }, + "nvim-surround": { "branch": "main", "commit": "ed4e95c89f96019688463f30a3ee218ed3682bd3" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, -- 2.51.2 From 1ef4f6707a0a38f9725edec25c1c8192c4311caf Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Mar 2023 18:02:39 +0900 Subject: [PATCH 287/589] Add `ensure_installed` persers for noice.nvim --- home-manager/nvim/lua/plugins/treesitter.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/home-manager/nvim/lua/plugins/treesitter.lua b/home-manager/nvim/lua/plugins/treesitter.lua index 19d0d7a..85b89be 100644 --- a/home-manager/nvim/lua/plugins/treesitter.lua +++ b/home-manager/nvim/lua/plugins/treesitter.lua @@ -7,6 +7,16 @@ local treesitter = { config = function() require('nvim-treesitter.configs').setup { auto_install = true, + -- For noice.nvim (https://github.com/folke/noice.nvim#%EF%B8%8F-requirements) + ensure_installed = { + 'bash', + 'lua', + 'markdown', + 'markdown_inline', + 'regex', + 'vim' + }, + sync_install = true, highlight = { enable = true } -- 2.51.2 From fee8e1293dbbe7ba0d121ebad4950bdfbf85d0d2 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Mon, 27 Mar 2023 19:18:40 +0900 Subject: [PATCH 288/589] Enable cmdline completion --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/cmp.lua | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 8a967dd..b5c1cdd 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,6 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, "barbar.nvim": { "branch": "master", "commit": "d0b39de8ce48e9efced88edc9244ca21e571bb98" }, + "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, diff --git a/home-manager/nvim/lua/plugins/cmp.lua b/home-manager/nvim/lua/plugins/cmp.lua index 4ac6f05..c2a8862 100644 --- a/home-manager/nvim/lua/plugins/cmp.lua +++ b/home-manager/nvim/lua/plugins/cmp.lua @@ -54,8 +54,17 @@ local cmp = { documentation = bordered_window } }) + + cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = 'cmdline' }, + { name = 'path' } + }) + }) end, dependencies = { + 'hrsh7th/cmp-cmdline', 'hrsh7th/cmp-nvim-lua', { 'hrsh7th/cmp-nvim-lsp', @@ -68,7 +77,10 @@ local cmp = { dependencies = { 'L3MON4D3/LuaSnip' } }, }, - event = require('vim_event').insert_enter + event = { + 'CmdlineEnter', + require('vim_event').insert_enter + } } return cmp -- 2.51.2 From 5c9f8c6831804a2bd5c4ca9387904c2457f94a89 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Mar 2023 09:35:02 +0900 Subject: [PATCH 289/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b5c1cdd..13426ef 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -20,9 +20,9 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, - "nvim-surround": { "branch": "main", "commit": "ed4e95c89f96019688463f30a3ee218ed3682bd3" }, + "nvim-surround": { "branch": "main", "commit": "b7acf822a62ddc743e8129061c0d2adb32a6b810" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, + "nvim-web-devicons": { "branch": "master", "commit": "9c5f71eec6004d43f8e14330a6edb6dbddfe0a68" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, -- 2.51.2 From 21ffd90a36d3b700d7586b9dc833deb06b1430a9 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Mar 2023 09:41:22 +0900 Subject: [PATCH 290/589] Disable animation for nvim-notify --- home-manager/nvim/init.lua | 1 - home-manager/nvim/lua/plugins/noice.lua | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 2bebd7c..abbe2e1 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -114,7 +114,6 @@ vim.opt.shiftwidth = 2 vim.opt.signcolumn = 'yes' vim.opt.splitright = true vim.opt.tabstop = 4 -vim.opt.termguicolors = true vim.opt.wrap = false if vim.fn.has('win64') == 1 then diff --git a/home-manager/nvim/lua/plugins/noice.lua b/home-manager/nvim/lua/plugins/noice.lua index 2d5df09..cc19a0b 100644 --- a/home-manager/nvim/lua/plugins/noice.lua +++ b/home-manager/nvim/lua/plugins/noice.lua @@ -6,10 +6,7 @@ local noice = { { 'rcarriga/nvim-notify', config = function() - require('notify').setup({ - background_colour = '#000000', - stages = 'fade' - }) + require('notify').setup({ stages = 'static' }) end }, require('plugins.nui'), -- 2.51.2 From dbc8a2e17fef4d00ec9de83beb5814e595cffc3d Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Mar 2023 15:41:31 +0900 Subject: [PATCH 291/589] Update nvim-surround --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 13426ef..ad58f46 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -20,7 +20,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, - "nvim-surround": { "branch": "main", "commit": "b7acf822a62ddc743e8129061c0d2adb32a6b810" }, + "nvim-surround": { "branch": "main", "commit": "50f667861fac75592fc9e482472c12672e1cd723" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, "nvim-web-devicons": { "branch": "master", "commit": "9c5f71eec6004d43f8e14330a6edb6dbddfe0a68" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, -- 2.51.2 From 2ad92e7135eb5200fa24c68a31e214bcc0afa746 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Mar 2023 15:42:10 +0900 Subject: [PATCH 292/589] Execute zenhan.exe only on Windows or WSL --- home-manager/nvim/init.lua | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index abbe2e1..bed81d9 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -42,8 +42,18 @@ local autocmds = { vim.diagnostic.open_float({ focusable = false }) end } - }, - { + } +} + +local uname = vim.loop.os_uname() +---@type string +local sysname = uname.sysname +local is_windows = sysname == 'Windows_NT' +local is_wsl = sysname == 'Linux' and string.find(uname.release, 'microsoft') ~= nil + +if is_windows or is_wsl then + ---@type autoCmd + local disable_ime = { event = 'InsertLeave', config = { group = vim.api.nvim_create_augroup('disable_ime', {}), @@ -52,7 +62,8 @@ local autocmds = { end } } -} + table.insert(autocmds, disable_ime) +end for _, autocmd in ipairs(autocmds) do if autocmd.config.pattern == nil then @@ -116,7 +127,7 @@ vim.opt.splitright = true vim.opt.tabstop = 4 vim.opt.wrap = false -if vim.fn.has('win64') == 1 then +if is_windows then vim.opt.shell = 'pwsh -NoLogo' vim.opt.shellcmdflag = '-Command' vim.opt.shellxquote = '' -- 2.51.2 From e902cdc33d06c9dba17e485aad907bbe7fe2555d Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Tue, 28 Mar 2023 20:07:17 +0900 Subject: [PATCH 293/589] Disable some built-in plugins --- home-manager/nvim/init.lua | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index bed81d9..4e6f1b7 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -7,14 +7,24 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -local opts = { +require('lazy').setup('plugins', { checker = { enabled = true }, defaults = { version = '*' + }, + performance = { + rtp = { + disabled_plugins = { + 'gzip', + 'netrwPlugin', + 'tarPlugin', + 'tohtml', + 'tutor', + 'zipPlugin' + } + } } -} - -require('lazy').setup('plugins', opts) +}) ---@class autoCmdConfig ---@field group any -- 2.51.2 From 73391b55763e2c65e2cfc698295b089bdc04324f Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 31 Mar 2023 14:43:30 +0900 Subject: [PATCH 294/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ad58f46..9f04d3b 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -9,12 +9,12 @@ "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, + "lualine.nvim": { "branch": "master", "commit": "e80465d721bdafcd234e890d1677ca4afb905144" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, "noice.nvim": { "branch": "main", "commit": "1da4edfba3e9278e98fc9723d7235d9ab3889744" }, - "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, + "nui.nvim": { "branch": "main", "commit": "4eaec2ac66af2ca6ddddd3f665ad0909b90ae36a" }, "nvim-autopairs": { "branch": "master", "commit": "0fd6519d44eac3a6736aafdb3fe9da916c3701d4" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, @@ -22,10 +22,10 @@ "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-surround": { "branch": "main", "commit": "50f667861fac75592fc9e482472c12672e1cd723" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "9c5f71eec6004d43f8e14330a6edb6dbddfe0a68" }, + "nvim-web-devicons": { "branch": "master", "commit": "267af2d57e0f251d65b95bdfd1f382211b272417" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" }, - "vscode.nvim": { "branch": "main", "commit": "64e107c31da7d73048681b77a43f5e019d850980" } + "vscode.nvim": { "branch": "main", "commit": "bd66a0f0bbf36942f41088570318b41427e469b2" } } \ No newline at end of file -- 2.51.2 From 28f716a438442279539631b99933fb4c76b411ca Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 31 Mar 2023 14:44:13 +0900 Subject: [PATCH 295/589] Clean up unnecessary configs --- home-manager/nvim/lua/plugins/indent-blankline.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/home-manager/nvim/lua/plugins/indent-blankline.lua b/home-manager/nvim/lua/plugins/indent-blankline.lua index 2f0e88c..2adf91f 100644 --- a/home-manager/nvim/lua/plugins/indent-blankline.lua +++ b/home-manager/nvim/lua/plugins/indent-blankline.lua @@ -4,14 +4,11 @@ local event = require('vim_event') local indent_blankline = { 'lukas-reineke/indent-blankline.nvim', config = function() - local character = '│' local link_to_non_text = { link = 'NonText' } vim.api.nvim_set_hl(0, 'IndentBlanklineChar', link_to_non_text) vim.api.nvim_set_hl(0, 'IndentBlanklineContextChar', { fg = '#dcdcaa' }) vim.api.nvim_set_hl(0, 'IndentBlanklineSpaceChar', link_to_non_text) require('indent_blankline').setup({ - char = character, - context_char = character, show_current_context = true }) end, -- 2.51.2 From 32118de9a6401dd95a03938f87b963e54eeb58c3 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 31 Mar 2023 15:29:10 +0900 Subject: [PATCH 296/589] Add a keymap for `vim.lsp.buf.references` --- home-manager/nvim/init.lua | 2 -- home-manager/nvim/lua/plugins/lspconfig.lua | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 4e6f1b7..231a851 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -117,8 +117,6 @@ for _, sign in ipairs(signs) do }) end -vim.keymap.set('n', 'h', vim.lsp.buf.hover) - vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.fileformats = { 'unix', 'dos' } diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 12fc665..7b06c20 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -57,10 +57,20 @@ local lspconfig = { event.buf_new_file, event.buf_read_pre }, - keys = { { - 'rn', - vim.lsp.buf.rename - } } + keys = { + { + 'h', + vim.lsp.buf.hover + }, + { + 'rf', + vim.lsp.buf.references + }, + { + 'rn', + vim.lsp.buf.rename + } + } } return lspconfig -- 2.51.2 From c141be07045a8f0bc58407dace5805c3312f08e3 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 31 Mar 2023 21:10:51 +0900 Subject: [PATCH 297/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 9f04d3b..4c5bc7b 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -9,7 +9,7 @@ "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "e80465d721bdafcd234e890d1677ca4afb905144" }, + "lualine.nvim": { "branch": "master", "commit": "0ddacf01ed74c8fca4af4ea926bab5b100e71616" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, @@ -22,7 +22,7 @@ "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-surround": { "branch": "main", "commit": "50f667861fac75592fc9e482472c12672e1cd723" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "267af2d57e0f251d65b95bdfd1f382211b272417" }, + "nvim-web-devicons": { "branch": "master", "commit": "d92b3f4275f4774c0cb23b8b094a41d1dbb3e78c" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, -- 2.51.2 From a99ce033f09e5340f1104f59ba50d8c9ea74853c Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Fri, 31 Mar 2023 21:54:03 +0900 Subject: [PATCH 298/589] Add firenvim --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/barbar.lua | 1 + home-manager/nvim/lua/plugins/firenvim.lua | 17 +++++++++++++++++ home-manager/nvim/lua/plugins/noice.lua | 1 + 4 files changed, 20 insertions(+) create mode 100644 home-manager/nvim/lua/plugins/firenvim.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 4c5bc7b..220eb09 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,6 +6,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "firenvim": { "branch": "master", "commit": "a96710eaf6e6c2de78341c32d8dc7b39727ad54c" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua index e49f4f4..850d45f 100644 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -29,6 +29,7 @@ end ---@type LazyPluginSpec local barbar = { 'romgrk/barbar.nvim', + cond = not vim.g.started_by_firenvim, dependencies = { require('plugins.devicons') }, event = { event.buf_new_file, diff --git a/home-manager/nvim/lua/plugins/firenvim.lua b/home-manager/nvim/lua/plugins/firenvim.lua new file mode 100644 index 0000000..e08a92a --- /dev/null +++ b/home-manager/nvim/lua/plugins/firenvim.lua @@ -0,0 +1,17 @@ +---@type LazyPluginSpec +local firenvim = { + 'glacambre/firenvim', + build = function() + require('lazy').load({ + plugins = 'firenvim', + wait = true + }) + vim.fn['firenvim#install'](0) + end, + cond = not not vim.g.started_by_firenvim, + config = function() + vim.opt.guifont = 'HackGen Console NF:h11' + end +} + +return firenvim diff --git a/home-manager/nvim/lua/plugins/noice.lua b/home-manager/nvim/lua/plugins/noice.lua index cc19a0b..e4f2653 100644 --- a/home-manager/nvim/lua/plugins/noice.lua +++ b/home-manager/nvim/lua/plugins/noice.lua @@ -1,6 +1,7 @@ ---@type LazyPluginSpec local noice = { 'folke/noice.nvim', + cond = not vim.g.started_by_firenvim, config = true, dependencies = { { -- 2.51.2 From ad0795904e26f1aaefd3190da61f168d49f96849 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 2 Apr 2023 17:30:59 +0900 Subject: [PATCH 299/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 220eb09..39c79ec 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -10,7 +10,7 @@ "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "0ddacf01ed74c8fca4af4ea926bab5b100e71616" }, + "lualine.nvim": { "branch": "master", "commit": "9170434aa100f3967b43d5d34bb9adc56fae1986" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, @@ -28,5 +28,5 @@ "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" }, - "vscode.nvim": { "branch": "main", "commit": "bd66a0f0bbf36942f41088570318b41427e469b2" } + "vscode.nvim": { "branch": "main", "commit": "9cf814fbc1e7ec05fe05e5381beee2ceec5b099c" } } \ No newline at end of file -- 2.51.2 From 892547ebf47d2cd433f174dedaefb72a4c5546de Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 2 Apr 2023 17:33:22 +0900 Subject: [PATCH 300/589] Disable Firenvim by default --- home-manager/nvim/lua/plugins/firenvim.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/nvim/lua/plugins/firenvim.lua b/home-manager/nvim/lua/plugins/firenvim.lua index e08a92a..dc1ca1a 100644 --- a/home-manager/nvim/lua/plugins/firenvim.lua +++ b/home-manager/nvim/lua/plugins/firenvim.lua @@ -10,6 +10,11 @@ local firenvim = { end, cond = not not vim.g.started_by_firenvim, config = function() + vim.g.firenvim_config = { + localSettings = { + ['.*'] = { takeover = 'never' } + } + } vim.opt.guifont = 'HackGen Console NF:h11' end } -- 2.51.2 From b729e93b19badcedb24748d5241d847bafc7cd5c Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 5 Apr 2023 18:25:03 +0900 Subject: [PATCH 301/589] Add Firenvim setting for github.com --- home-manager/nvim/lua/plugins/firenvim.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/firenvim.lua b/home-manager/nvim/lua/plugins/firenvim.lua index dc1ca1a..4d90c9e 100644 --- a/home-manager/nvim/lua/plugins/firenvim.lua +++ b/home-manager/nvim/lua/plugins/firenvim.lua @@ -10,11 +10,20 @@ local firenvim = { end, cond = not not vim.g.started_by_firenvim, config = function() + vim.api.nvim_create_autocmd('BufEnter', { + pattern = 'github.com_*.txt', + callback = function() + vim.opt_local.filetype = 'markdown' + end + }) + vim.g.firenvim_config = { localSettings = { - ['.*'] = { takeover = 'never' } + [ [[.*]] ] = { takeover = 'never' }, + [ [[github\.com]] ] = { takeover = 'always' } } } + vim.opt.guifont = 'HackGen Console NF:h11' end } -- 2.51.2 From 98ea1e6be3d3502b7441679391c98eb54bf51b4e Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 5 Apr 2023 18:32:06 +0900 Subject: [PATCH 302/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 39c79ec..7f48816 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -10,20 +10,20 @@ "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "9170434aa100f3967b43d5d34bb9adc56fae1986" }, + "lualine.nvim": { "branch": "master", "commit": "c28a7427c3fb29322db136f0564ec58807b26747" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "2b2f74828eeb02cf29d6b21aa32eedadadc94ca7" }, "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, "noice.nvim": { "branch": "main", "commit": "1da4edfba3e9278e98fc9723d7235d9ab3889744" }, - "nui.nvim": { "branch": "main", "commit": "4eaec2ac66af2ca6ddddd3f665ad0909b90ae36a" }, + "nui.nvim": { "branch": "main", "commit": "1f43b13d133eb4b4f53a4485379d9afa58808389" }, "nvim-autopairs": { "branch": "master", "commit": "0fd6519d44eac3a6736aafdb3fe9da916c3701d4" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, - "nvim-surround": { "branch": "main", "commit": "50f667861fac75592fc9e482472c12672e1cd723" }, + "nvim-surround": { "branch": "main", "commit": "e6047128e57c1aff1566fb9f627521d2887fc77a" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "d92b3f4275f4774c0cb23b8b094a41d1dbb3e78c" }, + "nvim-web-devicons": { "branch": "master", "commit": "0568104bf8d0c3ab16395433fcc5c1638efc25d4" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, -- 2.51.2 From 4cab37938437232205b7871e1dfb48710802b7b8 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Thu, 6 Apr 2023 11:51:22 +0900 Subject: [PATCH 303/589] Add keymaps to move a tab --- home-manager/nvim/lua/plugins/barbar.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua index 850d45f..e2162a2 100644 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -14,6 +14,14 @@ local keys = { ',', 'BufferPrevious' }, + { + '>', + 'BufferMoveNext' + }, + { + '<', + 'BufferMovePrevious' + }, { 't0', 'BufferLast' -- 2.51.2 From 1c662cc291ea5fa7b5f050fca337d525810873e2 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 8 Apr 2023 16:51:38 +0900 Subject: [PATCH 304/589] Update nvim-web-devicons --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7f48816..31b49d8 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -23,7 +23,7 @@ "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-surround": { "branch": "main", "commit": "e6047128e57c1aff1566fb9f627521d2887fc77a" }, "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "0568104bf8d0c3ab16395433fcc5c1638efc25d4" }, + "nvim-web-devicons": { "branch": "master", "commit": "f16ec8f6e5d23e4349501dae46e0a661918e086e" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, -- 2.51.2 From 812affd61acf94cdcef48bd35c2c0d449e05d811 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 8 Apr 2023 16:54:15 +0900 Subject: [PATCH 305/589] Disable Firenvim in code view page --- home-manager/nvim/lua/plugins/firenvim.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/firenvim.lua b/home-manager/nvim/lua/plugins/firenvim.lua index 4d90c9e..576663a 100644 --- a/home-manager/nvim/lua/plugins/firenvim.lua +++ b/home-manager/nvim/lua/plugins/firenvim.lua @@ -20,7 +20,8 @@ local firenvim = { vim.g.firenvim_config = { localSettings = { [ [[.*]] ] = { takeover = 'never' }, - [ [[github\.com]] ] = { takeover = 'always' } + [ [[github\.com]] ] = { takeover = 'always' }, + [ [[github\.com.*blob]] ] = { takeover = 'never' } } } -- 2.51.2 From 990b1ed1730b82fd0d72a2900d6d4b21e34beaa0 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 29 Apr 2023 11:14:48 +0900 Subject: [PATCH 306/589] Update plugins --- home-manager/nvim/lazy-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 31b49d8..23da9b4 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,32 +1,32 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, "barbar.nvim": { "branch": "master", "commit": "d0b39de8ce48e9efced88edc9244ca21e571bb98" }, - "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, + "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "firenvim": { "branch": "master", "commit": "a96710eaf6e6c2de78341c32d8dc7b39727ad54c" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" }, + "lazy.nvim": { "branch": "main", "commit": "d6a782c7002682f4a01b79fc3918c4584ad6e8fb" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "c28a7427c3fb29322db136f0564ec58807b26747" }, + "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "2b2f74828eeb02cf29d6b21aa32eedadadc94ca7" }, - "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, - "noice.nvim": { "branch": "main", "commit": "1da4edfba3e9278e98fc9723d7235d9ab3889744" }, - "nui.nvim": { "branch": "main", "commit": "1f43b13d133eb4b4f53a4485379d9afa58808389" }, - "nvim-autopairs": { "branch": "master", "commit": "0fd6519d44eac3a6736aafdb3fe9da916c3701d4" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "8d485aab32da9b8841d4af977f992b82b14af469" }, + "neogit": { "branch": "master", "commit": "69a6ca7c41b023ebf9cad70778e227b3209b40c4" }, + "noice.nvim": { "branch": "main", "commit": "7bd435a48a2d2b3f028c633126e3f669ae6b902f" }, + "nui.nvim": { "branch": "main", "commit": "ecd9def93891b9260b15b5fcef542eaabf4145c9" }, + "nvim-autopairs": { "branch": "master", "commit": "7566a86f44bb72ba2b1a609f528a27d93241502d" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-surround": { "branch": "main", "commit": "e6047128e57c1aff1566fb9f627521d2887fc77a" }, - "nvim-treesitter": { "branch": "master", "commit": "c38646edf2bdfac157ca619697ecad9ea87fd469" }, - "nvim-web-devicons": { "branch": "master", "commit": "f16ec8f6e5d23e4349501dae46e0a661918e086e" }, + "nvim-treesitter": { "branch": "master", "commit": "cc360a9beb1b30d172438f640e2c3450358c4086" }, + "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" }, - "vscode.nvim": { "branch": "main", "commit": "9cf814fbc1e7ec05fe05e5381beee2ceec5b099c" } + "trouble.nvim": { "branch": "main", "commit": "16b98f5d0c524253032d8090a810419f62f0cbe7" }, + "vscode.nvim": { "branch": "main", "commit": "dc5f37603ada51db13bc4009cbee628c5857a274" } } \ No newline at end of file -- 2.51.2 From 1bb553e110fdff24c8d2788f033d7ec470e079c8 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 30 Apr 2023 07:40:23 +0900 Subject: [PATCH 307/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 23da9b4..b01308e 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "barbar.nvim": { "branch": "master", "commit": "d0b39de8ce48e9efced88edc9244ca21e571bb98" }, + "barbar.nvim": { "branch": "master", "commit": "701ffcde46dc040352ee25d1570d18dab9ccb0ed" }, "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -16,7 +16,7 @@ "neogit": { "branch": "master", "commit": "69a6ca7c41b023ebf9cad70778e227b3209b40c4" }, "noice.nvim": { "branch": "main", "commit": "7bd435a48a2d2b3f028c633126e3f669ae6b902f" }, "nui.nvim": { "branch": "main", "commit": "ecd9def93891b9260b15b5fcef542eaabf4145c9" }, - "nvim-autopairs": { "branch": "master", "commit": "7566a86f44bb72ba2b1a609f528a27d93241502d" }, + "nvim-autopairs": { "branch": "master", "commit": "4b478a73b18967d9f9e756a71100d0e63a08690a" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, -- 2.51.2 From a6100ffcd36420fff2e2da47dc9b33fa105b4ba8 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 30 Apr 2023 08:49:51 +0900 Subject: [PATCH 308/589] Add Firenvim setting for Go Playground --- home-manager/nvim/lua/plugins/firenvim.lua | 33 +++++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/home-manager/nvim/lua/plugins/firenvim.lua b/home-manager/nvim/lua/plugins/firenvim.lua index 576663a..9547e79 100644 --- a/home-manager/nvim/lua/plugins/firenvim.lua +++ b/home-manager/nvim/lua/plugins/firenvim.lua @@ -10,18 +10,37 @@ local firenvim = { end, cond = not not vim.g.started_by_firenvim, config = function() - vim.api.nvim_create_autocmd('BufEnter', { - pattern = 'github.com_*.txt', - callback = function() - vim.opt_local.filetype = 'markdown' - end - }) + ---@class filetypeConfig + ---@field pattern string + ---@field ft string + + ---@type filetypeConfig[] + local configs = { + { + pattern = 'github.com_*', + ft = 'markdown' + }, + { + pattern = 'go.dev_*', + ft = 'go' + } + } + + for i in ipairs(configs) do + vim.api.nvim_create_autocmd('BufEnter', { + pattern = string.format('%s.txt', configs[i].pattern), + callback = function() + vim.opt_local.filetype = configs[i].ft + end + }) + end vim.g.firenvim_config = { localSettings = { [ [[.*]] ] = { takeover = 'never' }, [ [[github\.com]] ] = { takeover = 'always' }, - [ [[github\.com.*blob]] ] = { takeover = 'never' } + [ [[github\.com.*blob]] ] = { takeover = 'never' }, + [ [[go\.dev]] ] = { takeover = 'always' } } } -- 2.51.2 From c339da7ecc9db3fbea15fdfc1e6b7cdc93e90ad1 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 30 Apr 2023 08:54:39 +0900 Subject: [PATCH 309/589] Add a command trigger for Telescope --- home-manager/nvim/lua/plugins/telescope.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua index e3e23b9..9205912 100644 --- a/home-manager/nvim/lua/plugins/telescope.lua +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -3,6 +3,7 @@ local builtin = 'telescope.builtin' ---@type LazyPluginSpec local telescope = { 'nvim-telescope/telescope.nvim', + cmd = 'Telescope', config = function() local args = require('telescope.config').values.vimgrep_arguments local additions = { -- 2.51.2 From 43b39aa074ab27a19a517c64d6f556a9fc8a66cb Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 13 May 2023 22:31:50 +0900 Subject: [PATCH 310/589] Update plugins --- home-manager/nvim/lazy-lock.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b01308e..33eb0c4 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "barbar.nvim": { "branch": "master", "commit": "701ffcde46dc040352ee25d1570d18dab9ccb0ed" }, + "barbar.nvim": { "branch": "master", "commit": "31b4f706bcc41be7322ff5dbaee2654ca5ccc36c" }, "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -8,22 +8,22 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "firenvim": { "branch": "master", "commit": "a96710eaf6e6c2de78341c32d8dc7b39727ad54c" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "d6a782c7002682f4a01b79fc3918c4584ad6e8fb" }, - "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" }, + "lazy.nvim": { "branch": "main", "commit": "51a3873ccd59239e4dff3319561d51031f4b52d2" }, + "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, + "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "8d485aab32da9b8841d4af977f992b82b14af469" }, - "neogit": { "branch": "master", "commit": "69a6ca7c41b023ebf9cad70778e227b3209b40c4" }, - "noice.nvim": { "branch": "main", "commit": "7bd435a48a2d2b3f028c633126e3f669ae6b902f" }, - "nui.nvim": { "branch": "main", "commit": "ecd9def93891b9260b15b5fcef542eaabf4145c9" }, - "nvim-autopairs": { "branch": "master", "commit": "4b478a73b18967d9f9e756a71100d0e63a08690a" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "541f5c92d2492041afb354e2df6e74809094b051" }, + "neogit": { "branch": "master", "commit": "917fb24c9b7e0506ebfa94ccdbeaaea5eff2f916" }, + "noice.nvim": { "branch": "main", "commit": "13c3b39e43fbd0f50dac608fdbda230dec69f1d1" }, + "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" }, + "nvim-autopairs": { "branch": "master", "commit": "7747bbae60074acf0b9e3a4c13950be7a2dff444" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, "nvim-surround": { "branch": "main", "commit": "e6047128e57c1aff1566fb9f627521d2887fc77a" }, "nvim-treesitter": { "branch": "master", "commit": "cc360a9beb1b30d172438f640e2c3450358c4086" }, - "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" }, + "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, -- 2.51.2 From c4646400ad4e2de421391995fd25f885c46ef70a Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sat, 13 May 2023 22:40:23 +0900 Subject: [PATCH 311/589] Update sign icons to Nerd v3 --- home-manager/nvim/init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 231a851..72764b1 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -92,19 +92,19 @@ vim.diagnostic.config({ virtual_text = false }) local signs = { { msg_type = 'Error', - icon = '' + icon = '' }, { msg_type = 'Warn', - icon = '' + icon = '' }, { msg_type = 'Hint', - icon = '' + icon = '' }, { msg_type = 'Info', - icon = '' + icon = '' } } -- 2.51.2 From 078af1668059225a729346ae83d67890101af9dd Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 11 Jun 2023 14:25:51 +0900 Subject: [PATCH 312/589] Update plugins --- home-manager/nvim/lazy-lock.json | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 33eb0c4..3c166cc 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,32 +1,32 @@ { "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "barbar.nvim": { "branch": "master", "commit": "31b4f706bcc41be7322ff5dbaee2654ca5ccc36c" }, - "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" }, + "barbar.nvim": { "branch": "master", "commit": "b8ca6076f75e49cca1fa0288c080f3d10ec2152c" }, + "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "firenvim": { "branch": "master", "commit": "a96710eaf6e6c2de78341c32d8dc7b39727ad54c" }, - "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, - "lazy.nvim": { "branch": "main", "commit": "51a3873ccd59239e4dff3319561d51031f4b52d2" }, + "indent-blankline.nvim": { "branch": "master", "commit": "ceaf730b13e332cd76600d9795722413c236c684" }, + "lazy.nvim": { "branch": "main", "commit": "6b2311a46a3808e366bb251270f4cc04afb421ed" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "541f5c92d2492041afb354e2df6e74809094b051" }, - "neogit": { "branch": "master", "commit": "917fb24c9b7e0506ebfa94ccdbeaaea5eff2f916" }, - "noice.nvim": { "branch": "main", "commit": "13c3b39e43fbd0f50dac608fdbda230dec69f1d1" }, - "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" }, - "nvim-autopairs": { "branch": "master", "commit": "7747bbae60074acf0b9e3a4c13950be7a2dff444" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa" }, + "neogit": { "branch": "master", "commit": "68a3e90e9d1ed9e362317817851d0f34b19e426b" }, + "noice.nvim": { "branch": "main", "commit": "a070cb87a180fd7e2c4387accff0be90268fb736" }, + "nui.nvim": { "branch": "main", "commit": "7a524120a7a70761b5a65b602fd235a65cb005aa" }, + "nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, - "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, - "nvim-scrollview": { "branch": "main", "commit": "ba6c48bf7919dd48a371e7b9c683b8858053e885" }, - "nvim-surround": { "branch": "main", "commit": "e6047128e57c1aff1566fb9f627521d2887fc77a" }, + "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, + "nvim-scrollview": { "branch": "main", "commit": "c4921541d7ba5fe197dbbd60b1f62cc390a6b300" }, + "nvim-surround": { "branch": "main", "commit": "211eaad7c6d01ef4ac02cba9052b3082ec232101" }, "nvim-treesitter": { "branch": "master", "commit": "cc360a9beb1b30d172438f640e2c3450358c4086" }, - "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" }, + "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, - "schemastore.nvim": { "branch": "main", "commit": "82b039aa402c9d138c3c4c16b1465c8a3be66117" }, - "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "trouble.nvim": { "branch": "main", "commit": "16b98f5d0c524253032d8090a810419f62f0cbe7" }, - "vscode.nvim": { "branch": "main", "commit": "dc5f37603ada51db13bc4009cbee628c5857a274" } + "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, + "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, + "trouble.nvim": { "branch": "main", "commit": "a0f2375117c546fbba217efcfff202553eaed1b8" }, + "vscode.nvim": { "branch": "main", "commit": "3ae7e188f0b58b29bc1b5d3698e47ce54f51caf9" } } \ No newline at end of file -- 2.51.2 From 23f0a3158443f8c3719cf9b6f2751afda43cf019 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Sun, 11 Jun 2023 15:08:22 +0900 Subject: [PATCH 313/589] Update configs for Neovim 0.9 --- home-manager/nvim/init.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 72764b1..327b0cf 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -41,7 +41,7 @@ local autocmds = { event = 'BufWritePre', config = { group = vim.api.nvim_create_augroup('fmt', {}), - callback = vim.lsp.buf.formatting_sync + callback = vim.lsp.buf.format } }, { @@ -49,7 +49,9 @@ local autocmds = { config = { group = vim.api.nvim_create_augroup('diagnostics_hover', {}), callback = function() - vim.diagnostic.open_float({ focusable = false }) + if not vim.diagnostic.is_disabled() then + vim.diagnostic.open_float({ focusable = false }) + end end } } -- 2.51.2 From 7d072cda3590c1a36b94c34d56d4e60bd1a927b2 Mon Sep 17 00:00:00 2001 From: Akimon658 Date: Wed, 6 Mar 2024 10:36:27 +0900 Subject: [PATCH 314/589] Update plugins --- home-manager/nvim/lazy-lock.json | 61 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 3c166cc..176fa78 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,32 +1,31 @@ -{ - "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, - "barbar.nvim": { "branch": "master", "commit": "b8ca6076f75e49cca1fa0288c080f3d10ec2152c" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "firenvim": { "branch": "master", "commit": "a96710eaf6e6c2de78341c32d8dc7b39727ad54c" }, - "indent-blankline.nvim": { "branch": "master", "commit": "ceaf730b13e332cd76600d9795722413c236c684" }, - "lazy.nvim": { "branch": "main", "commit": "6b2311a46a3808e366bb251270f4cc04afb421ed" }, - "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa" }, - "neogit": { "branch": "master", "commit": "68a3e90e9d1ed9e362317817851d0f34b19e426b" }, - "noice.nvim": { "branch": "main", "commit": "a070cb87a180fd7e2c4387accff0be90268fb736" }, - "nui.nvim": { "branch": "main", "commit": "7a524120a7a70761b5a65b602fd235a65cb005aa" }, - "nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, - "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, - "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-scrollview": { "branch": "main", "commit": "c4921541d7ba5fe197dbbd60b1f62cc390a6b300" }, - "nvim-surround": { "branch": "main", "commit": "211eaad7c6d01ef4ac02cba9052b3082ec232101" }, - "nvim-treesitter": { "branch": "master", "commit": "cc360a9beb1b30d172438f640e2c3450358c4086" }, - "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, - "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, - "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, - "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, - "trouble.nvim": { "branch": "main", "commit": "a0f2375117c546fbba217efcfff202553eaed1b8" }, - "vscode.nvim": { "branch": "main", "commit": "3ae7e188f0b58b29bc1b5d3698e47ce54f51caf9" } +{ + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" }, + "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, + "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, + "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "459c60317cc1d251f6eb3b6f010d015d5d24b806" }, + "neogit": { "branch": "master", "commit": "72824006f2dcf775cc498cc4a046ddd2c99d20a3" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, + "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, + "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, + "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, + "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" }, + "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, + "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "vscode.nvim": { "branch": "main", "commit": "2f248dceb66b5706b98ee86370eb7673862a3903" } } \ No newline at end of file -- 2.51.2 From 0873ec7435fbcdbe0e09403610d97829a3473309 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 6 Mar 2024 15:48:04 +0900 Subject: [PATCH 315/589] Update Neogit --- home-manager/nvim/lazy-lock.json | 2 +- home-manager/nvim/lua/plugins/neogit.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 176fa78..5ac5daa 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -12,7 +12,7 @@ "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "459c60317cc1d251f6eb3b6f010d015d5d24b806" }, - "neogit": { "branch": "master", "commit": "72824006f2dcf775cc498cc4a046ddd2c99d20a3" }, + "neogit": { "branch": "master", "commit": "9c5b1392f22203c1ea082ad42f2c97f3ca6b5de1" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, diff --git a/home-manager/nvim/lua/plugins/neogit.lua b/home-manager/nvim/lua/plugins/neogit.lua index 1f4bd60..582293f 100644 --- a/home-manager/nvim/lua/plugins/neogit.lua +++ b/home-manager/nvim/lua/plugins/neogit.lua @@ -1,6 +1,6 @@ ---@type LazyPluginSpec local neogit = { - 'TimUntersberger/neogit', + 'NeogitOrg/neogit', config = function() require('neogit').setup({ disable_commit_confirmation = true -- 2.51.2 From 1e083efcac91c39b9a847002a824928b71990949 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 6 Mar 2024 16:01:46 +0900 Subject: [PATCH 316/589] Update indent-blankline config --- home-manager/nvim/lua/plugins/indent-blankline.lua | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/home-manager/nvim/lua/plugins/indent-blankline.lua b/home-manager/nvim/lua/plugins/indent-blankline.lua index 2adf91f..fa02b84 100644 --- a/home-manager/nvim/lua/plugins/indent-blankline.lua +++ b/home-manager/nvim/lua/plugins/indent-blankline.lua @@ -5,18 +5,16 @@ local indent_blankline = { 'lukas-reineke/indent-blankline.nvim', config = function() local link_to_non_text = { link = 'NonText' } - vim.api.nvim_set_hl(0, 'IndentBlanklineChar', link_to_non_text) - vim.api.nvim_set_hl(0, 'IndentBlanklineContextChar', { fg = '#dcdcaa' }) - vim.api.nvim_set_hl(0, 'IndentBlanklineSpaceChar', link_to_non_text) - require('indent_blankline').setup({ - show_current_context = true - }) + vim.api.nvim_set_hl(0, 'IblIndent', link_to_non_text) + vim.api.nvim_set_hl(0, 'IblScope', { fg = '#dcdcaa' }) + vim.api.nvim_set_hl(0, 'IblWhitespace', link_to_non_text) end, dependencies = { require('plugins.treesitter') }, event = { event.buf_new_file, event.buf_read_pre - } + }, + main = 'ibl', } return indent_blankline -- 2.51.2 From a046014a88365bb0a67eb211aba1ce3b4f80203a Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 6 Mar 2024 16:03:11 +0900 Subject: [PATCH 317/589] Add nimls --- home-manager/nvim/lua/plugins/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 7b06c20..6113af2 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -23,6 +23,7 @@ local lspconfig = { 'gopls', 'jsonls', 'lemminx', + 'nimls', 'pylsp', 'sumneko_lua', 'yamlls', -- 2.51.2 From 354ce97087c535e792d8cf2f80ce0020f81bb21d Mon Sep 17 00:00:00 2001 From: akimon658 Date: Wed, 6 Mar 2024 16:43:01 +0900 Subject: [PATCH 318/589] Rename `sumneko_lua` to `lua_ls` --- home-manager/nvim/lua/plugins/lspconfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 6113af2..5fd5d39 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -23,9 +23,9 @@ local lspconfig = { 'gopls', 'jsonls', 'lemminx', + 'lua_ls', 'nimls', 'pylsp', - 'sumneko_lua', 'yamlls', tsserver } -- 2.51.2 From 495923b3f24f2c31484a8492cb509703b623137d Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 7 Mar 2024 11:04:34 +0900 Subject: [PATCH 319/589] Update neo-tree setting --- home-manager/nvim/lua/plugins/neo-tree.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/neo-tree.lua b/home-manager/nvim/lua/plugins/neo-tree.lua index 05b9516..4a71e22 100644 --- a/home-manager/nvim/lua/plugins/neo-tree.lua +++ b/home-manager/nvim/lua/plugins/neo-tree.lua @@ -8,7 +8,7 @@ local neo_tree = { close_if_last_window = true, filesystem = { filtered_items = { visible = true }, - follow_current_file = true, + follow_current_file = { enabled = true }, use_libuv_file_watcher = true }, view = { relativenumber = true }, -- 2.51.2 From 7ea1c15bd98735a14a0530dea2e2d861c730c886 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 7 Mar 2024 11:47:24 +0900 Subject: [PATCH 320/589] Stop using loop to set autocmd patterns --- home-manager/nvim/init.lua | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 327b0cf..7f5fd21 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -35,14 +35,17 @@ require('lazy').setup('plugins', { ---@field event string ---@field config autoCmdConfig +local any_pattern = { '*' } + ---@type autoCmd[] local autocmds = { { event = 'BufWritePre', config = { group = vim.api.nvim_create_augroup('fmt', {}), - callback = vim.lsp.buf.format - } + callback = vim.lsp.buf.format, + pattern = any_pattern, + }, }, { event = 'CursorHold', @@ -52,9 +55,10 @@ local autocmds = { if not vim.diagnostic.is_disabled() then vim.diagnostic.open_float({ focusable = false }) end - end - } - } + end, + pattern = any_pattern, + }, + }, } local uname = vim.loop.os_uname() @@ -71,16 +75,14 @@ if is_windows or is_wsl then group = vim.api.nvim_create_augroup('disable_ime', {}), callback = function() os.execute('zenhan.exe 0') - end - } + end, + pattern = any_pattern, + }, } table.insert(autocmds, disable_ime) end for _, autocmd in ipairs(autocmds) do - if autocmd.config.pattern == nil then - autocmd.config.pattern = { '*' } - end vim.api.nvim_create_autocmd(autocmd.event, autocmd.config) end -- 2.51.2 From 94f475905bfab332b005d9fe68b00d5c501b2397 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 7 Mar 2024 12:31:53 +0900 Subject: [PATCH 321/589] Use `filter` option for `vim.lsp.buf.format` --- home-manager/nvim/init.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 7f5fd21..8aaef3a 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -43,7 +43,13 @@ local autocmds = { event = 'BufWritePre', config = { group = vim.api.nvim_create_augroup('fmt', {}), - callback = vim.lsp.buf.format, + callback = function() + vim.lsp.buf.format { + filter = function(client) + return client.server_capabilities.documentFormattingProvider ~= nil + end + } + end, pattern = any_pattern, }, }, -- 2.51.2 From e4a954d6ccb01f770040f31a34670e4ae0e2eee8 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Thu, 7 Mar 2024 16:38:22 +0900 Subject: [PATCH 322/589] Add colorscheme to deps of lualine and nvim-notify --- home-manager/nvim/lua/plugins/lualine.lua | 5 ++++- home-manager/nvim/lua/plugins/noice.lua | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 455a51e..77830d2 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -2,7 +2,10 @@ local lualine = { 'nvim-lualine/lualine.nvim', config = true, - dependencies = { require('plugins.devicons') } + dependencies = { + require 'plugins.devicons', + require 'plugins.vscode', + }, } return lualine diff --git a/home-manager/nvim/lua/plugins/noice.lua b/home-manager/nvim/lua/plugins/noice.lua index e4f2653..86e7f70 100644 --- a/home-manager/nvim/lua/plugins/noice.lua +++ b/home-manager/nvim/lua/plugins/noice.lua @@ -8,7 +8,8 @@ local noice = { 'rcarriga/nvim-notify', config = function() require('notify').setup({ stages = 'static' }) - end + end, + dependencies = { require 'plugins.vscode' }, }, require('plugins.nui'), require('plugins.treesitter') -- 2.51.2 From 9e63c97856a74a77537e134faa19dcfa04437285 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 24 Mar 2024 15:49:47 +0900 Subject: [PATCH 323/589] Update plugins --- home-manager/nvim/lazy-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 5ac5daa..938d79d 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,21 +1,21 @@ { "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "lazy.nvim": { "branch": "main", "commit": "af6afefbb46ab29a8a1db69536b04290a9403876" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, + "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "459c60317cc1d251f6eb3b6f010d015d5d24b806" }, - "neogit": { "branch": "master", "commit": "9c5b1392f22203c1ea082ad42f2c97f3ca6b5de1" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "8afbb06081ce1e4beb5b18945d14a608b10babeb" }, + "neogit": { "branch": "master", "commit": "20ab5a688c2de6fa371865528c737ae901989aa5" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, + "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, @@ -25,7 +25,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vscode.nvim": { "branch": "main", "commit": "2f248dceb66b5706b98ee86370eb7673862a3903" } + "vscode.nvim": { "branch": "main", "commit": "d7a8ad9806eaba47f20bab71df2b3f2c39784645" } } \ No newline at end of file -- 2.51.2 From 11cc3c5378b38f46c4271c6525de0c808d6e96f2 Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 24 Mar 2024 18:33:38 +0900 Subject: [PATCH 324/589] Delete firenvim --- home-manager/nvim/lua/plugins/barbar.lua | 1 - home-manager/nvim/lua/plugins/firenvim.lua | 51 ---------------------- home-manager/nvim/lua/plugins/noice.lua | 1 - 3 files changed, 53 deletions(-) delete mode 100644 home-manager/nvim/lua/plugins/firenvim.lua diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua index e2162a2..9fff27f 100644 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -37,7 +37,6 @@ end ---@type LazyPluginSpec local barbar = { 'romgrk/barbar.nvim', - cond = not vim.g.started_by_firenvim, dependencies = { require('plugins.devicons') }, event = { event.buf_new_file, diff --git a/home-manager/nvim/lua/plugins/firenvim.lua b/home-manager/nvim/lua/plugins/firenvim.lua deleted file mode 100644 index 9547e79..0000000 --- a/home-manager/nvim/lua/plugins/firenvim.lua +++ /dev/null @@ -1,51 +0,0 @@ ----@type LazyPluginSpec -local firenvim = { - 'glacambre/firenvim', - build = function() - require('lazy').load({ - plugins = 'firenvim', - wait = true - }) - vim.fn['firenvim#install'](0) - end, - cond = not not vim.g.started_by_firenvim, - config = function() - ---@class filetypeConfig - ---@field pattern string - ---@field ft string - - ---@type filetypeConfig[] - local configs = { - { - pattern = 'github.com_*', - ft = 'markdown' - }, - { - pattern = 'go.dev_*', - ft = 'go' - } - } - - for i in ipairs(configs) do - vim.api.nvim_create_autocmd('BufEnter', { - pattern = string.format('%s.txt', configs[i].pattern), - callback = function() - vim.opt_local.filetype = configs[i].ft - end - }) - end - - vim.g.firenvim_config = { - localSettings = { - [ [[.*]] ] = { takeover = 'never' }, - [ [[github\.com]] ] = { takeover = 'always' }, - [ [[github\.com.*blob]] ] = { takeover = 'never' }, - [ [[go\.dev]] ] = { takeover = 'always' } - } - } - - vim.opt.guifont = 'HackGen Console NF:h11' - end -} - -return firenvim diff --git a/home-manager/nvim/lua/plugins/noice.lua b/home-manager/nvim/lua/plugins/noice.lua index 86e7f70..ccfb923 100644 --- a/home-manager/nvim/lua/plugins/noice.lua +++ b/home-manager/nvim/lua/plugins/noice.lua @@ -1,7 +1,6 @@ ---@type LazyPluginSpec local noice = { 'folke/noice.nvim', - cond = not vim.g.started_by_firenvim, config = true, dependencies = { { -- 2.51.2 From f545d77ce9cc501611acc6fc425e19942958b74d Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 24 Mar 2024 18:37:57 +0900 Subject: [PATCH 325/589] Change the type of keys --- home-manager/nvim/lua/plugins/barbar.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua index 9fff27f..9c01cd1 100644 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -1,6 +1,6 @@ local event = require('vim_event') ----@type LazyKeys[] +---@type LazyKeysSpec[] local keys = { { 'c', -- 2.51.2 From 2eba7386391ad35ca995c9a08485297c4427c43b Mon Sep 17 00:00:00 2001 From: akimon658 Date: Sun, 24 Mar 2024 18:53:55 +0900 Subject: [PATCH 326/589] Specify hex code for scrollview --- home-manager/nvim/lua/plugins/scrollview.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/scrollview.lua b/home-manager/nvim/lua/plugins/scrollview.lua index f2be332..c0c4081 100644 --- a/home-manager/nvim/lua/plugins/scrollview.lua +++ b/home-manager/nvim/lua/plugins/scrollview.lua @@ -4,7 +4,7 @@ local event = require('vim_event') local scrollview = { 'dstein64/nvim-scrollview', config = function() - vim.api.nvim_set_hl(0, 'ScrollView', { link = 'TermCursor' }) + vim.api.nvim_set_hl(0, 'ScrollView', { background = "#666666" }) vim.g.scrollview_column = 1 end, event = { -- 2.51.2 From d4698cd13e30f41f733e2bf7edbbfd23402211de Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 30 Mar 2024 18:44:23 +0900 Subject: [PATCH 327/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 938d79d..b3bf2e5 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -7,13 +7,13 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "af6afefbb46ab29a8a1db69536b04290a9403876" }, + "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "v2.x", "commit": "8afbb06081ce1e4beb5b18945d14a608b10babeb" }, - "neogit": { "branch": "master", "commit": "20ab5a688c2de6fa371865528c737ae901989aa5" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "neo-tree.nvim": { "branch": "main", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" }, + "neogit": { "branch": "master", "commit": "2f2dbbed4920b11f7fb7e3d9b0e1806de1a1503e" }, + "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, @@ -27,5 +27,5 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vscode.nvim": { "branch": "main", "commit": "d7a8ad9806eaba47f20bab71df2b3f2c39784645" } + "vscode.nvim": { "branch": "main", "commit": "4fe3e696a90f183d4dbbb432ddb79155c6d4c99b" } } \ No newline at end of file -- 2.51.2 From 2dccb1ed8e893a706468ca4e110a20e23f1c1886 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 30 Mar 2024 18:45:23 +0900 Subject: [PATCH 328/589] Disable IME on Mac --- home-manager/nvim/init.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 8aaef3a..31db6c5 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -72,15 +72,23 @@ local uname = vim.loop.os_uname() local sysname = uname.sysname local is_windows = sysname == 'Windows_NT' local is_wsl = sysname == 'Linux' and string.find(uname.release, 'microsoft') ~= nil +local is_mac = sysname == "Darwin" +local im_disable_cmd = "" if is_windows or is_wsl then + im_disable_cmd = "zenhan.exe 0" +elseif is_mac then + im_disable_cmd = "osascript -e 'tell application \"System Events\" to key code 102'" +end + +if im_disable_cmd ~= "" then ---@type autoCmd local disable_ime = { event = 'InsertLeave', config = { group = vim.api.nvim_create_augroup('disable_ime', {}), callback = function() - os.execute('zenhan.exe 0') + os.execute(im_disable_cmd) end, pattern = any_pattern, }, -- 2.51.2 From 38a304e2b531514bc61f7e140e546d5413805cd0 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sun, 31 Mar 2024 18:49:09 +0900 Subject: [PATCH 329/589] Don't show icon for deleted files on neo-tree --- home-manager/nvim/lua/plugins/neo-tree.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lua/plugins/neo-tree.lua b/home-manager/nvim/lua/plugins/neo-tree.lua index 4a71e22..c35cbd0 100644 --- a/home-manager/nvim/lua/plugins/neo-tree.lua +++ b/home-manager/nvim/lua/plugins/neo-tree.lua @@ -4,21 +4,28 @@ local neo_tree = { config = function() vim.g.neo_tree_remove_legacy_commands = 1 - require('neo-tree').setup({ + require('neo-tree').setup { close_if_last_window = true, + default_component_configs = { + git_status = { + symbols = { + deleted = "" + }, + }, + }, filesystem = { filtered_items = { visible = true }, follow_current_file = { enabled = true }, use_libuv_file_watcher = true }, view = { relativenumber = true }, - window = { width = 30 } - }) + window = { width = 30 }, + } end, dependencies = { require('plugins.devicons'), require('plugins.nui'), - require('plugins.plenary') + require('plugins.plenary'), }, keys = { { '', -- 2.51.2 From 85efe98af46385d817661a6eb4dfbb8b07b47169 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sun, 31 Mar 2024 20:04:47 +0900 Subject: [PATCH 330/589] Add Lua formatter configs and format files --- home-manager/nvim/after/ftplugin/markdown.lua | 2 +- home-manager/nvim/after/ftplugin/text.lua | 2 +- home-manager/nvim/init.lua | 90 +++++++++---------- home-manager/nvim/lua/plugins/autopairs.lua | 44 ++++----- home-manager/nvim/lua/plugins/barbar.lua | 40 ++++----- home-manager/nvim/lua/plugins/cmp.lua | 74 +++++++-------- home-manager/nvim/lua/plugins/devicons.lua | 4 +- .../nvim/lua/plugins/indent-blankline.lua | 18 ++-- home-manager/nvim/lua/plugins/lspconfig.lua | 78 ++++++++-------- home-manager/nvim/lua/plugins/lualine.lua | 6 +- home-manager/nvim/lua/plugins/mkdir.lua | 4 +- home-manager/nvim/lua/plugins/neo-tree.lua | 22 ++--- home-manager/nvim/lua/plugins/neogit.lua | 18 ++-- home-manager/nvim/lua/plugins/noice.lua | 14 +-- home-manager/nvim/lua/plugins/nui.lua | 4 +- home-manager/nvim/lua/plugins/plenary.lua | 4 +- home-manager/nvim/lua/plugins/scrollview.lua | 10 +-- home-manager/nvim/lua/plugins/surround.lua | 8 +- home-manager/nvim/lua/plugins/telescope.lua | 72 +++++++-------- home-manager/nvim/lua/plugins/treesitter.lua | 26 +++--- home-manager/nvim/lua/plugins/trouble.lua | 12 +-- home-manager/nvim/lua/plugins/vscode.lua | 8 +- home-manager/nvim/lua/vim_event/init.lua | 8 +- 23 files changed, 284 insertions(+), 284 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/markdown.lua b/home-manager/nvim/after/ftplugin/markdown.lua index 30a4921..a920bb8 100644 --- a/home-manager/nvim/after/ftplugin/markdown.lua +++ b/home-manager/nvim/after/ftplugin/markdown.lua @@ -1 +1 @@ -require('ftbase.text') +require "ftbase.text" diff --git a/home-manager/nvim/after/ftplugin/text.lua b/home-manager/nvim/after/ftplugin/text.lua index 30a4921..a920bb8 100644 --- a/home-manager/nvim/after/ftplugin/text.lua +++ b/home-manager/nvim/after/ftplugin/text.lua @@ -1 +1 @@ -require('ftbase.text') +require "ftbase.text" diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 31db6c5..f2b3576 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -1,29 +1,29 @@ -vim.g.mapleader = ' ' +vim.g.mapleader = " " ---@type string -local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' +local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - os.execute('git clone --filter=blob:none https://github.com/folke/lazy.nvim.git --branch=stable ' .. lazypath) + os.execute("git clone --filter=blob:none https://github.com/folke/lazy.nvim.git --branch=stable " .. lazypath) end vim.opt.rtp:prepend(lazypath) -require('lazy').setup('plugins', { +require "lazy".setup("plugins", { checker = { enabled = true }, defaults = { - version = '*' + version = "*", }, performance = { rtp = { disabled_plugins = { - 'gzip', - 'netrwPlugin', - 'tarPlugin', - 'tohtml', - 'tutor', - 'zipPlugin' - } - } - } + "gzip", + "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, }) ---@class autoCmdConfig @@ -35,31 +35,31 @@ require('lazy').setup('plugins', { ---@field event string ---@field config autoCmdConfig -local any_pattern = { '*' } +local any_pattern = { "*" } ---@type autoCmd[] local autocmds = { { - event = 'BufWritePre', + event = "BufWritePre", config = { - group = vim.api.nvim_create_augroup('fmt', {}), + group = vim.api.nvim_create_augroup("fmt", {}), callback = function() vim.lsp.buf.format { filter = function(client) return client.server_capabilities.documentFormattingProvider ~= nil - end + end, } end, pattern = any_pattern, }, }, { - event = 'CursorHold', + event = "CursorHold", config = { - group = vim.api.nvim_create_augroup('diagnostics_hover', {}), + group = vim.api.nvim_create_augroup("diagnostics_hover", {}), callback = function() if not vim.diagnostic.is_disabled() then - vim.diagnostic.open_float({ focusable = false }) + vim.diagnostic.open_float { focusable = false } end end, pattern = any_pattern, @@ -70,8 +70,8 @@ local autocmds = { local uname = vim.loop.os_uname() ---@type string local sysname = uname.sysname -local is_windows = sysname == 'Windows_NT' -local is_wsl = sysname == 'Linux' and string.find(uname.release, 'microsoft') ~= nil +local is_windows = sysname == "Windows_NT" +local is_wsl = sysname == "Linux" and string.find(uname.release, "microsoft") ~= nil local is_mac = sysname == "Darwin" local im_disable_cmd = "" @@ -84,9 +84,9 @@ end if im_disable_cmd ~= "" then ---@type autoCmd local disable_ime = { - event = 'InsertLeave', + event = "InsertLeave", config = { - group = vim.api.nvim_create_augroup('disable_ime', {}), + group = vim.api.nvim_create_augroup("disable_ime", {}), callback = function() os.execute(im_disable_cmd) end, @@ -100,7 +100,7 @@ for _, autocmd in ipairs(autocmds) do vim.api.nvim_create_autocmd(autocmd.event, autocmd.config) end -vim.diagnostic.config({ virtual_text = false }) +vim.diagnostic.config { virtual_text = false } ---@class sign ---@field msg_type string @@ -109,52 +109,52 @@ vim.diagnostic.config({ virtual_text = false }) ---@type sign[] local signs = { { - msg_type = 'Error', - icon = '' + msg_type = "Error", + icon = "", }, { - msg_type = 'Warn', - icon = '' + msg_type = "Warn", + icon = "", }, { - msg_type = 'Hint', - icon = '' + msg_type = "Hint", + icon = "", }, { - msg_type = 'Info', - icon = '' - } + msg_type = "Info", + icon = "", + }, } for _, sign in ipairs(signs) do - local hl = 'DiagnosticSign' .. sign.msg_type + local hl = "DiagnosticSign" .. sign.msg_type vim.fn.sign_define(hl, { text = sign.icon, numhl = hl, - texthl = hl + texthl = hl, }) end vim.opt.cmdheight = 0 vim.opt.expandtab = true -vim.opt.fileformats = { 'unix', 'dos' } +vim.opt.fileformats = { "unix", "dos" } vim.opt.list = true vim.opt.listchars = { - eol = '↲', - space = '・', - tab = ' ' + eol = "↲", + space = "・", + tab = " ", } vim.opt.number = true vim.opt.updatetime = 1000 vim.opt.relativenumber = true vim.opt.shiftwidth = 2 -vim.opt.signcolumn = 'yes' +vim.opt.signcolumn = "yes" vim.opt.splitright = true vim.opt.tabstop = 4 vim.opt.wrap = false if is_windows then - vim.opt.shell = 'pwsh -NoLogo' - vim.opt.shellcmdflag = '-Command' - vim.opt.shellxquote = '' + vim.opt.shell = "pwsh -NoLogo" + vim.opt.shellcmdflag = "-Command" + vim.opt.shellxquote = "" end diff --git a/home-manager/nvim/lua/plugins/autopairs.lua b/home-manager/nvim/lua/plugins/autopairs.lua index 204823d..f019fe4 100644 --- a/home-manager/nvim/lua/plugins/autopairs.lua +++ b/home-manager/nvim/lua/plugins/autopairs.lua @@ -1,48 +1,48 @@ -local event = require('vim_event') +local event = require "vim_event" ---@type LazyPluginSpec local autopairs = { - 'windwp/nvim-autopairs', + "windwp/nvim-autopairs", config = function() - local npairs = require('nvim-autopairs') - local rule = require('nvim-autopairs.rule') + local npairs = require "nvim-autopairs" + local rule = require "nvim-autopairs.rule" local brackets = { - { '(', ')' }, - { '{', '}' }, - { '[', ']' } + { "(", ")" }, + { "{", "}" }, + { "[", "]" }, } - npairs.setup({ - map_c_h = true - }) + npairs.setup { + map_c_h = true, + } -- https://github.com/windwp/nvim-autopairs/wiki/Custom-rules#add-spaces-between-parentheses - npairs.add_rules({ - rule(' ', ' '):with_pair(function(opts) + npairs.add_rules { + rule(" ", " "):with_pair(function(opts) local pair = opts.line:sub(opts.col - 1, opts.col) return vim.tbl_contains({ brackets[1][1] .. brackets[1][2], brackets[2][1] .. brackets[2][2], - brackets[3][1] .. brackets[3][2] + brackets[3][1] .. brackets[3][2], }, pair) - end) - }) + end), + } for _, bracket in ipairs(brackets) do - npairs.add_rules({ - rule(bracket[1] .. ' ', ' ' .. bracket[2]) + npairs.add_rules { + rule(bracket[1] .. " ", " " .. bracket[2]) :with_pair(function() return false end) :with_move(function(opts) - return opts.prev_char:match('.%' .. bracket[2]) ~= nil + return opts.prev_char:match(".%" .. bracket[2]) ~= nil end) - :use_key(bracket[2]) - }) + :use_key(bracket[2]), + } end end, event = { event.buf_new_file, - event.buf_read_post - } + event.buf_read_post, + }, } return autopairs diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua index 9c01cd1..b3a89da 100644 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -1,48 +1,48 @@ -local event = require('vim_event') +local event = require "vim_event" ---@type LazyKeysSpec[] local keys = { { - 'c', - 'BufferClose' + "c", + "BufferClose", }, { - '.', - 'BufferNext' + ".", + "BufferNext", }, { - ',', - 'BufferPrevious' + ",", + "BufferPrevious", }, { - '>', - 'BufferMoveNext' + ">", + "BufferMoveNext", }, { - '<', - 'BufferMovePrevious' + "<", + "BufferMovePrevious", }, { - 't0', - 'BufferLast' - } + "t0", + "BufferLast", + }, } for i = 1, 9 do table.insert(keys, { - string.format('t%d', i), - string.format('BufferGoto %d', i) + string.format("t%d", i), + string.format("BufferGoto %d", i), }) end ---@type LazyPluginSpec local barbar = { - 'romgrk/barbar.nvim', - dependencies = { require('plugins.devicons') }, + "romgrk/barbar.nvim", + dependencies = { require "plugins.devicons" }, event = { event.buf_new_file, - event.buf_read_pre + event.buf_read_pre, }, - keys = keys + keys = keys, } return barbar diff --git a/home-manager/nvim/lua/plugins/cmp.lua b/home-manager/nvim/lua/plugins/cmp.lua index c2a8862..db5a76a 100644 --- a/home-manager/nvim/lua/plugins/cmp.lua +++ b/home-manager/nvim/lua/plugins/cmp.lua @@ -1,20 +1,20 @@ ---@type LazyPluginSpec local cmp = { - 'hrsh7th/nvim-cmp', + "hrsh7th/nvim-cmp", config = function() - local cmp = require('cmp') - local luasnip = require('luasnip') + local cmp = require "cmp" + local luasnip = require "luasnip" ---@return boolean local function has_words_before() local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil end local bordered_window = cmp.config.window.bordered() - cmp.setup({ - formatting = { format = require('lspkind').cmp_format() }, + cmp.setup { + formatting = { format = require "lspkind".cmp_format() }, mapping = { - [''] = cmp.mapping(function(fallback) + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif luasnip.expand_or_jumpable() then @@ -24,8 +24,8 @@ local cmp = { else fallback() end - end, { 'i', 's' }), - [''] = cmp.mapping(function(fallback) + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() elseif luasnip.jumpable(-1) then @@ -33,54 +33,54 @@ local cmp = { else fallback() end - end, { 'i', 's' }), - [''] = cmp.mapping.confirm { - select = true - } + end, { "i", "s" }), + [""] = cmp.mapping.confirm { + select = true, + }, }, snippet = { expand = function(args) luasnip.lsp_expand(args.body) - end + end, }, sources = { - { name = 'luasnip' }, - { name = 'nvim_lsp' }, - { name = 'nvim_lua' }, - { name = 'path' } + { name = "luasnip" }, + { name = "nvim_lsp" }, + { name = "nvim_lua" }, + { name = "path" }, }, window = { completion = bordered_window, - documentation = bordered_window - } - }) + documentation = bordered_window, + }, + } - cmp.setup.cmdline(':', { + cmp.setup.cmdline(":", { mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = 'cmdline' }, - { name = 'path' } - }) + sources = cmp.config.sources { + { name = "cmdline" }, + { name = "path" }, + }, }) end, dependencies = { - 'hrsh7th/cmp-cmdline', - 'hrsh7th/cmp-nvim-lua', + "hrsh7th/cmp-cmdline", + "hrsh7th/cmp-nvim-lua", { - 'hrsh7th/cmp-nvim-lsp', - dependencies = { require('plugins.lspconfig') } + "hrsh7th/cmp-nvim-lsp", + dependencies = { require "plugins.lspconfig" }, }, - 'hrsh7th/cmp-path', - 'onsails/lspkind.nvim', + "hrsh7th/cmp-path", + "onsails/lspkind.nvim", { - 'saadparwaiz1/cmp_luasnip', - dependencies = { 'L3MON4D3/LuaSnip' } + "saadparwaiz1/cmp_luasnip", + dependencies = { "L3MON4D3/LuaSnip" }, }, }, event = { - 'CmdlineEnter', - require('vim_event').insert_enter - } + "CmdlineEnter", + require "vim_event".insert_enter, + }, } return cmp diff --git a/home-manager/nvim/lua/plugins/devicons.lua b/home-manager/nvim/lua/plugins/devicons.lua index 91bb693..e412c6a 100644 --- a/home-manager/nvim/lua/plugins/devicons.lua +++ b/home-manager/nvim/lua/plugins/devicons.lua @@ -1,7 +1,7 @@ ---@type LazyPluginSpec local devicons = { - 'nvim-tree/nvim-web-devicons', - lazy = true + "nvim-tree/nvim-web-devicons", + lazy = true, } return devicons diff --git a/home-manager/nvim/lua/plugins/indent-blankline.lua b/home-manager/nvim/lua/plugins/indent-blankline.lua index fa02b84..cc28137 100644 --- a/home-manager/nvim/lua/plugins/indent-blankline.lua +++ b/home-manager/nvim/lua/plugins/indent-blankline.lua @@ -1,20 +1,20 @@ -local event = require('vim_event') +local event = require "vim_event" ---@type LazyPluginSpec local indent_blankline = { - 'lukas-reineke/indent-blankline.nvim', + "lukas-reineke/indent-blankline.nvim", config = function() - local link_to_non_text = { link = 'NonText' } - vim.api.nvim_set_hl(0, 'IblIndent', link_to_non_text) - vim.api.nvim_set_hl(0, 'IblScope', { fg = '#dcdcaa' }) - vim.api.nvim_set_hl(0, 'IblWhitespace', link_to_non_text) + local link_to_non_text = { link = "NonText" } + vim.api.nvim_set_hl(0, "IblIndent", link_to_non_text) + vim.api.nvim_set_hl(0, "IblScope", { fg = "#dcdcaa" }) + vim.api.nvim_set_hl(0, "IblWhitespace", link_to_non_text) end, - dependencies = { require('plugins.treesitter') }, + dependencies = { require "plugins.treesitter" }, event = { event.buf_new_file, - event.buf_read_pre + event.buf_read_pre, }, - main = 'ibl', + main = "ibl", } return indent_blankline diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 5fd5d39..d2224cb 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -1,77 +1,77 @@ -local event = require('vim_event') +local event = require "vim_event" ---@type LazyPluginSpec local lspconfig = { - 'neovim/nvim-lspconfig', + "neovim/nvim-lspconfig", config = function() - local lsp_config = require('lspconfig') + local lsp_config = require "lspconfig" - local capabilities = require('cmp_nvim_lsp').default_capabilities() + local capabilities = require "cmp_nvim_lsp".default_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true ---@type boolean - local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. '/deno.json') == 1 + local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. "/deno.json") == 1 ---@type string - local tsserver = use_deno and 'denols' or 'tsserver' + local tsserver = use_deno and "denols" or "tsserver" ---@type string[] local servers = { - 'bashls', - 'clangd', - 'cssls', - 'dockerls', - 'gopls', - 'jsonls', - 'lemminx', - 'lua_ls', - 'nimls', - 'pylsp', - 'yamlls', - tsserver + "bashls", + "clangd", + "cssls", + "dockerls", + "gopls", + "jsonls", + "lemminx", + "lua_ls", + "nimls", + "pylsp", + "yamlls", + tsserver, } - local schemastore = require('schemastore') + local schemastore = require "schemastore" for _, lsp in ipairs(servers) do - lsp_config[lsp].setup({ + lsp_config[lsp].setup { capabilities = capabilities, settings = { json = { schemas = schemastore.json.schemas(), - validate = { enable = true } + validate = { enable = true }, }, - yaml = { keyOrdering = false } - } - }) + yaml = { keyOrdering = false }, + }, + } end - lsp_config.powershell_es.setup({ - bundle_path = 'C:/PowerShellEditorServices', - capabilities = capabilities - }) + lsp_config.powershell_es.setup { + bundle_path = "C:/PowerShellEditorServices", + capabilities = capabilities, + } end, dependencies = { - 'b0o/schemastore.nvim', - 'hrsh7th/cmp-nvim-lsp' + "b0o/schemastore.nvim", + "hrsh7th/cmp-nvim-lsp", }, event = { event.buf_new_file, - event.buf_read_pre + event.buf_read_pre, }, keys = { { - 'h', - vim.lsp.buf.hover + "h", + vim.lsp.buf.hover, }, { - 'rf', - vim.lsp.buf.references + "rf", + vim.lsp.buf.references, }, { - 'rn', - vim.lsp.buf.rename - } - } + "rn", + vim.lsp.buf.rename, + }, + }, } return lspconfig diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 77830d2..660b31e 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -1,10 +1,10 @@ ---@type LazyPluginSpec local lualine = { - 'nvim-lualine/lualine.nvim', + "nvim-lualine/lualine.nvim", config = true, dependencies = { - require 'plugins.devicons', - require 'plugins.vscode', + require "plugins.devicons", + require "plugins.vscode", }, } diff --git a/home-manager/nvim/lua/plugins/mkdir.lua b/home-manager/nvim/lua/plugins/mkdir.lua index e6b61e8..01c54d9 100644 --- a/home-manager/nvim/lua/plugins/mkdir.lua +++ b/home-manager/nvim/lua/plugins/mkdir.lua @@ -1,7 +1,7 @@ ---@type LazyPluginSpec local mkdir = { - 'jghauser/mkdir.nvim', - event = require('vim_event').buf_new_file + "jghauser/mkdir.nvim", + event = require "vim_event".buf_new_file, } return mkdir diff --git a/home-manager/nvim/lua/plugins/neo-tree.lua b/home-manager/nvim/lua/plugins/neo-tree.lua index c35cbd0..99d3174 100644 --- a/home-manager/nvim/lua/plugins/neo-tree.lua +++ b/home-manager/nvim/lua/plugins/neo-tree.lua @@ -1,38 +1,38 @@ ---@type LazyPluginSpec local neo_tree = { - 'nvim-neo-tree/neo-tree.nvim', + "nvim-neo-tree/neo-tree.nvim", config = function() vim.g.neo_tree_remove_legacy_commands = 1 - require('neo-tree').setup { + require "neo-tree".setup { close_if_last_window = true, default_component_configs = { git_status = { symbols = { - deleted = "" + deleted = "", }, }, }, filesystem = { filtered_items = { visible = true }, follow_current_file = { enabled = true }, - use_libuv_file_watcher = true + use_libuv_file_watcher = true, }, view = { relativenumber = true }, window = { width = 30 }, } end, dependencies = { - require('plugins.devicons'), - require('plugins.nui'), - require('plugins.plenary'), + require "plugins.devicons", + require "plugins.nui", + require "plugins.plenary", }, keys = { { - '', + "", function() - require('neo-tree.command')._command('toggle') - end - } } + require "neo-tree.command"._command "toggle" + end, + } }, } return neo_tree diff --git a/home-manager/nvim/lua/plugins/neogit.lua b/home-manager/nvim/lua/plugins/neogit.lua index 582293f..c97e266 100644 --- a/home-manager/nvim/lua/plugins/neogit.lua +++ b/home-manager/nvim/lua/plugins/neogit.lua @@ -1,18 +1,18 @@ ---@type LazyPluginSpec local neogit = { - 'NeogitOrg/neogit', + "NeogitOrg/neogit", config = function() - require('neogit').setup({ - disable_commit_confirmation = true - }) + require "neogit".setup { + disable_commit_confirmation = true, + } end, - dependencies = { require('plugins.plenary') }, + dependencies = { require "plugins.plenary" }, keys = { { - '', + "", function() - require('neogit').open() - end - } } + require "neogit".open() + end, + } }, } return neogit diff --git a/home-manager/nvim/lua/plugins/noice.lua b/home-manager/nvim/lua/plugins/noice.lua index ccfb923..5d39a92 100644 --- a/home-manager/nvim/lua/plugins/noice.lua +++ b/home-manager/nvim/lua/plugins/noice.lua @@ -1,17 +1,17 @@ ---@type LazyPluginSpec local noice = { - 'folke/noice.nvim', + "folke/noice.nvim", config = true, dependencies = { { - 'rcarriga/nvim-notify', + "rcarriga/nvim-notify", config = function() - require('notify').setup({ stages = 'static' }) + require "notify".setup { stages = "static" } end, - dependencies = { require 'plugins.vscode' }, + dependencies = { require "plugins.vscode" }, }, - require('plugins.nui'), - require('plugins.treesitter') - } + require "plugins.nui", + require "plugins.treesitter", + }, } return noice diff --git a/home-manager/nvim/lua/plugins/nui.lua b/home-manager/nvim/lua/plugins/nui.lua index 9d95a66..df46b8a 100644 --- a/home-manager/nvim/lua/plugins/nui.lua +++ b/home-manager/nvim/lua/plugins/nui.lua @@ -1,7 +1,7 @@ ---@type LazyPluginSpec local nui = { - 'MunifTanjim/nui.nvim', - lazy = true + "MunifTanjim/nui.nvim", + lazy = true, } return nui diff --git a/home-manager/nvim/lua/plugins/plenary.lua b/home-manager/nvim/lua/plugins/plenary.lua index 595eafc..11f5aa5 100644 --- a/home-manager/nvim/lua/plugins/plenary.lua +++ b/home-manager/nvim/lua/plugins/plenary.lua @@ -1,7 +1,7 @@ ---@type LazyPluginSpec local plenary = { - 'nvim-lua/plenary.nvim', - lazy = true + "nvim-lua/plenary.nvim", + lazy = true, } return plenary diff --git a/home-manager/nvim/lua/plugins/scrollview.lua b/home-manager/nvim/lua/plugins/scrollview.lua index c0c4081..2293193 100644 --- a/home-manager/nvim/lua/plugins/scrollview.lua +++ b/home-manager/nvim/lua/plugins/scrollview.lua @@ -1,16 +1,16 @@ -local event = require('vim_event') +local event = require "vim_event" ---@type LazyPluginSpec local scrollview = { - 'dstein64/nvim-scrollview', + "dstein64/nvim-scrollview", config = function() - vim.api.nvim_set_hl(0, 'ScrollView', { background = "#666666" }) + vim.api.nvim_set_hl(0, "ScrollView", { background = "#666666" }) vim.g.scrollview_column = 1 end, event = { event.buf_new_file, - event.buf_read_pre - } + event.buf_read_pre, + }, } return scrollview diff --git a/home-manager/nvim/lua/plugins/surround.lua b/home-manager/nvim/lua/plugins/surround.lua index fb9767a..79cea62 100644 --- a/home-manager/nvim/lua/plugins/surround.lua +++ b/home-manager/nvim/lua/plugins/surround.lua @@ -1,13 +1,13 @@ -local event = require('vim_event') +local event = require "vim_event" ---@type LazyPluginSpec local surround = { - 'kylechui/nvim-surround', + "kylechui/nvim-surround", config = true, event = { event.buf_new_file, - event.buf_read_post - } + event.buf_read_post, + }, } return surround diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua index 9205912..665d2b9 100644 --- a/home-manager/nvim/lua/plugins/telescope.lua +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -1,78 +1,78 @@ -local builtin = 'telescope.builtin' +local builtin = "telescope.builtin" ---@type LazyPluginSpec local telescope = { - 'nvim-telescope/telescope.nvim', - cmd = 'Telescope', + "nvim-telescope/telescope.nvim", + cmd = "Telescope", config = function() - local args = require('telescope.config').values.vimgrep_arguments + local args = require "telescope.config".values.vimgrep_arguments local additions = { - '--hidden', - '--glob', - '!**/.git/*' + "--hidden", + "--glob", + "!**/.git/*", } for _, v in ipairs(additions) do table.insert(args, v) end - require('telescope').setup({ + require "telescope".setup { defaults = { layout_config = { - prompt_position = 'top', + prompt_position = "top", }, mappings = { i = { - [''] = require('telescope.actions').close - } + [""] = require "telescope.actions".close, + }, }, - prompt_prefix = '  ', - sorting_strategy = 'ascending', - vimgrep_arguments = args + prompt_prefix = "  ", + sorting_strategy = "ascending", + vimgrep_arguments = args, }, pickers = { find_files = { find_command = { - 'rg', - '--files', - '--hidden', - '--glob', - '!**/.git/*' - } - } - } - }) + "rg", + "--files", + "--hidden", + "--glob", + "!**/.git/*", + }, + }, + }, + } end, dependencies = { - require('plugins.devicons'), - require('plugins.plenary'), - require('plugins.treesitter') + require "plugins.devicons", + require "plugins.plenary", + require "plugins.treesitter", }, keys = { { - '', + "", function() require(builtin).current_buffer_fuzzy_find() - end + end, }, { - '', + "", function() require(builtin).find_files() - end + end, }, { - 'f', + "f", function() require(builtin).live_grep() - end + end, }, { - '?', + "?", function() require(builtin).help_tags() - end - } - } + end, + }, + }, } return telescope diff --git a/home-manager/nvim/lua/plugins/treesitter.lua b/home-manager/nvim/lua/plugins/treesitter.lua index 85b89be..8436b76 100644 --- a/home-manager/nvim/lua/plugins/treesitter.lua +++ b/home-manager/nvim/lua/plugins/treesitter.lua @@ -1,30 +1,30 @@ ---@type LazyPluginSpec local treesitter = { - 'nvim-treesitter/nvim-treesitter', + "nvim-treesitter/nvim-treesitter", build = function() - require('nvim-treesitter.install').update({ with_sync = true }) + require "nvim-treesitter.install".update { with_sync = true } end, config = function() - require('nvim-treesitter.configs').setup { + require "nvim-treesitter.configs".setup { auto_install = true, -- For noice.nvim (https://github.com/folke/noice.nvim#%EF%B8%8F-requirements) ensure_installed = { - 'bash', - 'lua', - 'markdown', - 'markdown_inline', - 'regex', - 'vim' + "bash", + "lua", + "markdown", + "markdown_inline", + "regex", + "vim", }, sync_install = true, highlight = { - enable = true - } + enable = true, + }, } - require('nvim-treesitter.install').prefer_git = false + require "nvim-treesitter.install".prefer_git = false end, - event = require('vim_event').buf_read_pre + event = require "vim_event".buf_read_pre, } return treesitter diff --git a/home-manager/nvim/lua/plugins/trouble.lua b/home-manager/nvim/lua/plugins/trouble.lua index b5c9681..09e866a 100644 --- a/home-manager/nvim/lua/plugins/trouble.lua +++ b/home-manager/nvim/lua/plugins/trouble.lua @@ -1,13 +1,13 @@ ---@type LazyPluginSpec local trouble = { - 'folke/trouble.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, + "folke/trouble.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, keys = { { - 'm', + "m", function() - require('trouble').toggle() - end - } } + require "trouble".toggle() + end, + } }, } return trouble diff --git a/home-manager/nvim/lua/plugins/vscode.lua b/home-manager/nvim/lua/plugins/vscode.lua index 665273a..acfd229 100644 --- a/home-manager/nvim/lua/plugins/vscode.lua +++ b/home-manager/nvim/lua/plugins/vscode.lua @@ -1,11 +1,11 @@ ---@type LazyPluginSpec local vscode_plugin = { - 'Mofiqul/vscode.nvim', + "Mofiqul/vscode.nvim", config = function() - local vscode = require('vscode') - vscode.setup({ transparent = true }) + local vscode = require "vscode" + vscode.setup { transparent = true } vscode.load() - end + end, } return vscode_plugin diff --git a/home-manager/nvim/lua/vim_event/init.lua b/home-manager/nvim/lua/vim_event/init.lua index 2191ca5..b81f319 100644 --- a/home-manager/nvim/lua/vim_event/init.lua +++ b/home-manager/nvim/lua/vim_event/init.lua @@ -1,8 +1,8 @@ local M = { - buf_new_file = 'BufNewFile', - buf_read_post = 'BufReadPost', - buf_read_pre = 'BufReadPre', - insert_enter = 'InsertEnter' + buf_new_file = "BufNewFile", + buf_read_post = "BufReadPost", + buf_read_pre = "BufReadPre", + insert_enter = "InsertEnter", } return M -- 2.51.2 From f970fce6ce1a7168cabf9a83e5e6c14a402467ea Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Mon, 1 Apr 2024 15:41:51 +0900 Subject: [PATCH 331/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b3bf2e5..ff2bb67 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -12,7 +12,7 @@ "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "main", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" }, - "neogit": { "branch": "master", "commit": "2f2dbbed4920b11f7fb7e3d9b0e1806de1a1503e" }, + "neogit": { "branch": "master", "commit": "c0b1d4dfc8ba6371857868ca7c4d33954cf002fd" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, -- 2.51.2 From dfdf13aabda6b2db91adfc4ce13a6dfd4c09b3d4 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 13 Apr 2024 18:30:21 +0900 Subject: [PATCH 332/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ff2bb67..d59e71e 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -9,18 +9,18 @@ "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "main", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" }, + "neo-tree.nvim": { "branch": "main", "commit": "c61074acb19102dfc6f21738dcae4d9a494a8959" }, "neogit": { "branch": "master", "commit": "c0b1d4dfc8ba6371857868ca7c4d33954cf002fd" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, + "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, - "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" }, + "nvim-surround": { "branch": "main", "commit": "a4e30d33add8a9743b4f518b3a788b3c8e5def71" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, -- 2.51.2 From bed54eee8728e97ec78a1338612ebf2a5e006c47 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 13 Apr 2024 18:30:58 +0900 Subject: [PATCH 333/589] Add settings for TeX --- home-manager/nvim/init.lua | 13 +++++++++++++ home-manager/nvim/lua/plugins/lspconfig.lua | 10 ++++++++++ 2 files changed, 23 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index f2b3576..4bc0696 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -53,6 +53,19 @@ local autocmds = { pattern = any_pattern, }, }, + { + event = "BufWritePre", + config = { + group = vim.api.nvim_create_augroup("tex_fmt", {}), + callback = function() + local position = vim.fn.getcharpos "." + vim.cmd "silent! execute ':%s/。/./g'" + vim.cmd "silent! execute ':%s/、/,/g'" + vim.fn.setpos(".", position) + end, + pattern = { "*.tex" }, + }, + }, { event = "CursorHold", config = { diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index d2224cb..968312e 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -25,6 +25,7 @@ local lspconfig = { "lemminx", "lua_ls", "nimls", + "texlab", "pylsp", "yamlls", tsserver, @@ -40,6 +41,15 @@ local lspconfig = { schemas = schemastore.json.schemas(), validate = { enable = true }, }, + texlab = { + build = { + args = { + "-synctex=1", + "%f", + }, + onSave = true, + }, + }, yaml = { keyOrdering = false }, }, } -- 2.51.2 From c14ab1615ee2a9b595b9be0fc92f1ec899abb857 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 13 Apr 2024 20:52:50 +0900 Subject: [PATCH 334/589] Use `setcharpos` instead of `setpos` --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 4bc0696..a4a09a2 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -61,7 +61,7 @@ local autocmds = { local position = vim.fn.getcharpos "." vim.cmd "silent! execute ':%s/。/./g'" vim.cmd "silent! execute ':%s/、/,/g'" - vim.fn.setpos(".", position) + vim.fn.setcharpos(".", position) end, pattern = { "*.tex" }, }, -- 2.51.2 From a02d20502574c8054e65ecd625f0bcf517cb7fa3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 13 Apr 2024 21:48:01 +0900 Subject: [PATCH 335/589] Implement string replacement for TeX in Lua --- home-manager/nvim/init.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index a4a09a2..47636bb 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -59,8 +59,16 @@ local autocmds = { group = vim.api.nvim_create_augroup("tex_fmt", {}), callback = function() local position = vim.fn.getcharpos "." - vim.cmd "silent! execute ':%s/。/./g'" - vim.cmd "silent! execute ':%s/、/,/g'" + ---@type integer + local line_count = vim.api.nvim_buf_line_count(0) + ---@type string[] + local buf_lines = vim.api.nvim_buf_get_lines(0, 0, line_count, true) + for i, line in ipairs(buf_lines) do + line = string.gsub(line, "。", ".") + line = string.gsub(line, "、", ",") + buf_lines[i] = line + end + vim.api.nvim_buf_set_lines(0, 0, line_count, true, buf_lines) vim.fn.setcharpos(".", position) end, pattern = { "*.tex" }, -- 2.51.2 From 948d0f5f2c3998a21836b80e4b7624989df53a57 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 20 Apr 2024 22:42:48 +0900 Subject: [PATCH 336/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index d59e71e..8af0ccd 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, @@ -11,8 +11,8 @@ "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "main", "commit": "c61074acb19102dfc6f21738dcae4d9a494a8959" }, - "neogit": { "branch": "master", "commit": "c0b1d4dfc8ba6371857868ca7c4d33954cf002fd" }, + "neo-tree.nvim": { "branch": "main", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, + "neogit": { "branch": "master", "commit": "0cae7abc30cb91d661f28257c331fcb5b5198e31" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, @@ -27,5 +27,5 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vscode.nvim": { "branch": "main", "commit": "4fe3e696a90f183d4dbbb432ddb79155c6d4c99b" } + "vscode.nvim": { "branch": "main", "commit": "d47aab1fbe423bf14275745684205dca08366277" } } \ No newline at end of file -- 2.51.2 From 245de018e16daab4ca2045f16bbfbbb2dc81de8f Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 20 Apr 2024 23:36:17 +0900 Subject: [PATCH 337/589] Symplify init.lua --- home-manager/nvim/after/ftplugin/tex.lua | 23 +++++++ home-manager/nvim/init.lua | 72 +-------------------- home-manager/nvim/lua/plugins/lspconfig.lua | 39 ++++++++++- home-manager/nvim/lua/vim_event/init.lua | 1 + home-manager/nvim/lua/vim_util.lua | 23 +++++++ 5 files changed, 87 insertions(+), 71 deletions(-) create mode 100644 home-manager/nvim/after/ftplugin/tex.lua create mode 100644 home-manager/nvim/lua/vim_util.lua diff --git a/home-manager/nvim/after/ftplugin/tex.lua b/home-manager/nvim/after/ftplugin/tex.lua new file mode 100644 index 0000000..edead35 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/tex.lua @@ -0,0 +1,23 @@ +local util = require "vim_util" + +util.create_autocmd { + event = require "vim_event".buf_write_pre, + config = { + group = util.create_augroup "tex_fmt", + callback = function() + local position = vim.fn.getcharpos "." + ---@type integer + local line_count = vim.api.nvim_buf_line_count(0) + ---@type string[] + local buf_lines = vim.api.nvim_buf_get_lines(0, 0, line_count, true) + for i, line in ipairs(buf_lines) do + line = string.gsub(line, "。", ".") + line = string.gsub(line, "、", ",") + buf_lines[i] = line + end + vim.api.nvim_buf_set_lines(0, 0, line_count, true, buf_lines) + vim.fn.setcharpos(".", position) + end, + pattern = { "*.tex" }, + }, +} diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 47636bb..2ce5b43 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -26,68 +26,6 @@ require "lazy".setup("plugins", { }, }) ----@class autoCmdConfig ----@field group any ----@field pattern string[] ----@field callback function - ----@class autoCmd ----@field event string ----@field config autoCmdConfig - -local any_pattern = { "*" } - ----@type autoCmd[] -local autocmds = { - { - event = "BufWritePre", - config = { - group = vim.api.nvim_create_augroup("fmt", {}), - callback = function() - vim.lsp.buf.format { - filter = function(client) - return client.server_capabilities.documentFormattingProvider ~= nil - end, - } - end, - pattern = any_pattern, - }, - }, - { - event = "BufWritePre", - config = { - group = vim.api.nvim_create_augroup("tex_fmt", {}), - callback = function() - local position = vim.fn.getcharpos "." - ---@type integer - local line_count = vim.api.nvim_buf_line_count(0) - ---@type string[] - local buf_lines = vim.api.nvim_buf_get_lines(0, 0, line_count, true) - for i, line in ipairs(buf_lines) do - line = string.gsub(line, "。", ".") - line = string.gsub(line, "、", ",") - buf_lines[i] = line - end - vim.api.nvim_buf_set_lines(0, 0, line_count, true, buf_lines) - vim.fn.setcharpos(".", position) - end, - pattern = { "*.tex" }, - }, - }, - { - event = "CursorHold", - config = { - group = vim.api.nvim_create_augroup("diagnostics_hover", {}), - callback = function() - if not vim.diagnostic.is_disabled() then - vim.diagnostic.open_float { focusable = false } - end - end, - pattern = any_pattern, - }, - }, -} - local uname = vim.loop.os_uname() ---@type string local sysname = uname.sysname @@ -103,22 +41,16 @@ elseif is_mac then end if im_disable_cmd ~= "" then - ---@type autoCmd - local disable_ime = { + require "vim_util".create_autocmd { event = "InsertLeave", config = { group = vim.api.nvim_create_augroup("disable_ime", {}), callback = function() os.execute(im_disable_cmd) end, - pattern = any_pattern, + pattern = "*", }, } - table.insert(autocmds, disable_ime) -end - -for _, autocmd in ipairs(autocmds) do - vim.api.nvim_create_autocmd(autocmd.event, autocmd.config) end vim.diagnostic.config { virtual_text = false } diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 968312e..09f0bf9 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -4,6 +4,42 @@ local event = require "vim_event" local lspconfig = { "neovim/nvim-lspconfig", config = function() + local any_pattern = "*" + + ---@type autoCmd[] + local autocmds = { + { + event = event.buf_write_pre, + config = { + group = vim.api.nvim_create_augroup("fmt", {}), + callback = function() + vim.lsp.buf.format { + filter = function(client) + return client.server_capabilities.documentFormattingProvider ~= nil + end, + } + end, + pattern = any_pattern, + }, + }, + { + event = "CursorHold", + config = { + group = vim.api.nvim_create_augroup("diagnostics_hover", {}), + callback = function() + if not vim.diagnostic.is_disabled() then + vim.diagnostic.open_float { focusable = false } + end + end, + pattern = any_pattern, + }, + }, + } + + local util = require "vim_util" + for _, autocmd in ipairs(autocmds) do + util.create_autocmd(autocmd) + end local lsp_config = require "lspconfig" local capabilities = require "cmp_nvim_lsp".default_capabilities() @@ -32,13 +68,14 @@ local lspconfig = { } local schemastore = require "schemastore" + local schemas = schemastore.json.schemas() for _, lsp in ipairs(servers) do lsp_config[lsp].setup { capabilities = capabilities, settings = { json = { - schemas = schemastore.json.schemas(), + schemas = schemas, validate = { enable = true }, }, texlab = { diff --git a/home-manager/nvim/lua/vim_event/init.lua b/home-manager/nvim/lua/vim_event/init.lua index b81f319..1b96c33 100644 --- a/home-manager/nvim/lua/vim_event/init.lua +++ b/home-manager/nvim/lua/vim_event/init.lua @@ -2,6 +2,7 @@ local M = { buf_new_file = "BufNewFile", buf_read_post = "BufReadPost", buf_read_pre = "BufReadPre", + buf_write_pre = "BufWritePre", insert_enter = "InsertEnter", } diff --git a/home-manager/nvim/lua/vim_util.lua b/home-manager/nvim/lua/vim_util.lua new file mode 100644 index 0000000..3886905 --- /dev/null +++ b/home-manager/nvim/lua/vim_util.lua @@ -0,0 +1,23 @@ +---@param name string +local function create_augroup(name) + vim.api.nvim_create_augroup(name, {}) +end + +---@class autoCmdConfig +---@field group any +---@field pattern string[]|string +---@field callback function + +---@class autoCmd +---@field event string +---@field config autoCmdConfig + +---@param autocmd autoCmd +local function create_autocmd(autocmd) + vim.api.nvim_create_autocmd(autocmd.event, autocmd.config) +end + +return { + create_augroup = create_augroup, + create_autocmd = create_autocmd, +} -- 2.51.2 From f549a0bcf9c6713eb8348ad876d2a0360121dcfe Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sun, 21 Apr 2024 17:14:26 +0900 Subject: [PATCH 338/589] Enable `chktex.onEdit` --- home-manager/nvim/lua/plugins/lspconfig.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 09f0bf9..292466a 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -86,6 +86,9 @@ local lspconfig = { }, onSave = true, }, + chktex = { + onEdit = true, + }, }, yaml = { keyOrdering = false }, }, -- 2.51.2 From d6d0505ff8f9e459a5c36e6e40e8808457f3fa19 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sun, 21 Apr 2024 17:53:12 +0900 Subject: [PATCH 339/589] Install copilot.lua --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/copilot.lua | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 home-manager/nvim/lua/plugins/copilot.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 8af0ccd..3132a93 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,6 +6,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, diff --git a/home-manager/nvim/lua/plugins/copilot.lua b/home-manager/nvim/lua/plugins/copilot.lua new file mode 100644 index 0000000..73ae774 --- /dev/null +++ b/home-manager/nvim/lua/plugins/copilot.lua @@ -0,0 +1,14 @@ +---@type LazyPluginSpec +local copilot = { + "zbirenbaum/copilot.lua", + config = function() + require "copilot".setup { + suggestion = { + auto_trigger = true, + }, + } + end, + event = require "vim_event".buf_read_post, +} + +return copilot -- 2.51.2 From 213d354edca4f50781121360aa5b5ebf14d31094 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Fri, 26 Apr 2024 23:14:46 +0900 Subject: [PATCH 340/589] Delete platex*.fls files on save --- home-manager/nvim/after/ftplugin/tex.lua | 60 ++++++++++++++++-------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/tex.lua b/home-manager/nvim/after/ftplugin/tex.lua index edead35..3a74ff9 100644 --- a/home-manager/nvim/after/ftplugin/tex.lua +++ b/home-manager/nvim/after/ftplugin/tex.lua @@ -1,23 +1,45 @@ local util = require "vim_util" +local event = require "vim_event" +local pattern_tex = "*.tex" -util.create_autocmd { - event = require "vim_event".buf_write_pre, - config = { - group = util.create_augroup "tex_fmt", - callback = function() - local position = vim.fn.getcharpos "." - ---@type integer - local line_count = vim.api.nvim_buf_line_count(0) - ---@type string[] - local buf_lines = vim.api.nvim_buf_get_lines(0, 0, line_count, true) - for i, line in ipairs(buf_lines) do - line = string.gsub(line, "。", ".") - line = string.gsub(line, "、", ",") - buf_lines[i] = line - end - vim.api.nvim_buf_set_lines(0, 0, line_count, true, buf_lines) - vim.fn.setcharpos(".", position) - end, - pattern = { "*.tex" }, +---@type autoCmd[] +local autocmds = { + { + event = event.buf_write_pre, + config = { + group = util.create_augroup "tex_fmt", + callback = function() + local position = vim.fn.getcharpos "." + ---@type integer + local line_count = vim.api.nvim_buf_line_count(0) + ---@type string[] + local buf_lines = vim.api.nvim_buf_get_lines(0, 0, line_count, true) + for i, line in ipairs(buf_lines) do + line = string.gsub(line, "。", ".") + line = string.gsub(line, "、", ",") + buf_lines[i] = line + end + vim.api.nvim_buf_set_lines(0, 0, line_count, true, buf_lines) + vim.fn.setcharpos(".", position) + end, + pattern = pattern_tex, + }, + }, + { + event = "BufWritePost", + config = { + group = util.create_augroup "tex_clean", + callback = function() + local fls_files = vim.fn.glob("*.fls", false, true) + for _, fls_file in ipairs(fls_files) do + vim.fn.delete(fls_file) + end + end, + pattern = pattern_tex, + }, }, } + +for _, autocmd in ipairs(autocmds) do + util.create_autocmd(autocmd) +end -- 2.51.2 From 51d14811f070ec9e4516aecfe34ae482a14aaa3c Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 27 Apr 2024 11:21:28 +0900 Subject: [PATCH 341/589] Update vscode.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 3132a93..9747004 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -28,5 +28,5 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vscode.nvim": { "branch": "main", "commit": "d47aab1fbe423bf14275745684205dca08366277" } + "vscode.nvim": { "branch": "main", "commit": "bf62428d842ed1fb9c33353be10af40bac51e825" } } \ No newline at end of file -- 2.51.2 From 9a53ab82b1c2ae141844c52983e38a129a97dfdc Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Tue, 30 Apr 2024 15:01:03 +0900 Subject: [PATCH 342/589] Exit terminal mode with --- home-manager/nvim/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 2ce5b43..604ed07 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -88,6 +88,8 @@ for _, sign in ipairs(signs) do }) end +vim.api.nvim_set_keymap("t", "", "", { noremap = true }) + vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.fileformats = { "unix", "dos" } -- 2.51.2 From 3240764c3a5e167e8cf95e11a3b0c0cd43714b8a Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Wed, 1 May 2024 17:20:49 +0900 Subject: [PATCH 343/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 9747004..e7684c8 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -13,7 +13,7 @@ "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "main", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, - "neogit": { "branch": "master", "commit": "0cae7abc30cb91d661f28257c331fcb5b5198e31" }, + "neogit": { "branch": "master", "commit": "98e6e855266282a3dd32e642ea14209b8787882a" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, @@ -21,7 +21,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, - "nvim-surround": { "branch": "main", "commit": "a4e30d33add8a9743b4f518b3a788b3c8e5def71" }, + "nvim-surround": { "branch": "main", "commit": "6d0dc3dbb557bcc6a024969da461df4ba803fc48" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, -- 2.51.2 From 45fdb50e021bf9d296032b0ee4d500ef5070a5f3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Wed, 1 May 2024 18:59:35 +0900 Subject: [PATCH 344/589] Disable some plugins in VS Code --- home-manager/nvim/init.lua | 11 ++- home-manager/nvim/lua/plugins/barbar.lua | 48 ---------- home-manager/nvim/lua/plugins/cmp.lua | 86 ------------------ .../nvim/lua/plugins/indent-blankline.lua | 20 ----- home-manager/nvim/lua/plugins/lualine.lua | 11 --- home-manager/nvim/lua/plugins/neo-tree.lua | 38 -------- .../nvim/lua/plugins_not_vscode/barbar.lua | 48 ++++++++++ .../nvim/lua/plugins_not_vscode/cmp.lua | 87 +++++++++++++++++++ .../devicons.lua | 0 .../plugins_not_vscode/indent-blankline.lua | 20 +++++ .../lspconfig.lua | 0 .../nvim/lua/plugins_not_vscode/lualine.lua | 11 +++ .../nvim/lua/plugins_not_vscode/neo-tree.lua | 38 ++++++++ .../neogit.lua | 0 .../{plugins => plugins_not_vscode}/noice.lua | 6 +- .../{plugins => plugins_not_vscode}/nui.lua | 0 .../scrollview.lua | 0 .../telescope.lua | 4 +- .../treesitter.lua | 0 .../trouble.lua | 0 .../vscode.lua | 0 21 files changed, 218 insertions(+), 210 deletions(-) delete mode 100644 home-manager/nvim/lua/plugins/barbar.lua delete mode 100644 home-manager/nvim/lua/plugins/cmp.lua delete mode 100644 home-manager/nvim/lua/plugins/indent-blankline.lua delete mode 100644 home-manager/nvim/lua/plugins/lualine.lua delete mode 100644 home-manager/nvim/lua/plugins/neo-tree.lua create mode 100644 home-manager/nvim/lua/plugins_not_vscode/barbar.lua create mode 100644 home-manager/nvim/lua/plugins_not_vscode/cmp.lua rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/devicons.lua (100%) create mode 100644 home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/lspconfig.lua (100%) create mode 100644 home-manager/nvim/lua/plugins_not_vscode/lualine.lua create mode 100644 home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/neogit.lua (100%) rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/noice.lua (63%) rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/nui.lua (100%) rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/scrollview.lua (100%) rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/telescope.lua (94%) rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/treesitter.lua (100%) rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/trouble.lua (100%) rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/vscode.lua (100%) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 604ed07..174f17f 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -7,7 +7,7 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -require "lazy".setup("plugins", { +require "lazy".setup { checker = { enabled = true }, defaults = { version = "*", @@ -24,7 +24,14 @@ require "lazy".setup("plugins", { }, }, }, -}) + spec = { + { import = "plugins" }, + { + import = "plugins_not_vscode", + cond = vim.g.vscode, + }, + }, +} local uname = vim.loop.os_uname() ---@type string diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua deleted file mode 100644 index b3a89da..0000000 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ /dev/null @@ -1,48 +0,0 @@ -local event = require "vim_event" - ----@type LazyKeysSpec[] -local keys = { - { - "c", - "BufferClose", - }, - { - ".", - "BufferNext", - }, - { - ",", - "BufferPrevious", - }, - { - ">", - "BufferMoveNext", - }, - { - "<", - "BufferMovePrevious", - }, - { - "t0", - "BufferLast", - }, -} -for i = 1, 9 do - table.insert(keys, { - string.format("t%d", i), - string.format("BufferGoto %d", i), - }) -end - ----@type LazyPluginSpec -local barbar = { - "romgrk/barbar.nvim", - dependencies = { require "plugins.devicons" }, - event = { - event.buf_new_file, - event.buf_read_pre, - }, - keys = keys, -} - -return barbar diff --git a/home-manager/nvim/lua/plugins/cmp.lua b/home-manager/nvim/lua/plugins/cmp.lua deleted file mode 100644 index db5a76a..0000000 --- a/home-manager/nvim/lua/plugins/cmp.lua +++ /dev/null @@ -1,86 +0,0 @@ ----@type LazyPluginSpec -local cmp = { - "hrsh7th/nvim-cmp", - config = function() - local cmp = require "cmp" - local luasnip = require "luasnip" - ---@return boolean - local function has_words_before() - local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil - end - local bordered_window = cmp.config.window.bordered() - - cmp.setup { - formatting = { format = require "lspkind".cmp_format() }, - mapping = { - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping.confirm { - select = true, - }, - }, - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - sources = { - { name = "luasnip" }, - { name = "nvim_lsp" }, - { name = "nvim_lua" }, - { name = "path" }, - }, - window = { - completion = bordered_window, - documentation = bordered_window, - }, - } - - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources { - { name = "cmdline" }, - { name = "path" }, - }, - }) - end, - dependencies = { - "hrsh7th/cmp-cmdline", - "hrsh7th/cmp-nvim-lua", - { - "hrsh7th/cmp-nvim-lsp", - dependencies = { require "plugins.lspconfig" }, - }, - "hrsh7th/cmp-path", - "onsails/lspkind.nvim", - { - "saadparwaiz1/cmp_luasnip", - dependencies = { "L3MON4D3/LuaSnip" }, - }, - }, - event = { - "CmdlineEnter", - require "vim_event".insert_enter, - }, -} - -return cmp diff --git a/home-manager/nvim/lua/plugins/indent-blankline.lua b/home-manager/nvim/lua/plugins/indent-blankline.lua deleted file mode 100644 index cc28137..0000000 --- a/home-manager/nvim/lua/plugins/indent-blankline.lua +++ /dev/null @@ -1,20 +0,0 @@ -local event = require "vim_event" - ----@type LazyPluginSpec -local indent_blankline = { - "lukas-reineke/indent-blankline.nvim", - config = function() - local link_to_non_text = { link = "NonText" } - vim.api.nvim_set_hl(0, "IblIndent", link_to_non_text) - vim.api.nvim_set_hl(0, "IblScope", { fg = "#dcdcaa" }) - vim.api.nvim_set_hl(0, "IblWhitespace", link_to_non_text) - end, - dependencies = { require "plugins.treesitter" }, - event = { - event.buf_new_file, - event.buf_read_pre, - }, - main = "ibl", -} - -return indent_blankline diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua deleted file mode 100644 index 660b31e..0000000 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,11 +0,0 @@ ----@type LazyPluginSpec -local lualine = { - "nvim-lualine/lualine.nvim", - config = true, - dependencies = { - require "plugins.devicons", - require "plugins.vscode", - }, -} - -return lualine diff --git a/home-manager/nvim/lua/plugins/neo-tree.lua b/home-manager/nvim/lua/plugins/neo-tree.lua deleted file mode 100644 index 99d3174..0000000 --- a/home-manager/nvim/lua/plugins/neo-tree.lua +++ /dev/null @@ -1,38 +0,0 @@ ----@type LazyPluginSpec -local neo_tree = { - "nvim-neo-tree/neo-tree.nvim", - config = function() - vim.g.neo_tree_remove_legacy_commands = 1 - - require "neo-tree".setup { - close_if_last_window = true, - default_component_configs = { - git_status = { - symbols = { - deleted = "", - }, - }, - }, - filesystem = { - filtered_items = { visible = true }, - follow_current_file = { enabled = true }, - use_libuv_file_watcher = true, - }, - view = { relativenumber = true }, - window = { width = 30 }, - } - end, - dependencies = { - require "plugins.devicons", - require "plugins.nui", - require "plugins.plenary", - }, - keys = { { - "", - function() - require "neo-tree.command"._command "toggle" - end, - } }, -} - -return neo_tree diff --git a/home-manager/nvim/lua/plugins_not_vscode/barbar.lua b/home-manager/nvim/lua/plugins_not_vscode/barbar.lua new file mode 100644 index 0000000..3830efa --- /dev/null +++ b/home-manager/nvim/lua/plugins_not_vscode/barbar.lua @@ -0,0 +1,48 @@ +local event = require "vim_event" + +---@type LazyKeysSpec[] +local keys = { + { + "c", + "BufferClose", + }, + { + ".", + "BufferNext", + }, + { + ",", + "BufferPrevious", + }, + { + ">", + "BufferMoveNext", + }, + { + "<", + "BufferMovePrevious", + }, + { + "t0", + "BufferLast", + }, +} +for i = 1, 9 do + table.insert(keys, { + string.format("t%d", i), + string.format("BufferGoto %d", i), + }) +end + +---@type LazyPluginSpec +local barbar = { + "romgrk/barbar.nvim", + dependencies = { require "plugins_not_vscode.devicons" }, + event = { + event.buf_new_file, + event.buf_read_pre, + }, + keys = keys, +} + +return barbar diff --git a/home-manager/nvim/lua/plugins_not_vscode/cmp.lua b/home-manager/nvim/lua/plugins_not_vscode/cmp.lua new file mode 100644 index 0000000..a402389 --- /dev/null +++ b/home-manager/nvim/lua/plugins_not_vscode/cmp.lua @@ -0,0 +1,87 @@ +---@type LazyPluginSpec +local cmp = { + "hrsh7th/nvim-cmp", + config = function() + local cmp = require "cmp" + local luasnip = require "luasnip" + ---@return boolean + local function has_words_before() + local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and + vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil + end + local bordered_window = cmp.config.window.bordered() + + cmp.setup { + formatting = { format = require "lspkind".cmp_format() }, + mapping = { + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping.confirm { + select = true, + }, + }, + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + sources = { + { name = "luasnip" }, + { name = "nvim_lsp" }, + { name = "nvim_lua" }, + { name = "path" }, + }, + window = { + completion = bordered_window, + documentation = bordered_window, + }, + } + + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources { + { name = "cmdline" }, + { name = "path" }, + }, + }) + end, + dependencies = { + "hrsh7th/cmp-cmdline", + "hrsh7th/cmp-nvim-lua", + { + "hrsh7th/cmp-nvim-lsp", + dependencies = { require "plugins_not_vscode.lspconfig" }, + }, + "hrsh7th/cmp-path", + "onsails/lspkind.nvim", + { + "saadparwaiz1/cmp_luasnip", + dependencies = { "L3MON4D3/LuaSnip" }, + }, + }, + event = { + "CmdlineEnter", + require "vim_event".insert_enter, + }, +} + +return cmp diff --git a/home-manager/nvim/lua/plugins/devicons.lua b/home-manager/nvim/lua/plugins_not_vscode/devicons.lua similarity index 100% rename from home-manager/nvim/lua/plugins/devicons.lua rename to home-manager/nvim/lua/plugins_not_vscode/devicons.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua b/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua new file mode 100644 index 0000000..1b7335c --- /dev/null +++ b/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua @@ -0,0 +1,20 @@ +local event = require "vim_event" + +---@type LazyPluginSpec +local indent_blankline = { + "lukas-reineke/indent-blankline.nvim", + config = function() + local link_to_non_text = { link = "NonText" } + vim.api.nvim_set_hl(0, "IblIndent", link_to_non_text) + vim.api.nvim_set_hl(0, "IblScope", { fg = "#dcdcaa" }) + vim.api.nvim_set_hl(0, "IblWhitespace", link_to_non_text) + end, + dependencies = { require "plugins_not_vscode.treesitter" }, + event = { + event.buf_new_file, + event.buf_read_pre, + }, + main = "ibl", +} + +return indent_blankline diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua similarity index 100% rename from home-manager/nvim/lua/plugins/lspconfig.lua rename to home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua new file mode 100644 index 0000000..dc9a518 --- /dev/null +++ b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua @@ -0,0 +1,11 @@ +---@type LazyPluginSpec +local lualine = { + "nvim-lualine/lualine.nvim", + config = true, + dependencies = { + require "plugins_not_vscode.devicons", + require "plugins_not_vscode.vscode", + }, +} + +return lualine diff --git a/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua b/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua new file mode 100644 index 0000000..b1f7115 --- /dev/null +++ b/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua @@ -0,0 +1,38 @@ +---@type LazyPluginSpec +local neo_tree = { + "nvim-neo-tree/neo-tree.nvim", + config = function() + vim.g.neo_tree_remove_legacy_commands = 1 + + require "neo-tree".setup { + close_if_last_window = true, + default_component_configs = { + git_status = { + symbols = { + deleted = "", + }, + }, + }, + filesystem = { + filtered_items = { visible = true }, + follow_current_file = { enabled = true }, + use_libuv_file_watcher = true, + }, + view = { relativenumber = true }, + window = { width = 30 }, + } + end, + dependencies = { + require "plugins_not_vscode.devicons", + require "plugins_not_vscode.nui", + require "plugins.plenary", + }, + keys = { { + "", + function() + require "neo-tree.command"._command "toggle" + end, + } }, +} + +return neo_tree diff --git a/home-manager/nvim/lua/plugins/neogit.lua b/home-manager/nvim/lua/plugins_not_vscode/neogit.lua similarity index 100% rename from home-manager/nvim/lua/plugins/neogit.lua rename to home-manager/nvim/lua/plugins_not_vscode/neogit.lua diff --git a/home-manager/nvim/lua/plugins/noice.lua b/home-manager/nvim/lua/plugins_not_vscode/noice.lua similarity index 63% rename from home-manager/nvim/lua/plugins/noice.lua rename to home-manager/nvim/lua/plugins_not_vscode/noice.lua index 5d39a92..7ace065 100644 --- a/home-manager/nvim/lua/plugins/noice.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/noice.lua @@ -8,10 +8,10 @@ local noice = { config = function() require "notify".setup { stages = "static" } end, - dependencies = { require "plugins.vscode" }, + dependencies = { require "plugins_not_vscode.vscode" }, }, - require "plugins.nui", - require "plugins.treesitter", + require "plugins_not_vscode.nui", + require "plugins_not_vscode.treesitter", }, } return noice diff --git a/home-manager/nvim/lua/plugins/nui.lua b/home-manager/nvim/lua/plugins_not_vscode/nui.lua similarity index 100% rename from home-manager/nvim/lua/plugins/nui.lua rename to home-manager/nvim/lua/plugins_not_vscode/nui.lua diff --git a/home-manager/nvim/lua/plugins/scrollview.lua b/home-manager/nvim/lua/plugins_not_vscode/scrollview.lua similarity index 100% rename from home-manager/nvim/lua/plugins/scrollview.lua rename to home-manager/nvim/lua/plugins_not_vscode/scrollview.lua diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins_not_vscode/telescope.lua similarity index 94% rename from home-manager/nvim/lua/plugins/telescope.lua rename to home-manager/nvim/lua/plugins_not_vscode/telescope.lua index 665d2b9..1affee8 100644 --- a/home-manager/nvim/lua/plugins/telescope.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/telescope.lua @@ -43,9 +43,9 @@ local telescope = { } end, dependencies = { - require "plugins.devicons", + require "plugins_not_vscode.devicons", require "plugins.plenary", - require "plugins.treesitter", + require "plugins_not_vscode.treesitter", }, keys = { { diff --git a/home-manager/nvim/lua/plugins/treesitter.lua b/home-manager/nvim/lua/plugins_not_vscode/treesitter.lua similarity index 100% rename from home-manager/nvim/lua/plugins/treesitter.lua rename to home-manager/nvim/lua/plugins_not_vscode/treesitter.lua diff --git a/home-manager/nvim/lua/plugins/trouble.lua b/home-manager/nvim/lua/plugins_not_vscode/trouble.lua similarity index 100% rename from home-manager/nvim/lua/plugins/trouble.lua rename to home-manager/nvim/lua/plugins_not_vscode/trouble.lua diff --git a/home-manager/nvim/lua/plugins/vscode.lua b/home-manager/nvim/lua/plugins_not_vscode/vscode.lua similarity index 100% rename from home-manager/nvim/lua/plugins/vscode.lua rename to home-manager/nvim/lua/plugins_not_vscode/vscode.lua -- 2.51.2 From 583b051a8b14b867333fc27f21aab90da7138d18 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Thu, 2 May 2024 22:15:44 +0900 Subject: [PATCH 345/589] Fix boolean to disable plugins in VS Code --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 174f17f..4daa7ee 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -28,7 +28,7 @@ require "lazy".setup { { import = "plugins" }, { import = "plugins_not_vscode", - cond = vim.g.vscode, + cond = not vim.g.vscode, }, }, } -- 2.51.2 From 23486472fdf7ec0225b51e46ce19d7460cd360eb Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Thu, 2 May 2024 22:16:34 +0900 Subject: [PATCH 346/589] Disable Neovim's Copilot plugin in VS Code --- home-manager/nvim/lua/{plugins => plugins_not_vscode}/copilot.lua | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename home-manager/nvim/lua/{plugins => plugins_not_vscode}/copilot.lua (100%) diff --git a/home-manager/nvim/lua/plugins/copilot.lua b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua similarity index 100% rename from home-manager/nvim/lua/plugins/copilot.lua rename to home-manager/nvim/lua/plugins_not_vscode/copilot.lua -- 2.51.2 From d74c3600f56a4630be8bbe4d8844a55fa548574d Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Thu, 2 May 2024 22:33:14 +0900 Subject: [PATCH 347/589] Enable global status line --- home-manager/nvim/init.lua | 1 + .../nvim/lua/plugins_not_vscode/lualine.lua | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 4daa7ee..7a01179 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -100,6 +100,7 @@ vim.api.nvim_set_keymap("t", "", "", { noremap = true }) vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.fileformats = { "unix", "dos" } +vim.opt.laststatus = 3 vim.opt.list = true vim.opt.listchars = { eol = "↲", diff --git a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua index dc9a518..4d49665 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua @@ -1,11 +1,17 @@ ---@type LazyPluginSpec local lualine = { - "nvim-lualine/lualine.nvim", - config = true, - dependencies = { - require "plugins_not_vscode.devicons", - require "plugins_not_vscode.vscode", - }, + "nvim-lualine/lualine.nvim", + config = function() + require "lualine".setup { + options = { + globalstatus = true, + }, + } + end, + dependencies = { + require "plugins_not_vscode.devicons", + require "plugins_not_vscode.vscode", + }, } return lualine -- 2.51.2 From a3cb896e1bab2a8a51c9c0d1510187832333af38 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Thu, 2 May 2024 22:51:00 +0900 Subject: [PATCH 348/589] Properly configure indent-blankline --- .../plugins_not_vscode/indent-blankline.lua | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua b/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua index 1b7335c..6584d87 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua @@ -2,19 +2,23 @@ local event = require "vim_event" ---@type LazyPluginSpec local indent_blankline = { - "lukas-reineke/indent-blankline.nvim", - config = function() - local link_to_non_text = { link = "NonText" } - vim.api.nvim_set_hl(0, "IblIndent", link_to_non_text) - vim.api.nvim_set_hl(0, "IblScope", { fg = "#dcdcaa" }) - vim.api.nvim_set_hl(0, "IblWhitespace", link_to_non_text) - end, - dependencies = { require "plugins_not_vscode.treesitter" }, - event = { - event.buf_new_file, - event.buf_read_pre, - }, - main = "ibl", + "lukas-reineke/indent-blankline.nvim", + config = function() + local link_to_non_text = { link = "NonText" } + vim.api.nvim_set_hl(0, "IblIndent", link_to_non_text) + vim.api.nvim_set_hl(0, "IblScope", { fg = "#dcdcaa" }) + vim.api.nvim_set_hl(0, "IblWhitespace", link_to_non_text) + require "ibl".setup { + indent = { + char = "│", + }, + } + end, + dependencies = { require "plugins_not_vscode.treesitter" }, + event = { + event.buf_new_file, + event.buf_read_pre, + }, } return indent_blankline -- 2.51.2 From a965c73d82995504851b7650e748bfd47959c863 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Fri, 3 May 2024 18:46:27 +0900 Subject: [PATCH 349/589] Use nim_langserver instead of nimls --- home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index 292466a..4691baa 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -60,7 +60,7 @@ local lspconfig = { "jsonls", "lemminx", "lua_ls", - "nimls", + "nim_langserver", "texlab", "pylsp", "yamlls", -- 2.51.2 From b4f003e83090c15b4f40ae0a4d55e48f20b8d5ed Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sun, 12 May 2024 09:54:29 +0900 Subject: [PATCH 350/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index e7684c8..5d216b0 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -13,20 +13,20 @@ "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "main", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, - "neogit": { "branch": "master", "commit": "98e6e855266282a3dd32e642ea14209b8787882a" }, - "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, + "neogit": { "branch": "master", "commit": "a32f99a83d636ea7cd62cda6e24d76d14e5579ba" }, + "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, + "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-surround": { "branch": "main", "commit": "6d0dc3dbb557bcc6a024969da461df4ba803fc48" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, - "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vscode.nvim": { "branch": "main", "commit": "bf62428d842ed1fb9c33353be10af40bac51e825" } + "vscode.nvim": { "branch": "main", "commit": "1a2cb491a962acf3bbf53c6d0a61b4ec76012570" } } \ No newline at end of file -- 2.51.2 From 948c17027829fc6d9af215a40067cdf9dac77b37 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sun, 12 May 2024 10:00:23 +0900 Subject: [PATCH 351/589] Uninstall noice.nvim --- home-manager/nvim/lazy-lock.json | 2 -- .../nvim/lua/plugins_not_vscode/noice.lua | 17 ----------------- .../nvim/lua/plugins_not_vscode/treesitter.lua | 9 --------- 3 files changed, 28 deletions(-) delete mode 100644 home-manager/nvim/lua/plugins_not_vscode/noice.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 5d216b0..d76e52e 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -14,12 +14,10 @@ "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "main", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, "neogit": { "branch": "master", "commit": "a32f99a83d636ea7cd62cda6e24d76d14e5579ba" }, - "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-surround": { "branch": "main", "commit": "6d0dc3dbb557bcc6a024969da461df4ba803fc48" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, diff --git a/home-manager/nvim/lua/plugins_not_vscode/noice.lua b/home-manager/nvim/lua/plugins_not_vscode/noice.lua deleted file mode 100644 index 7ace065..0000000 --- a/home-manager/nvim/lua/plugins_not_vscode/noice.lua +++ /dev/null @@ -1,17 +0,0 @@ ----@type LazyPluginSpec -local noice = { - "folke/noice.nvim", - config = true, - dependencies = { - { - "rcarriga/nvim-notify", - config = function() - require "notify".setup { stages = "static" } - end, - dependencies = { require "plugins_not_vscode.vscode" }, - }, - require "plugins_not_vscode.nui", - require "plugins_not_vscode.treesitter", - }, -} -return noice diff --git a/home-manager/nvim/lua/plugins_not_vscode/treesitter.lua b/home-manager/nvim/lua/plugins_not_vscode/treesitter.lua index 8436b76..f00ff3b 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/treesitter.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/treesitter.lua @@ -7,15 +7,6 @@ local treesitter = { config = function() require "nvim-treesitter.configs".setup { auto_install = true, - -- For noice.nvim (https://github.com/folke/noice.nvim#%EF%B8%8F-requirements) - ensure_installed = { - "bash", - "lua", - "markdown", - "markdown_inline", - "regex", - "vim", - }, sync_install = true, highlight = { enable = true, -- 2.51.2 From 1502ee779cb29dadb46a8d6b29a7f4074af79f2b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 8 Jun 2024 11:32:12 +0900 Subject: [PATCH 352/589] Update plugins --- home-manager/nvim/lazy-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index d76e52e..9ed3669 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,30 +1,30 @@ { "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" }, + "barbar.nvim": { "branch": "master", "commit": "79f7d16578a167bdf5355725551ef7d90613a601" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "lazy.nvim": { "branch": "main", "commit": "fafe1f7c640aed75e70a10e6649612cd96f39149" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neo-tree.nvim": { "branch": "main", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, - "neogit": { "branch": "master", "commit": "a32f99a83d636ea7cd62cda6e24d76d14e5579ba" }, + "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, + "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, - "nvim-surround": { "branch": "main", "commit": "6d0dc3dbb557bcc6a024969da461df4ba803fc48" }, + "nvim-surround": { "branch": "main", "commit": "6a8f0f1e7e6e8facc9ba7c8f217daf84122b7a9b" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, - "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vscode.nvim": { "branch": "main", "commit": "1a2cb491a962acf3bbf53c6d0a61b4ec76012570" } + "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" }, + "vscode.nvim": { "branch": "main", "commit": "ff3926901d4160886f707a8a70b5c2e82979a7c4" } } \ No newline at end of file -- 2.51.2 From 9dc45e395194c589ed4c8f9a5e54291e9adafa71 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 8 Jun 2024 11:32:26 +0900 Subject: [PATCH 353/589] Disable Copilot during AtCoder contests --- home-manager/nvim/lua/plugins_not_vscode/copilot.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua index 73ae774..7508fe5 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua @@ -8,6 +8,9 @@ local copilot = { }, } end, + cond = function() + return string.find(vim.fn.getcwd(), "AtCoder") == nil + end, event = require "vim_event".buf_read_post, } -- 2.51.2 From 0112e7a02df7020bd1b2e240838319fc1a395aad Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Mon, 10 Jun 2024 20:12:21 +0900 Subject: [PATCH 354/589] Update nvim-surround --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 9ed3669..79693ad 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -19,7 +19,7 @@ "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, - "nvim-surround": { "branch": "main", "commit": "6a8f0f1e7e6e8facc9ba7c8f217daf84122b7a9b" }, + "nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, -- 2.51.2 From 6c77753b6c2ffaf701f4da1cc739b671cf9ffff5 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Thu, 13 Jun 2024 14:28:08 +0900 Subject: [PATCH 355/589] Update trouble.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 79693ad..dc401a2 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -25,6 +25,6 @@ "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" }, + "trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" }, "vscode.nvim": { "branch": "main", "commit": "ff3926901d4160886f707a8a70b5c2e82979a7c4" } } \ No newline at end of file -- 2.51.2 From 80f5d6c62dd00d1d9326d4da285cdfaa949d6d75 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Thu, 13 Jun 2024 14:28:26 +0900 Subject: [PATCH 356/589] Add vuels --- home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index 4691baa..cb7b5a5 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -63,6 +63,7 @@ local lspconfig = { "nim_langserver", "texlab", "pylsp", + "vuels", "yamlls", tsserver, } -- 2.51.2 From d852e9124a852d4ef5a1fbf0d40d2949d9ef78f3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Wed, 19 Jun 2024 21:10:40 +0900 Subject: [PATCH 357/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index dc401a2..26ca9b0 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,9 +6,9 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, + "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "fafe1f7c640aed75e70a10e6649612cd96f39149" }, + "lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, @@ -18,13 +18,13 @@ "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, - "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, + "nvim-scrollview": { "branch": "main", "commit": "fd334e5ad0c616987d1b9114890a59c97165cf83" }, "nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" }, + "trouble.nvim": { "branch": "main", "commit": "09380a8ed0694dbfbbcf59f9eaac499e259cb75c" }, "vscode.nvim": { "branch": "main", "commit": "ff3926901d4160886f707a8a70b5c2e82979a7c4" } } \ No newline at end of file -- 2.51.2 From e88fba4136f700a239681114198c25fc6cbc3218 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sat, 22 Jun 2024 23:08:52 +0900 Subject: [PATCH 358/589] Update vscode.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 26ca9b0..53b291e 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -26,5 +26,5 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "09380a8ed0694dbfbbcf59f9eaac499e259cb75c" }, - "vscode.nvim": { "branch": "main", "commit": "ff3926901d4160886f707a8a70b5c2e82979a7c4" } + "vscode.nvim": { "branch": "main", "commit": "46212834b32866ce45479f885ca82d2259044f46" } } \ No newline at end of file -- 2.51.2 From d3644cbf8924eb392cb9cb40e4cb6aa7b3497e40 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Mon, 24 Jun 2024 14:29:38 +0900 Subject: [PATCH 359/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 53b291e..ab15bd3 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" }, + "lazy.nvim": { "branch": "main", "commit": "4ea9fe060042f345960ad0c01aa7bca91405e10a" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, @@ -25,6 +25,6 @@ "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "trouble.nvim": { "branch": "main", "commit": "09380a8ed0694dbfbbcf59f9eaac499e259cb75c" }, + "trouble.nvim": { "branch": "main", "commit": "57761ba7148164f0315ed203e714ac242329abd4" }, "vscode.nvim": { "branch": "main", "commit": "46212834b32866ce45479f885ca82d2259044f46" } } \ No newline at end of file -- 2.51.2 From 146303e41083247a9696f2b95806c82051852067 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto Date: Sun, 30 Jun 2024 11:25:36 +0900 Subject: [PATCH 360/589] Update plugins --- home-manager/nvim/lazy-lock.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ab15bd3..ed7938a 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,9 +6,8 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "4ea9fe060042f345960ad0c01aa7bca91405e10a" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "0507e19289539396313503f6eb6b02bbe8a5e483" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, @@ -18,8 +17,8 @@ "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, - "nvim-scrollview": { "branch": "main", "commit": "fd334e5ad0c616987d1b9114890a59c97165cf83" }, - "nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" }, + "nvim-scrollview": { "branch": "main", "commit": "06563ae0c9928a2df42aefe66f2aed2f2943e32e" }, + "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, -- 2.51.2 From 28821a8fe4cd917a349096bfd37ddf42ef25839f Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 6 Jul 2024 19:36:37 +0900 Subject: [PATCH 361/589] Upgrade plugins --- home-manager/nvim/lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ed7938a..8b296dd 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -7,7 +7,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "0507e19289539396313503f6eb6b02bbe8a5e483" }, + "lazy.nvim": { "branch": "main", "commit": "6ca23c15f64e88e3ba26be9795343c4c7f2ee851" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, @@ -17,13 +17,13 @@ "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, - "nvim-scrollview": { "branch": "main", "commit": "06563ae0c9928a2df42aefe66f2aed2f2943e32e" }, + "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "trouble.nvim": { "branch": "main", "commit": "57761ba7148164f0315ed203e714ac242329abd4" }, + "trouble.nvim": { "branch": "main", "commit": "026e420bf9878ee97133f8fbf906261f3249b17a" }, "vscode.nvim": { "branch": "main", "commit": "46212834b32866ce45479f885ca82d2259044f46" } } \ No newline at end of file -- 2.51.2 From 57ec77319e5a93a87e929867e2480582f826dbfd Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 6 Jul 2024 19:37:16 +0900 Subject: [PATCH 362/589] Add docker_compose_language_service --- home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index cb7b5a5..0c6e385 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -55,6 +55,7 @@ local lspconfig = { "bashls", "clangd", "cssls", + "docker_compose_language_service", "dockerls", "gopls", "jsonls", -- 2.51.2 From 59b2cbe0aa42487160413a2684b4ee8ff4edcba8 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 6 Jul 2024 19:47:45 +0900 Subject: [PATCH 363/589] Remove docker_compose_language_service --- home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index 0c6e385..cb7b5a5 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -55,7 +55,6 @@ local lspconfig = { "bashls", "clangd", "cssls", - "docker_compose_language_service", "dockerls", "gopls", "jsonls", -- 2.51.2 From 0b2e813109b124f99f21564cb6431761884bba1e Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 7 Jul 2024 17:37:47 +0900 Subject: [PATCH 364/589] Update plugins --- home-manager/nvim/lazy-lock.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 8b296dd..2b63d6e 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,15 +6,16 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "6ca23c15f64e88e3ba26be9795343c4c7f2ee851" }, + "lazy.nvim": { "branch": "main", "commit": "89b264ac1d3c9752b22d4e61d16dc408a75d2a16" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "lualine.nvim": { "branch": "master", "commit": "e20896769ca3cd7e623f0d9f0f68c2155e1eeee2" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, -- 2.51.2 From ff5f6181fd11c80daaa8e5c88966264bd278791d Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 7 Jul 2024 17:48:10 +0900 Subject: [PATCH 365/589] Add auto-indent.nvim --- home-manager/nvim/lazy-lock.json | 1 + .../nvim/lua/plugins_not_vscode/auto-indent.lua | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 home-manager/nvim/lua/plugins_not_vscode/auto-indent.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 2b63d6e..1d0d66a 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, + "auto-indent.nvim": { "branch": "main", "commit": "46801cf8857d42a20a73c40b0a5d3dfe8b2b6192" }, "barbar.nvim": { "branch": "master", "commit": "79f7d16578a167bdf5355725551ef7d90613a601" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, diff --git a/home-manager/nvim/lua/plugins_not_vscode/auto-indent.lua b/home-manager/nvim/lua/plugins_not_vscode/auto-indent.lua new file mode 100644 index 0000000..4e47f88 --- /dev/null +++ b/home-manager/nvim/lua/plugins_not_vscode/auto-indent.lua @@ -0,0 +1,10 @@ +local vim_event = require "vim_event" + +---@type LazyPluginSpec +local auto_indent = { + "VidocqH/auto-indent.nvim", + config = true, + event = vim_event.insert_enter, +} + +return auto_indent -- 2.51.2 From 834d39a7c3c13d7127b6db3d3e902454dee404b6 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 26 Jul 2024 11:37:29 +0900 Subject: [PATCH 366/589] Update plugins --- home-manager/nvim/lazy-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 1d0d66a..708bbcb 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -9,14 +9,14 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "89b264ac1d3c9752b22d4e61d16dc408a75d2a16" }, - "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "lualine.nvim": { "branch": "master", "commit": "e20896769ca3cd7e623f0d9f0f68c2155e1eeee2" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, + "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, + "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, @@ -26,6 +26,6 @@ "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "trouble.nvim": { "branch": "main", "commit": "026e420bf9878ee97133f8fbf906261f3249b17a" }, - "vscode.nvim": { "branch": "main", "commit": "46212834b32866ce45479f885ca82d2259044f46" } -} \ No newline at end of file + "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, + "vscode.nvim": { "branch": "main", "commit": "3ba16d763097cecc75eb93761f4a981467acfc23" } +} -- 2.51.2 From c618d841103101df36646549a4a76113f331b42f Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 Aug 2024 12:48:00 +0900 Subject: [PATCH 367/589] Add hex.nvim --- home-manager/nvim/lazy-lock.json | 3 ++- home-manager/nvim/lua/plugins/hex.lua | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 home-manager/nvim/lua/plugins/hex.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 708bbcb..9887d57 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,6 +8,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, + "hex.nvim": { "branch": "master", "commit": "cbffd2ce4b8be089360e3c95d5909cd511d8840c" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, @@ -27,5 +28,5 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "vscode.nvim": { "branch": "main", "commit": "3ba16d763097cecc75eb93761f4a981467acfc23" } + "vscode.nvim": { "branch": "main", "commit": "f6c88cdf9d37d5c0bb1e492a13a3b4b4cc4dd13e" } } diff --git a/home-manager/nvim/lua/plugins/hex.lua b/home-manager/nvim/lua/plugins/hex.lua new file mode 100644 index 0000000..3fb2123 --- /dev/null +++ b/home-manager/nvim/lua/plugins/hex.lua @@ -0,0 +1,7 @@ +---@type LazyPluginSpec +local hex = { + "RaafatTurki/hex.nvim", + config = true, +} + +return hex -- 2.51.2 From f7adf4bbe7f8753ad5e8170ef6f687f2e7b3648b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 Aug 2024 12:50:38 +0900 Subject: [PATCH 368/589] Fix tab indentation to spaces --- .../nvim/lua/plugins_not_vscode/barbar.lua | 70 ++++---- .../nvim/lua/plugins_not_vscode/cmp.lua | 160 +++++++++--------- .../nvim/lua/plugins_not_vscode/neo-tree.lua | 64 +++---- 3 files changed, 147 insertions(+), 147 deletions(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/barbar.lua b/home-manager/nvim/lua/plugins_not_vscode/barbar.lua index 3830efa..2cda482 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/barbar.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/barbar.lua @@ -2,47 +2,47 @@ local event = require "vim_event" ---@type LazyKeysSpec[] local keys = { - { - "c", - "BufferClose", - }, - { - ".", - "BufferNext", - }, - { - ",", - "BufferPrevious", - }, - { - ">", - "BufferMoveNext", - }, - { - "<", - "BufferMovePrevious", - }, - { - "t0", - "BufferLast", - }, + { + "c", + "BufferClose", + }, + { + ".", + "BufferNext", + }, + { + ",", + "BufferPrevious", + }, + { + ">", + "BufferMoveNext", + }, + { + "<", + "BufferMovePrevious", + }, + { + "t0", + "BufferLast", + }, } for i = 1, 9 do - table.insert(keys, { - string.format("t%d", i), - string.format("BufferGoto %d", i), - }) + table.insert(keys, { + string.format("t%d", i), + string.format("BufferGoto %d", i), + }) end ---@type LazyPluginSpec local barbar = { - "romgrk/barbar.nvim", - dependencies = { require "plugins_not_vscode.devicons" }, - event = { - event.buf_new_file, - event.buf_read_pre, - }, - keys = keys, + "romgrk/barbar.nvim", + dependencies = { require "plugins_not_vscode.devicons" }, + event = { + event.buf_new_file, + event.buf_read_pre, + }, + keys = keys, } return barbar diff --git a/home-manager/nvim/lua/plugins_not_vscode/cmp.lua b/home-manager/nvim/lua/plugins_not_vscode/cmp.lua index a402389..0baab4a 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/cmp.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/cmp.lua @@ -1,87 +1,87 @@ ---@type LazyPluginSpec local cmp = { - "hrsh7th/nvim-cmp", - config = function() - local cmp = require "cmp" - local luasnip = require "luasnip" - ---@return boolean - local function has_words_before() - local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and - vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil - end - local bordered_window = cmp.config.window.bordered() + "hrsh7th/nvim-cmp", + config = function() + local cmp = require "cmp" + local luasnip = require "luasnip" + ---@return boolean + local function has_words_before() + local line, col = table.unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and + vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil + end + local bordered_window = cmp.config.window.bordered() - cmp.setup { - formatting = { format = require "lspkind".cmp_format() }, - mapping = { - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping.confirm { - select = true, - }, - }, - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - sources = { - { name = "luasnip" }, - { name = "nvim_lsp" }, - { name = "nvim_lua" }, - { name = "path" }, - }, - window = { - completion = bordered_window, - documentation = bordered_window, - }, - } + cmp.setup { + formatting = { format = require "lspkind".cmp_format() }, + mapping = { + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping.confirm { + select = true, + }, + }, + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + sources = { + { name = "luasnip" }, + { name = "nvim_lsp" }, + { name = "nvim_lua" }, + { name = "path" }, + }, + window = { + completion = bordered_window, + documentation = bordered_window, + }, + } - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources { - { name = "cmdline" }, - { name = "path" }, - }, - }) - end, - dependencies = { - "hrsh7th/cmp-cmdline", - "hrsh7th/cmp-nvim-lua", - { - "hrsh7th/cmp-nvim-lsp", - dependencies = { require "plugins_not_vscode.lspconfig" }, - }, - "hrsh7th/cmp-path", - "onsails/lspkind.nvim", - { - "saadparwaiz1/cmp_luasnip", - dependencies = { "L3MON4D3/LuaSnip" }, - }, - }, - event = { - "CmdlineEnter", - require "vim_event".insert_enter, - }, + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources { + { name = "cmdline" }, + { name = "path" }, + }, + }) + end, + dependencies = { + "hrsh7th/cmp-cmdline", + "hrsh7th/cmp-nvim-lua", + { + "hrsh7th/cmp-nvim-lsp", + dependencies = { require "plugins_not_vscode.lspconfig" }, + }, + "hrsh7th/cmp-path", + "onsails/lspkind.nvim", + { + "saadparwaiz1/cmp_luasnip", + dependencies = { "L3MON4D3/LuaSnip" }, + }, + }, + event = { + "CmdlineEnter", + require "vim_event".insert_enter, + }, } return cmp diff --git a/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua b/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua index b1f7115..90fb95c 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua @@ -1,38 +1,38 @@ ---@type LazyPluginSpec local neo_tree = { - "nvim-neo-tree/neo-tree.nvim", - config = function() - vim.g.neo_tree_remove_legacy_commands = 1 + "nvim-neo-tree/neo-tree.nvim", + config = function() + vim.g.neo_tree_remove_legacy_commands = 1 - require "neo-tree".setup { - close_if_last_window = true, - default_component_configs = { - git_status = { - symbols = { - deleted = "", - }, - }, - }, - filesystem = { - filtered_items = { visible = true }, - follow_current_file = { enabled = true }, - use_libuv_file_watcher = true, - }, - view = { relativenumber = true }, - window = { width = 30 }, - } - end, - dependencies = { - require "plugins_not_vscode.devicons", - require "plugins_not_vscode.nui", - require "plugins.plenary", - }, - keys = { { - "", - function() - require "neo-tree.command"._command "toggle" - end, - } }, + require "neo-tree".setup { + close_if_last_window = true, + default_component_configs = { + git_status = { + symbols = { + deleted = "", + }, + }, + }, + filesystem = { + filtered_items = { visible = true }, + follow_current_file = { enabled = true }, + use_libuv_file_watcher = true, + }, + view = { relativenumber = true }, + window = { width = 30 }, + } + end, + dependencies = { + require "plugins_not_vscode.devicons", + require "plugins_not_vscode.nui", + require "plugins.plenary", + }, + keys = { { + "", + function() + require "neo-tree.command"._command "toggle" + end, + } }, } return neo_tree -- 2.51.2 From 87bb1a1b273dcc7f8e259a28fbc08e4a8ffe5fd5 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 Aug 2024 12:55:31 +0900 Subject: [PATCH 369/589] Fix deprecated settings --- home-manager/nvim/init.lua | 57 ++++++++----------- .../nvim/lua/plugins_not_vscode/lspconfig.lua | 2 +- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 7a01179..645b339 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -2,7 +2,7 @@ vim.g.mapleader = " " ---@type string local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then +if not vim.uv.fs_stat(lazypath) then os.execute("git clone --filter=blob:none https://github.com/folke/lazy.nvim.git --branch=stable " .. lazypath) end vim.opt.rtp:prepend(lazypath) @@ -33,7 +33,7 @@ require "lazy".setup { }, } -local uname = vim.loop.os_uname() +local uname = vim.uv.os_uname() ---@type string local sysname = uname.sysname local is_windows = sysname == "Windows_NT" @@ -60,41 +60,30 @@ if im_disable_cmd ~= "" then } end -vim.diagnostic.config { virtual_text = false } - ----@class sign ----@field msg_type string ----@field icon string - ----@type sign[] -local signs = { - { - msg_type = "Error", - icon = "", - }, - { - msg_type = "Warn", - icon = "", - }, - { - msg_type = "Hint", - icon = "", - }, - { - msg_type = "Info", - icon = "", +vim.diagnostic.config { + signs = { + text = { + [vim.diagnostic.severity.ERROR] = "", + [vim.diagnostic.severity.WARN] = "", + [vim.diagnostic.severity.INFO] = "", + [vim.diagnostic.severity.HINT] = "", + }, + linehl = { + [vim.diagnostic.severity.ERROR] = "DiagnosticSignError", + [vim.diagnostic.severity.WARN] = "DiagnosticSignWarn", + [vim.diagnostic.severity.INFO] = "DiagnosticSignInfo", + [vim.diagnostic.severity.HINT] = "DiagnosticSignHint", + }, + numhl = { + [vim.diagnostic.severity.ERROR] = "DiagnosticSignError", + [vim.diagnostic.severity.WARN] = "DiagnosticSignWarn", + [vim.diagnostic.severity.INFO] = "DiagnosticSignInfo", + [vim.diagnostic.severity.HINT] = "DiagnosticSignHint", + }, }, + virtual_text = false, } -for _, sign in ipairs(signs) do - local hl = "DiagnosticSign" .. sign.msg_type - vim.fn.sign_define(hl, { - text = sign.icon, - numhl = hl, - texthl = hl, - }) -end - vim.api.nvim_set_keymap("t", "", "", { noremap = true }) vim.opt.cmdheight = 0 diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index cb7b5a5..37248ac 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -27,7 +27,7 @@ local lspconfig = { config = { group = vim.api.nvim_create_augroup("diagnostics_hover", {}), callback = function() - if not vim.diagnostic.is_disabled() then + if vim.diagnostic.is_enabled() then vim.diagnostic.open_float { focusable = false } end end, -- 2.51.2 From 0e2be192674fe91dbda0031eb9f5ec2982a73e04 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:05:43 +0900 Subject: [PATCH 370/589] Use the latest commit of nvim-cmp --- home-manager/nvim/lazy-lock.json | 4 ++-- home-manager/nvim/lua/plugins_not_vscode/cmp.lua | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 9887d57..55c2eaa 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "auto-indent.nvim": { "branch": "main", "commit": "46801cf8857d42a20a73c40b0a5d3dfe8b2b6192" }, - "barbar.nvim": { "branch": "master", "commit": "79f7d16578a167bdf5355725551ef7d90613a601" }, + "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -18,7 +18,7 @@ "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, - "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, diff --git a/home-manager/nvim/lua/plugins_not_vscode/cmp.lua b/home-manager/nvim/lua/plugins_not_vscode/cmp.lua index 0baab4a..94ab5a4 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/cmp.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/cmp.lua @@ -1,6 +1,7 @@ ---@type LazyPluginSpec local cmp = { "hrsh7th/nvim-cmp", + branch = "main", config = function() local cmp = require "cmp" local luasnip = require "luasnip" -- 2.51.2 From dd13b905502ee6e8348aaedbd6641c5b7b13fd6b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:23:33 +0900 Subject: [PATCH 371/589] Use master branch of neogit --- home-manager/nvim/lazy-lock.json | 4 ++-- home-manager/nvim/lua/plugins_not_vscode/neogit.lua | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 55c2eaa..c03ea00 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -9,13 +9,13 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "hex.nvim": { "branch": "master", "commit": "cbffd2ce4b8be089360e3c95d5909cd511d8840c" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" }, + "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, diff --git a/home-manager/nvim/lua/plugins_not_vscode/neogit.lua b/home-manager/nvim/lua/plugins_not_vscode/neogit.lua index c97e266..e2fa25b 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/neogit.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/neogit.lua @@ -1,6 +1,7 @@ ---@type LazyPluginSpec local neogit = { "NeogitOrg/neogit", + branch = "master", config = function() require "neogit".setup { disable_commit_confirmation = true, -- 2.51.2 From 1c14f47bb9b161ecd9973f85d117e2abbb72cdfc Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 Aug 2024 19:05:12 +0900 Subject: [PATCH 372/589] Delete unused plugins --- home-manager/nvim/lazy-lock.json | 2 -- home-manager/nvim/lua/plugins/mkdir.lua | 7 ------- .../nvim/lua/plugins_not_vscode/auto-indent.lua | 10 ---------- 3 files changed, 19 deletions(-) delete mode 100644 home-manager/nvim/lua/plugins/mkdir.lua delete mode 100644 home-manager/nvim/lua/plugins_not_vscode/auto-indent.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index c03ea00..6df9ee1 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,6 +1,5 @@ { "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "auto-indent.nvim": { "branch": "main", "commit": "46801cf8857d42a20a73c40b0a5d3dfe8b2b6192" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -13,7 +12,6 @@ "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, - "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, diff --git a/home-manager/nvim/lua/plugins/mkdir.lua b/home-manager/nvim/lua/plugins/mkdir.lua deleted file mode 100644 index 01c54d9..0000000 --- a/home-manager/nvim/lua/plugins/mkdir.lua +++ /dev/null @@ -1,7 +0,0 @@ ----@type LazyPluginSpec -local mkdir = { - "jghauser/mkdir.nvim", - event = require "vim_event".buf_new_file, -} - -return mkdir diff --git a/home-manager/nvim/lua/plugins_not_vscode/auto-indent.lua b/home-manager/nvim/lua/plugins_not_vscode/auto-indent.lua deleted file mode 100644 index 4e47f88..0000000 --- a/home-manager/nvim/lua/plugins_not_vscode/auto-indent.lua +++ /dev/null @@ -1,10 +0,0 @@ -local vim_event = require "vim_event" - ----@type LazyPluginSpec -local auto_indent = { - "VidocqH/auto-indent.nvim", - config = true, - event = vim_event.insert_enter, -} - -return auto_indent -- 2.51.2 From 93aa3a5a014bbebaceb2d917dee2afa6ee1c7e9b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 Aug 2024 20:17:12 +0900 Subject: [PATCH 373/589] Use `opts` instead of `config` for lazy config --- home-manager/nvim/lua/plugins/hex.lua | 2 +- home-manager/nvim/lua/plugins/surround.lua | 2 +- .../nvim/lua/plugins_not_vscode/copilot.lua | 12 +++--- .../nvim/lua/plugins_not_vscode/lualine.lua | 12 +++--- .../nvim/lua/plugins_not_vscode/neo-tree.lua | 38 +++++++++---------- .../nvim/lua/plugins_not_vscode/neogit.lua | 8 ++-- 6 files changed, 32 insertions(+), 42 deletions(-) diff --git a/home-manager/nvim/lua/plugins/hex.lua b/home-manager/nvim/lua/plugins/hex.lua index 3fb2123..4a5b446 100644 --- a/home-manager/nvim/lua/plugins/hex.lua +++ b/home-manager/nvim/lua/plugins/hex.lua @@ -1,7 +1,7 @@ ---@type LazyPluginSpec local hex = { "RaafatTurki/hex.nvim", - config = true, + opts = {}, } return hex diff --git a/home-manager/nvim/lua/plugins/surround.lua b/home-manager/nvim/lua/plugins/surround.lua index 79cea62..ef2855d 100644 --- a/home-manager/nvim/lua/plugins/surround.lua +++ b/home-manager/nvim/lua/plugins/surround.lua @@ -3,11 +3,11 @@ local event = require "vim_event" ---@type LazyPluginSpec local surround = { "kylechui/nvim-surround", - config = true, event = { event.buf_new_file, event.buf_read_post, }, + opts = {}, } return surround diff --git a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua index 7508fe5..0fec0b2 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua @@ -1,17 +1,15 @@ ---@type LazyPluginSpec local copilot = { "zbirenbaum/copilot.lua", - config = function() - require "copilot".setup { - suggestion = { - auto_trigger = true, - }, - } - end, cond = function() return string.find(vim.fn.getcwd(), "AtCoder") == nil end, event = require "vim_event".buf_read_post, + opts = { + suggestions = { + auto_trigger = true, + }, + }, } return copilot diff --git a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua index 4d49665..a7f4d33 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua @@ -1,17 +1,15 @@ ---@type LazyPluginSpec local lualine = { "nvim-lualine/lualine.nvim", - config = function() - require "lualine".setup { - options = { - globalstatus = true, - }, - } - end, dependencies = { require "plugins_not_vscode.devicons", require "plugins_not_vscode.vscode", }, + opts = { + options = { + globalstatus = true, + }, + }, } return lualine diff --git a/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua b/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua index 90fb95c..f4633d5 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua @@ -1,27 +1,6 @@ ---@type LazyPluginSpec local neo_tree = { "nvim-neo-tree/neo-tree.nvim", - config = function() - vim.g.neo_tree_remove_legacy_commands = 1 - - require "neo-tree".setup { - close_if_last_window = true, - default_component_configs = { - git_status = { - symbols = { - deleted = "", - }, - }, - }, - filesystem = { - filtered_items = { visible = true }, - follow_current_file = { enabled = true }, - use_libuv_file_watcher = true, - }, - view = { relativenumber = true }, - window = { width = 30 }, - } - end, dependencies = { require "plugins_not_vscode.devicons", require "plugins_not_vscode.nui", @@ -33,6 +12,23 @@ local neo_tree = { require "neo-tree.command"._command "toggle" end, } }, + opts = { + close_if_last_window = true, + default_component_configs = { + git_status = { + symbols = { + deleted = "", + }, + }, + }, + filesystem = { + filtered_items = { visible = true }, + follow_current_file = { enabled = true }, + use_libuv_file_watcher = true, + }, + view = { relativenumber = true }, + window = { width = 30 }, + }, } return neo_tree diff --git a/home-manager/nvim/lua/plugins_not_vscode/neogit.lua b/home-manager/nvim/lua/plugins_not_vscode/neogit.lua index e2fa25b..960af98 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/neogit.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/neogit.lua @@ -2,11 +2,6 @@ local neogit = { "NeogitOrg/neogit", branch = "master", - config = function() - require "neogit".setup { - disable_commit_confirmation = true, - } - end, dependencies = { require "plugins.plenary" }, keys = { { "", @@ -14,6 +9,9 @@ local neogit = { require "neogit".open() end, } }, + opts = { + disable_commit_confirmation = true, + }, } return neogit -- 2.51.2 From 6cfccc4b475e30ae49b62f1724064cd8df8b81dc Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 Aug 2024 21:40:15 +0900 Subject: [PATCH 374/589] Lazy load hex.nvim on cmd execution --- home-manager/nvim/lua/plugins/hex.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/nvim/lua/plugins/hex.lua b/home-manager/nvim/lua/plugins/hex.lua index 4a5b446..1b81364 100644 --- a/home-manager/nvim/lua/plugins/hex.lua +++ b/home-manager/nvim/lua/plugins/hex.lua @@ -1,6 +1,11 @@ ---@type LazyPluginSpec local hex = { "RaafatTurki/hex.nvim", + cmd = { + "HexAssemble", + "HexDump", + "HexToggle", + }, opts = {}, } -- 2.51.2 From 205f41f1b2ac1f7c96ffaf62746a165cdb92cd82 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 Aug 2024 22:43:33 +0900 Subject: [PATCH 375/589] Use `> ` as tab characters --- home-manager/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 645b339..f1c115a 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -94,7 +94,7 @@ vim.opt.list = true vim.opt.listchars = { eol = "↲", space = "・", - tab = " ", + tab = "> ", } vim.opt.number = true vim.opt.updatetime = 1000 -- 2.51.2 From e06c4fa9fd30d1677fb5eb87d1f86ea57190c63c Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 8 Aug 2024 15:47:10 +0900 Subject: [PATCH 376/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 6df9ee1..2a5d1ee 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -15,7 +15,7 @@ "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, + "nvim-autopairs": { "branch": "master", "commit": "4a39f2dcbe1967ddc3a0f76f863540dd3aa7871a" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, @@ -26,5 +26,5 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "vscode.nvim": { "branch": "main", "commit": "f6c88cdf9d37d5c0bb1e492a13a3b4b4cc4dd13e" } + "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } } -- 2.51.2 From ce99a79a9f02ef4eb4c06d6cf2203962b66815a1 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 8 Aug 2024 15:48:50 +0900 Subject: [PATCH 377/589] Delete indent-blankline --- home-manager/nvim/lazy-lock.json | 1 - .../plugins_not_vscode/indent-blankline.lua | 24 ------------------- 2 files changed, 25 deletions(-) delete mode 100644 home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 2a5d1ee..4ef12be 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,7 +8,6 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "hex.nvim": { "branch": "master", "commit": "cbffd2ce4b8be089360e3c95d5909cd511d8840c" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, diff --git a/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua b/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua deleted file mode 100644 index 6584d87..0000000 --- a/home-manager/nvim/lua/plugins_not_vscode/indent-blankline.lua +++ /dev/null @@ -1,24 +0,0 @@ -local event = require "vim_event" - ----@type LazyPluginSpec -local indent_blankline = { - "lukas-reineke/indent-blankline.nvim", - config = function() - local link_to_non_text = { link = "NonText" } - vim.api.nvim_set_hl(0, "IblIndent", link_to_non_text) - vim.api.nvim_set_hl(0, "IblScope", { fg = "#dcdcaa" }) - vim.api.nvim_set_hl(0, "IblWhitespace", link_to_non_text) - require "ibl".setup { - indent = { - char = "│", - }, - } - end, - dependencies = { require "plugins_not_vscode.treesitter" }, - event = { - event.buf_new_file, - event.buf_read_pre, - }, -} - -return indent_blankline -- 2.51.2 From d12cc8deb46971acf2a1b7b593bb914ec6ad833c Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:14:56 +0900 Subject: [PATCH 378/589] Add a setting for `goimports` --- .../nvim/lua/plugins_not_vscode/lspconfig.lua | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index 37248ac..5b7bc5f 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -22,6 +22,28 @@ local lspconfig = { pattern = any_pattern, }, }, + -- https://github.com/golang/tools/blob/master/gopls/doc/vim.md#neovim-imports + { + event = event.buf_write_pre, + config = { + group = vim.api.nvim_create_augroup("goimports", {}), + callback = function() + local params = vim.lsp.util.make_range_params() + params.context = { only = { "source.organizeImports" } } + local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params) + + for cid, res in pairs(result or {}) do + for _, r in pairs(res.result or {}) do + if r.edit then + local enc = (vim.lsp.get_client_by_id(cid) or {}).offset_encodint or "utf-16" + vim.lsp.util.apply_workspace_edit(r.edit, enc) + end + end + end + end, + pattern = "*.go", + }, + }, { event = "CursorHold", config = { -- 2.51.2 From 563070dd11af1d3bfcfd86b14b85a44f835dca13 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:57:52 +0900 Subject: [PATCH 379/589] Automatically determine the go module path --- .../nvim/lua/plugins_not_vscode/lspconfig.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index 5b7bc5f..a88a927 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -72,6 +72,18 @@ local lspconfig = { ---@type string local tsserver = use_deno and "denols" or "tsserver" + ---@type string + local goimports_local + ---@type string + local gomod_path = vim.fn.getcwd() .. "/go.mod" + if vim.fn.filereadable(gomod_path) == 1 then + local f = io.open(gomod_path) + + if f then + goimports_local = vim.split(f:read(), " ")[2] + end + end + ---@type string[] local servers = { "bashls", @@ -97,6 +109,9 @@ local lspconfig = { lsp_config[lsp].setup { capabilities = capabilities, settings = { + gopls = { + ["local"] = goimports_local, + }, json = { schemas = schemas, validate = { enable = true }, -- 2.51.2 From 7e59598f69e2fc1f771fc27f7539df5769072caf Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 13 Aug 2024 12:52:39 +0900 Subject: [PATCH 380/589] Update nvim-autopairs --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 4ef12be..3f61ea2 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -14,7 +14,7 @@ "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "4a39f2dcbe1967ddc3a0f76f863540dd3aa7871a" }, + "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, -- 2.51.2 From e3e4ba8b4d5a24261c757e110d45327286e62047 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 13 Aug 2024 12:53:03 +0900 Subject: [PATCH 381/589] Change go.vim to go.lua --- home-manager/nvim/after/ftplugin/go.lua | 2 ++ home-manager/nvim/after/ftplugin/go.vim | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 home-manager/nvim/after/ftplugin/go.lua delete mode 100644 home-manager/nvim/after/ftplugin/go.vim diff --git a/home-manager/nvim/after/ftplugin/go.lua b/home-manager/nvim/after/ftplugin/go.lua new file mode 100644 index 0000000..43264bd --- /dev/null +++ b/home-manager/nvim/after/ftplugin/go.lua @@ -0,0 +1,2 @@ +vim.opt_local.expandtab = false +vim.opt_local.shiftwidth = 4 diff --git a/home-manager/nvim/after/ftplugin/go.vim b/home-manager/nvim/after/ftplugin/go.vim deleted file mode 100644 index 27ff1dc..0000000 --- a/home-manager/nvim/after/ftplugin/go.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal noexpandtab -setlocal shiftwidth=4 -- 2.51.2 From 0072394e42b386c99e83be8c2a32b38845fa63ca Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 18 Aug 2024 16:26:52 +0900 Subject: [PATCH 382/589] Update lualine.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 3f61ea2..508395d 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -10,7 +10,7 @@ "hex.nvim": { "branch": "master", "commit": "cbffd2ce4b8be089360e3c95d5909cd511d8840c" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, -- 2.51.2 From 323f8fe81b4eb73e1d0f94e9d4dcc46d8beefce7 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:37:21 +0900 Subject: [PATCH 383/589] Install copilot-lualine --- home-manager/nvim/lazy-lock.json | 3 ++- .../nvim/lua/plugins_not_vscode/lualine.lua | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 508395d..98224a7 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,6 +6,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "copilot-lualine": { "branch": "main", "commit": "4cca52f4d4d6c7439c51227d8054e346ef5ff0e0" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "hex.nvim": { "branch": "master", "commit": "cbffd2ce4b8be089360e3c95d5909cd511d8840c" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, @@ -14,7 +15,7 @@ "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" }, + "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, diff --git a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua index a7f4d33..a7058eb 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua @@ -4,11 +4,26 @@ local lualine = { dependencies = { require "plugins_not_vscode.devicons", require "plugins_not_vscode.vscode", + { + "AndreM222/copilot-lualine", + dependencies = { require "plugins_not_vscode.copilot" }, + }, }, opts = { options = { globalstatus = true, }, + sections = { + lualine_x = { + { + "copilot", + show_colors = true + }, + "encoding", + "fileformat", + "filetype", + }, + }, }, } -- 2.51.2 From 25c2791d6513c3d8cf008213fa26b37303377acd Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:48:25 +0900 Subject: [PATCH 384/589] Install gitsigns.nvim --- home-manager/nvim/lazy-lock.json | 1 + .../nvim/lua/plugins_not_vscode/gitsigns.lua | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 home-manager/nvim/lua/plugins_not_vscode/gitsigns.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 98224a7..82067cf 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,6 +8,7 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-lualine": { "branch": "main", "commit": "4cca52f4d4d6c7439c51227d8054e346ef5ff0e0" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, + "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "cbffd2ce4b8be089360e3c95d5909cd511d8840c" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, diff --git a/home-manager/nvim/lua/plugins_not_vscode/gitsigns.lua b/home-manager/nvim/lua/plugins_not_vscode/gitsigns.lua new file mode 100644 index 0000000..dedc41e --- /dev/null +++ b/home-manager/nvim/lua/plugins_not_vscode/gitsigns.lua @@ -0,0 +1,12 @@ +local event = require "vim_event" + +---@type LazyPluginSpec +local gitsigns = { + "lewis6991/gitsigns.nvim", + event = { event.buf_new_file, + event.buf_read_pre, + }, + opts = {}, +} + +return gitsigns -- 2.51.2 From 7df3b684f74732a146d96eeeb7960c859d464186 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:27:33 +0900 Subject: [PATCH 385/589] Configure lualine appearances --- .../nvim/lua/plugins_not_vscode/lualine.lua | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua index a7058eb..ae57650 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lualine.lua @@ -12,17 +12,38 @@ local lualine = { opts = { options = { globalstatus = true, + section_separators = "", }, sections = { + lualine_a = { + { + "mode", + separator = { + right = "", + }, + }, + }, lualine_x = { { "copilot", - show_colors = true + show_colors = true, + }, + { + "encoding", + fmt = function(str) + return string.upper(str) + end, }, - "encoding", "fileformat", - "filetype", + { + "filetype", + fmt = function(str) + return string.gsub(str, "^%l", string.upper) + end, + }, }, + lualine_y = {}, + lualine_z = {}, }, }, } -- 2.51.2 From 0864ec2e01e5d12e89144cc477975d1d7506a03a Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 23 Aug 2024 09:08:12 +0900 Subject: [PATCH 386/589] Upgrade neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 82067cf..d06640f 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -14,7 +14,7 @@ "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, + "neogit": { "branch": "master", "commit": "6af8fc6b03210d0ac99398f8eff27c5be7b2ba8a" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, -- 2.51.2 From 0f34499708eda8bc3d12debf28e5960497954598 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 23 Aug 2024 09:08:27 +0900 Subject: [PATCH 387/589] Enable Copilot for Markdown --- home-manager/nvim/lua/plugins_not_vscode/copilot.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua index 0fec0b2..65e096b 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua @@ -6,6 +6,9 @@ local copilot = { end, event = require "vim_event".buf_read_post, opts = { + filetypes = { + markdown = true, + }, suggestions = { auto_trigger = true, }, -- 2.51.2 From cfbe04239712cb48cbf977b8934d270a9cf6e287 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 23 Aug 2024 09:22:25 +0900 Subject: [PATCH 388/589] Fix typo --- home-manager/nvim/lua/plugins_not_vscode/copilot.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua index 65e096b..9f677e8 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua @@ -9,7 +9,7 @@ local copilot = { filetypes = { markdown = true, }, - suggestions = { + suggestion = { auto_trigger = true, }, }, -- 2.51.2 From 3809c5d81712bc975aca1a1620ceb3f3a669dbab Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 23 Aug 2024 18:39:46 +0900 Subject: [PATCH 389/589] Enable Copilot for YAML --- home-manager/nvim/lua/plugins_not_vscode/copilot.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua index 9f677e8..f409b6d 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/copilot.lua @@ -8,6 +8,7 @@ local copilot = { opts = { filetypes = { markdown = true, + yaml = true, }, suggestion = { auto_trigger = true, -- 2.51.2 From f0c6d99c91141f6ff5e8f4eb71da8517bae4b56d Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 26 Aug 2024 14:03:16 +0900 Subject: [PATCH 390/589] Make tab background transparent --- home-manager/nvim/lua/plugins_not_vscode/barbar.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/nvim/lua/plugins_not_vscode/barbar.lua b/home-manager/nvim/lua/plugins_not_vscode/barbar.lua index 2cda482..933993b 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/barbar.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/barbar.lua @@ -37,6 +37,9 @@ end ---@type LazyPluginSpec local barbar = { "romgrk/barbar.nvim", + config = function() + vim.api.nvim_set_hl(0, "BufferTabpageFill", {}) + end, dependencies = { require "plugins_not_vscode.devicons" }, event = { event.buf_new_file, -- 2.51.2 From a2a1a802dcd62a766ce10699408419d122971205 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 30 Aug 2024 21:55:07 +0900 Subject: [PATCH 391/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index d06640f..a93c277 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -14,7 +14,7 @@ "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neogit": { "branch": "master", "commit": "6af8fc6b03210d0ac99398f8eff27c5be7b2ba8a" }, + "neogit": { "branch": "master", "commit": "8a60ac4b97c1a7c667506425cb9d5ffca5b8dc8d" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, -- 2.51.2 From 0624385853fe0d2a888a45a072867c264c455345 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 5 Sep 2024 21:05:48 +0900 Subject: [PATCH 392/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index a93c277..cc5a294 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,17 +6,17 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot-lualine": { "branch": "main", "commit": "4cca52f4d4d6c7439c51227d8054e346ef5ff0e0" }, + "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, - "hex.nvim": { "branch": "master", "commit": "cbffd2ce4b8be089360e3c95d5909cd511d8840c" }, + "hex.nvim": { "branch": "master", "commit": "d0f553dcd2c08d226026d769119b2eb6b09b8dfd" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neogit": { "branch": "master", "commit": "8a60ac4b97c1a7c667506425cb9d5ffca5b8dc8d" }, + "neogit": { "branch": "master", "commit": "9bc4ee89bb42be31a2f0b1da41e36e3e6cab9bbb" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, + "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, -- 2.51.2 From 4b154a234bc03ea064e746224ec821f26f293dec Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 5 Sep 2024 21:06:01 +0900 Subject: [PATCH 393/589] Check if deno.jsonc exists --- home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index a88a927..fac160d 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -68,7 +68,8 @@ local lspconfig = { capabilities.textDocument.completion.completionItem.snippetSupport = true ---@type boolean - local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. "/deno.json") == 1 + local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. "/deno.json") == 1 or + vim.fn.filereadable(vim.fn.getcwd() .. "/deno.jsonc") == 1 ---@type string local tsserver = use_deno and "denols" or "tsserver" -- 2.51.2 From 9d4cb36a9f1d3f36a01a102a6770b609b6765fe4 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 14 Sep 2024 15:39:47 +0900 Subject: [PATCH 394/589] Upgrade lspconfig --- home-manager/nvim/lazy-lock.json | 2 +- home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index cc5a294..a05cccb 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -18,7 +18,7 @@ "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" }, + "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index fac160d..f9ae828 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -69,9 +69,9 @@ local lspconfig = { ---@type boolean local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. "/deno.json") == 1 or - vim.fn.filereadable(vim.fn.getcwd() .. "/deno.jsonc") == 1 + vim.fn.filereadable(vim.fn.getcwd() .. "/deno.jsonc") == 1 ---@type string - local tsserver = use_deno and "denols" or "tsserver" + local tsserver = use_deno and "denols" or "ts_ls" ---@type string local goimports_local -- 2.51.2 From 78c391bf208dfad3a4575032603a15ef947cf557 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 14 Sep 2024 15:40:39 +0900 Subject: [PATCH 395/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index a05cccb..23a9e50 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -7,14 +7,14 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, - "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, + "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "d0f553dcd2c08d226026d769119b2eb6b09b8dfd" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neogit": { "branch": "master", "commit": "9bc4ee89bb42be31a2f0b1da41e36e3e6cab9bbb" }, + "neogit": { "branch": "master", "commit": "e78c3e4bd93e650c8836d3740ab5693ed6e52297" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, -- 2.51.2 From 1b8f6174914efbaa809facd0c66ee26180e32c42 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 17 Sep 2024 18:06:46 +0900 Subject: [PATCH 396/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 23a9e50..ebe1b4c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -14,9 +14,9 @@ "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neogit": { "branch": "master", "commit": "e78c3e4bd93e650c8836d3740ab5693ed6e52297" }, + "neogit": { "branch": "master", "commit": "cfbdc888cdfb3cb675615eb96467d980b73b3da5" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, + "nvim-autopairs": { "branch": "master", "commit": "ffc139f2a96640ca6c4d3dff9b95b7b9eace87ae" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, -- 2.51.2 From c7912f62588f8242e798f172c0d465ff1ab40a54 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 17 Sep 2024 18:06:55 +0900 Subject: [PATCH 397/589] Use tab for indentation of gitconfig --- home-manager/nvim/after/ftplugin/gitconfig.lua | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 home-manager/nvim/after/ftplugin/gitconfig.lua diff --git a/home-manager/nvim/after/ftplugin/gitconfig.lua b/home-manager/nvim/after/ftplugin/gitconfig.lua new file mode 100644 index 0000000..43264bd --- /dev/null +++ b/home-manager/nvim/after/ftplugin/gitconfig.lua @@ -0,0 +1,2 @@ +vim.opt_local.expandtab = false +vim.opt_local.shiftwidth = 4 -- 2.51.2 From b6e21ac950d2739c5bee311971659be36134b424 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 23 Sep 2024 03:38:33 +0000 Subject: [PATCH 398/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ebe1b4c..0cdf922 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -13,10 +13,10 @@ "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, - "neogit": { "branch": "master", "commit": "cfbdc888cdfb3cb675615eb96467d980b73b3da5" }, + "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, + "neogit": { "branch": "master", "commit": "9959b58a897036ce89d47385021db1f716613399" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "ffc139f2a96640ca6c4d3dff9b95b7b9eace87ae" }, + "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, @@ -24,7 +24,7 @@ "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, + "schemastore.nvim": { "branch": "main", "commit": "efa0466f9f7971256ad5da010832180fc7d8996b" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } -- 2.51.2 From 0f68d0902ae4cca615f3deeb0cf5cac33e85875c Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:43:52 +0900 Subject: [PATCH 399/589] Update schemastore.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 0cdf922..74ababe 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -24,7 +24,7 @@ "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "schemastore.nvim": { "branch": "main", "commit": "efa0466f9f7971256ad5da010832180fc7d8996b" }, + "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } -- 2.51.2 From 7fd475020dd319fbb6d8dad443e829676ff8d293 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:11:32 +0900 Subject: [PATCH 400/589] Use transparent window if running on WezTerm --- home-manager/nvim/lua/plugins_not_vscode/vscode.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/vscode.lua b/home-manager/nvim/lua/plugins_not_vscode/vscode.lua index acfd229..c0c4e1b 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/vscode.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/vscode.lua @@ -3,7 +3,8 @@ local vscode_plugin = { "Mofiqul/vscode.nvim", config = function() local vscode = require "vscode" - vscode.setup { transparent = true } + local wezterm_pane = os.getenv "WEZTERM_PANE" + vscode.setup { transparent = wezterm_pane and true or false } vscode.load() end, } -- 2.51.2 From d5ba1dcc23c133d9f0b2881ac3ced1706adb6cd6 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:28:08 +0900 Subject: [PATCH 401/589] Disable autopep8 to use yapf --- home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index f9ae828..853fa42 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -117,6 +117,11 @@ local lspconfig = { schemas = schemas, validate = { enable = true }, }, + pylsp = { + plugins = { + autopep8 = { enabled = false }, + }, + }, texlab = { build = { args = { -- 2.51.2 From 16ad9e920e43da9c3f454af82af248ad86cdced9 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:31:15 +0900 Subject: [PATCH 402/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 74ababe..9dddabb 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -14,7 +14,7 @@ "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "9959b58a897036ce89d47385021db1f716613399" }, + "neogit": { "branch": "master", "commit": "d6f5bdd4344d3f07fb6932834f9009b55eb8a511" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, -- 2.51.2 From fcb62d3874803e4aefdfa195b3594bcb639116e0 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 28 Sep 2024 12:53:01 +0900 Subject: [PATCH 403/589] Add plugin vim-skim-synctex --- home-manager/nvim/lazy-lock.json | 4 ++- home-manager/nvim/lua/plugins/denops.lua | 5 +++ .../nvim/lua/plugins_not_vscode/lspconfig.lua | 1 - .../lua/plugins_not_vscode/skim-synctex.lua | 34 +++++++++++++++++++ home-manager/nvim/lua/vim_event/init.lua | 1 + 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 home-manager/nvim/lua/plugins/denops.lua create mode 100644 home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 9dddabb..321c7a3 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,10 +8,11 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" }, + "denops.vim": { "branch": "main", "commit": "d3f43a20d0c6bbd7935a97550447aea510248c0b" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "d0f553dcd2c08d226026d769119b2eb6b09b8dfd" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, + "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "neogit": { "branch": "master", "commit": "d6f5bdd4344d3f07fb6932834f9009b55eb8a511" }, @@ -27,5 +28,6 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, + "vim-skim-synctex": { "branch": "main", "commit": "7ffdd8077d12f1b55e177e1b64edd2c96def7545" }, "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } } diff --git a/home-manager/nvim/lua/plugins/denops.lua b/home-manager/nvim/lua/plugins/denops.lua new file mode 100644 index 0000000..61e74a0 --- /dev/null +++ b/home-manager/nvim/lua/plugins/denops.lua @@ -0,0 +1,5 @@ +---@type LazyPluginSpec +return { + "vim-denops/denops.vim", + lazy = true, +} diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index 853fa42..e69a0a1 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -125,7 +125,6 @@ local lspconfig = { texlab = { build = { args = { - "-synctex=1", "%f", }, onSave = true, diff --git a/home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua b/home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua new file mode 100644 index 0000000..85dbb5b --- /dev/null +++ b/home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua @@ -0,0 +1,34 @@ +---@type LazyPluginSpec +return { + "ryota2357/vim-skim-synctex", + config = function() + vim.fn["synctex#option"]("autoActive", true) + -- vim.fn["synctex#option"]("autoQuit", true) + vim.fn["synctex#option"]("readingBar", true) + vim.fn["synctex#start"]() + + -- Not working + --[[ + require "vim_util".create_autocmd { + event = require "vim_event".vim_leave_pre, + config = { + group = vim.api.nvim_create_augroup("synctex_stop", {}), + callback = function() + vim.fn["synctex#stop"]() + end, + pattern = "*", + }, + } + ]] -- + end, + dependencies = { + require "plugins.denops", + }, + ft = "tex", + keys = { { + "s", + function() + vim.fn["synctex#forwardSerch"]() + end, + } }, +} diff --git a/home-manager/nvim/lua/vim_event/init.lua b/home-manager/nvim/lua/vim_event/init.lua index 1b96c33..57f5654 100644 --- a/home-manager/nvim/lua/vim_event/init.lua +++ b/home-manager/nvim/lua/vim_event/init.lua @@ -3,6 +3,7 @@ local M = { buf_read_post = "BufReadPost", buf_read_pre = "BufReadPre", buf_write_pre = "BufWritePre", + -- vim_leave_pre = "VimLeavePre", insert_enter = "InsertEnter", } -- 2.51.2 From 3549b8e35c73b0e3ddc7b9d24b78dc26e02dfc7b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 28 Sep 2024 13:02:11 +0900 Subject: [PATCH 404/589] Set mode of trouble.nvim --- home-manager/nvim/lua/plugins_not_vscode/trouble.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/trouble.lua b/home-manager/nvim/lua/plugins_not_vscode/trouble.lua index 09e866a..98cd090 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/trouble.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/trouble.lua @@ -5,7 +5,7 @@ local trouble = { keys = { { "m", function() - require "trouble".toggle() + require "trouble".toggle "diagnostics" end, } }, } -- 2.51.2 From 89844bbfd0837da579cbf75d00a45481748539ad Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:13:47 +0900 Subject: [PATCH 405/589] Add `precedes` --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index f1c115a..5b5374b 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -93,6 +93,7 @@ vim.opt.laststatus = 3 vim.opt.list = true vim.opt.listchars = { eol = "↲", + precedes = "<", space = "・", tab = "> ", } -- 2.51.2 From 018ac0b49027d31aabc01cff43938fe795920b89 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:55:25 +0900 Subject: [PATCH 406/589] Delete TeX ftplugin Use latexindent instead --- home-manager/nvim/after/ftplugin/tex.lua | 45 ------------------------ 1 file changed, 45 deletions(-) delete mode 100644 home-manager/nvim/after/ftplugin/tex.lua diff --git a/home-manager/nvim/after/ftplugin/tex.lua b/home-manager/nvim/after/ftplugin/tex.lua deleted file mode 100644 index 3a74ff9..0000000 --- a/home-manager/nvim/after/ftplugin/tex.lua +++ /dev/null @@ -1,45 +0,0 @@ -local util = require "vim_util" -local event = require "vim_event" -local pattern_tex = "*.tex" - ----@type autoCmd[] -local autocmds = { - { - event = event.buf_write_pre, - config = { - group = util.create_augroup "tex_fmt", - callback = function() - local position = vim.fn.getcharpos "." - ---@type integer - local line_count = vim.api.nvim_buf_line_count(0) - ---@type string[] - local buf_lines = vim.api.nvim_buf_get_lines(0, 0, line_count, true) - for i, line in ipairs(buf_lines) do - line = string.gsub(line, "。", ".") - line = string.gsub(line, "、", ",") - buf_lines[i] = line - end - vim.api.nvim_buf_set_lines(0, 0, line_count, true, buf_lines) - vim.fn.setcharpos(".", position) - end, - pattern = pattern_tex, - }, - }, - { - event = "BufWritePost", - config = { - group = util.create_augroup "tex_clean", - callback = function() - local fls_files = vim.fn.glob("*.fls", false, true) - for _, fls_file in ipairs(fls_files) do - vim.fn.delete(fls_file) - end - end, - pattern = pattern_tex, - }, - }, -} - -for _, autocmd in ipairs(autocmds) do - util.create_autocmd(autocmd) -end -- 2.51.2 From 17a6dca09e64db89a73981e5d49fb542221f7c0e Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 28 Sep 2024 22:43:18 +0900 Subject: [PATCH 407/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 321c7a3..454eac6 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -15,7 +15,7 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "d6f5bdd4344d3f07fb6932834f9009b55eb8a511" }, + "neogit": { "branch": "master", "commit": "641ae8fc7dc76ba9f1e72a6223b966fb0d7ff8f8" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, -- 2.51.2 From 92ce1f6108be460768e8eafcbed5d86ca5e14ab6 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 29 Sep 2024 14:27:38 +0900 Subject: [PATCH 408/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 454eac6..fff5cb6 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -15,7 +15,7 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "641ae8fc7dc76ba9f1e72a6223b966fb0d7ff8f8" }, + "neogit": { "branch": "master", "commit": "75ee709d18625a94aef90d94ccac4e562c9a0046" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, -- 2.51.2 From 4a5aaaf51f0092c98145b6048e6d9a0382ea0684 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 29 Sep 2024 14:28:03 +0900 Subject: [PATCH 409/589] Use `TERM_PROGRAM` environment variable --- home-manager/nvim/lua/plugins_not_vscode/vscode.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/vscode.lua b/home-manager/nvim/lua/plugins_not_vscode/vscode.lua index c0c4e1b..c923c58 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/vscode.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/vscode.lua @@ -3,8 +3,8 @@ local vscode_plugin = { "Mofiqul/vscode.nvim", config = function() local vscode = require "vscode" - local wezterm_pane = os.getenv "WEZTERM_PANE" - vscode.setup { transparent = wezterm_pane and true or false } + local is_wezterm = os.getenv "TERM_PROGRAM" == "WezTerm" + vscode.setup { transparent = is_wezterm } vscode.load() end, } -- 2.51.2 From 5ef4dfdd417da96861da289daa6e268d857d9002 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 29 Sep 2024 14:47:44 +0900 Subject: [PATCH 410/589] Install CopilotChat.nvim --- home-manager/nvim/lazy-lock.json | 1 + .../nvim/lua/plugins_not_vscode/copilotchat.lua | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 home-manager/nvim/lua/plugins_not_vscode/copilotchat.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index fff5cb6..794586b 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,4 +1,5 @@ { + "CopilotChat.nvim": { "branch": "canary", "commit": "9333944fde3c65868818e245c73aa29eef826e9b" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, diff --git a/home-manager/nvim/lua/plugins_not_vscode/copilotchat.lua b/home-manager/nvim/lua/plugins_not_vscode/copilotchat.lua new file mode 100644 index 0000000..de02b05 --- /dev/null +++ b/home-manager/nvim/lua/plugins_not_vscode/copilotchat.lua @@ -0,0 +1,13 @@ +---@type LazyPluginSpec +return { + "CopilotC-Nvim/CopilotChat.nvim", + build = "make tiktoken", + cmd = { + "CopilotChatToggle", + }, + dependencies = { + require "plugins_not_vscode.copilot", + require "plugins.plenary", + }, + opts = {}, +} -- 2.51.2 From e7b1f909f680a433efa01dd80b2b07e327078013 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 29 Sep 2024 16:16:47 +0900 Subject: [PATCH 411/589] Assign `vim.lsp.buf.code_action` to `a` --- home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 4 ++++ home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index e69a0a1..b39378c 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -152,6 +152,10 @@ local lspconfig = { event.buf_read_pre, }, keys = { + { + "a", + vim.lsp.buf.code_action, + }, { "h", vim.lsp.buf.hover, diff --git a/home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua b/home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua index 85dbb5b..ad43aee 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua @@ -26,7 +26,7 @@ return { }, ft = "tex", keys = { { - "s", + "s", function() vim.fn["synctex#forwardSerch"]() end, -- 2.51.2 From 15ee3365411b1393ac1544f4c57e4a84cdf3ea4e Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 30 Sep 2024 09:23:37 +0900 Subject: [PATCH 412/589] Update nvim-scrollview --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 794586b..7cf7a47 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -21,7 +21,7 @@ "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, - "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" }, + "nvim-scrollview": { "branch": "main", "commit": "2a0ba552442638d1746379d8b8f3ba2df7d0bdf0" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, -- 2.51.2 From 041945ed0a93a47c773fe6b0b09653fc2c14a047 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 3 Oct 2024 13:01:25 +0900 Subject: [PATCH 413/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7cf7a47..808649f 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,9 +16,9 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "75ee709d18625a94aef90d94ccac4e562c9a0046" }, + "neogit": { "branch": "master", "commit": "dd615c353a13e87bb330508a0562c68d0b44d90c" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, + "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "2a0ba552442638d1746379d8b8f3ba2df7d0bdf0" }, -- 2.51.2 From 11d2e5b711dc86db252fc7831d3aa720b049b602 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 6 Oct 2024 16:16:32 +0900 Subject: [PATCH 414/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 808649f..23476aa 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "dd615c353a13e87bb330508a0562c68d0b44d90c" }, + "neogit": { "branch": "master", "commit": "d55bf6114c6cfba013e4c0e817e29e7752554ab7" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, -- 2.51.2 From 0889e9ebf5cd670146173d9cf9a3567f66af4c1a Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 6 Oct 2024 16:23:54 +0900 Subject: [PATCH 415/589] Add filetype `markdown.mdx` (close #284) --- home-manager/nvim/init.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 5b5374b..4043eaf 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -86,6 +86,12 @@ vim.diagnostic.config { vim.api.nvim_set_keymap("t", "", "", { noremap = true }) +vim.filetype.add { + extension = { + mdx = "markdown.mdx", + }, +} + vim.opt.cmdheight = 0 vim.opt.expandtab = true vim.opt.fileformats = { "unix", "dos" } -- 2.51.2 From d020abde7ce4c35ffbc31048e13531d24377c867 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 6 Oct 2024 17:17:25 +0900 Subject: [PATCH 416/589] Add MDX ftplugin --- home-manager/nvim/after/ftplugin/markdown.mdx.lua | 1 + 1 file changed, 1 insertion(+) create mode 100644 home-manager/nvim/after/ftplugin/markdown.mdx.lua diff --git a/home-manager/nvim/after/ftplugin/markdown.mdx.lua b/home-manager/nvim/after/ftplugin/markdown.mdx.lua new file mode 100644 index 0000000..a920bb8 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/markdown.mdx.lua @@ -0,0 +1 @@ +require "ftbase.text" -- 2.51.2 From 38181fbb0db1308e239e46da455bc285d4024d86 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:55:52 +0900 Subject: [PATCH 417/589] Set up Typst writing environment --- home-manager/nvim/after/ftplugin/typst.lua | 5 +++++ home-manager/nvim/lazy-lock.json | 3 ++- home-manager/nvim/lua/plugins/typst-preview.lua | 8 ++++++++ home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 home-manager/nvim/after/ftplugin/typst.lua create mode 100644 home-manager/nvim/lua/plugins/typst-preview.lua diff --git a/home-manager/nvim/after/ftplugin/typst.lua b/home-manager/nvim/after/ftplugin/typst.lua new file mode 100644 index 0000000..9bf3222 --- /dev/null +++ b/home-manager/nvim/after/ftplugin/typst.lua @@ -0,0 +1,5 @@ +require "ftbase.text" + +require "nvim-autopairs".add_rule( + require "nvim-autopairs.rule" ("$", "$", "typst") +) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 23476aa..55ea125 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "d55bf6114c6cfba013e4c0e817e29e7752554ab7" }, + "neogit": { "branch": "master", "commit": "c3ff049446e0920d02a5828c4e3619243d3c6e15" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, @@ -29,6 +29,7 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, + "typst-preview.nvim": { "branch": "master", "commit": "0354cc1a7a5174a2e69cdc21c4db9a3ee18bb20a" }, "vim-skim-synctex": { "branch": "main", "commit": "7ffdd8077d12f1b55e177e1b64edd2c96def7545" }, "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } } diff --git a/home-manager/nvim/lua/plugins/typst-preview.lua b/home-manager/nvim/lua/plugins/typst-preview.lua new file mode 100644 index 0000000..4a49a93 --- /dev/null +++ b/home-manager/nvim/lua/plugins/typst-preview.lua @@ -0,0 +1,8 @@ +---@type LazyPluginSpec +return { + "chomosuke/typst-preview.nvim", + build = function() + require "typst-preview".update() + end, + ft = "typst", +} diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index b39378c..4f5d79d 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -98,6 +98,7 @@ local lspconfig = { "nim_langserver", "texlab", "pylsp", + "typst_lsp", "vuels", "yamlls", tsserver, -- 2.51.2 From 54e4b82fccd423a500fd00089499eeff731dc0b1 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 12 Oct 2024 08:25:16 +0900 Subject: [PATCH 418/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 55ea125..43d0a45 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -11,17 +11,17 @@ "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" }, "denops.vim": { "branch": "main", "commit": "d3f43a20d0c6bbd7935a97550447aea510248c0b" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, - "hex.nvim": { "branch": "master", "commit": "d0f553dcd2c08d226026d769119b2eb6b09b8dfd" }, + "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "c3ff049446e0920d02a5828c4e3619243d3c6e15" }, + "neogit": { "branch": "master", "commit": "bab8703a4d5406548ab7feb47efbabf023f5ae1a" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, - "nvim-scrollview": { "branch": "main", "commit": "2a0ba552442638d1746379d8b8f3ba2df7d0bdf0" }, + "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, @@ -29,7 +29,7 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "typst-preview.nvim": { "branch": "master", "commit": "0354cc1a7a5174a2e69cdc21c4db9a3ee18bb20a" }, + "typst-preview.nvim": { "branch": "master", "commit": "7933922c1ff15fb47a13686ff9bb60e9fef5a157" }, "vim-skim-synctex": { "branch": "main", "commit": "7ffdd8077d12f1b55e177e1b64edd2c96def7545" }, "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } } -- 2.51.2 From d2247f0cb261d30bbd91ffcdc2bf528101fbb0cb Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 12 Oct 2024 08:48:52 +0900 Subject: [PATCH 419/589] Migrate to tinymist --- home-manager/nvim/lua/plugins/typst-preview.lua | 5 +++++ home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/typst-preview.lua b/home-manager/nvim/lua/plugins/typst-preview.lua index 4a49a93..f8993e4 100644 --- a/home-manager/nvim/lua/plugins/typst-preview.lua +++ b/home-manager/nvim/lua/plugins/typst-preview.lua @@ -5,4 +5,9 @@ return { require "typst-preview".update() end, ft = "typst", + opts = { + dependencies_bin = { + tinymist = "tinymist", + }, + }, } diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua index 4f5d79d..bbf36ac 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua +++ b/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua @@ -98,7 +98,7 @@ local lspconfig = { "nim_langserver", "texlab", "pylsp", - "typst_lsp", + "tinymist", "vuels", "yamlls", tsserver, @@ -136,6 +136,8 @@ local lspconfig = { }, yaml = { keyOrdering = false }, }, + -- To make tinymist work outside of a git repo + single_file_support = true, } end -- 2.51.2 From 83edfa5df7ed5ec1b1e69e8c928464758436c744 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 12 Oct 2024 09:25:35 +0900 Subject: [PATCH 420/589] Delete VSCode-related settings --- home-manager/nvim/init.lua | 8 +------- .../nvim/lua/{plugins_not_vscode => plugins}/barbar.lua | 2 +- .../nvim/lua/{plugins_not_vscode => plugins}/cmp.lua | 2 +- .../nvim/lua/{plugins_not_vscode => plugins}/copilot.lua | 0 .../lua/{plugins_not_vscode => plugins}/copilotchat.lua | 2 +- .../nvim/lua/{plugins_not_vscode => plugins}/devicons.lua | 0 .../nvim/lua/{plugins_not_vscode => plugins}/gitsigns.lua | 0 .../lua/{plugins_not_vscode => plugins}/lspconfig.lua | 0 .../nvim/lua/{plugins_not_vscode => plugins}/lualine.lua | 6 +++--- .../nvim/lua/{plugins_not_vscode => plugins}/neo-tree.lua | 4 ++-- .../nvim/lua/{plugins_not_vscode => plugins}/neogit.lua | 0 .../nvim/lua/{plugins_not_vscode => plugins}/nui.lua | 0 .../lua/{plugins_not_vscode => plugins}/scrollview.lua | 0 .../lua/{plugins_not_vscode => plugins}/skim-synctex.lua | 0 .../lua/{plugins_not_vscode => plugins}/telescope.lua | 4 ++-- .../lua/{plugins_not_vscode => plugins}/treesitter.lua | 0 .../nvim/lua/{plugins_not_vscode => plugins}/trouble.lua | 0 .../nvim/lua/{plugins_not_vscode => plugins}/vscode.lua | 0 18 files changed, 11 insertions(+), 17 deletions(-) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/barbar.lua (92%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/cmp.lua (97%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/copilot.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/copilotchat.lua (83%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/devicons.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/gitsigns.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/lspconfig.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/lualine.lua (85%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/neo-tree.lua (88%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/neogit.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/nui.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/scrollview.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/skim-synctex.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/telescope.lua (94%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/treesitter.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/trouble.lua (100%) rename home-manager/nvim/lua/{plugins_not_vscode => plugins}/vscode.lua (100%) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 4043eaf..3143567 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -12,6 +12,7 @@ require "lazy".setup { defaults = { version = "*", }, + spec = { import = "plugins" }, performance = { rtp = { disabled_plugins = { @@ -24,13 +25,6 @@ require "lazy".setup { }, }, }, - spec = { - { import = "plugins" }, - { - import = "plugins_not_vscode", - cond = not vim.g.vscode, - }, - }, } local uname = vim.uv.os_uname() diff --git a/home-manager/nvim/lua/plugins_not_vscode/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua similarity index 92% rename from home-manager/nvim/lua/plugins_not_vscode/barbar.lua rename to home-manager/nvim/lua/plugins/barbar.lua index 933993b..0635ce4 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -40,7 +40,7 @@ local barbar = { config = function() vim.api.nvim_set_hl(0, "BufferTabpageFill", {}) end, - dependencies = { require "plugins_not_vscode.devicons" }, + dependencies = { require "plugins.devicons" }, event = { event.buf_new_file, event.buf_read_pre, diff --git a/home-manager/nvim/lua/plugins_not_vscode/cmp.lua b/home-manager/nvim/lua/plugins/cmp.lua similarity index 97% rename from home-manager/nvim/lua/plugins_not_vscode/cmp.lua rename to home-manager/nvim/lua/plugins/cmp.lua index 94ab5a4..70e0e50 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/cmp.lua +++ b/home-manager/nvim/lua/plugins/cmp.lua @@ -70,7 +70,7 @@ local cmp = { "hrsh7th/cmp-nvim-lua", { "hrsh7th/cmp-nvim-lsp", - dependencies = { require "plugins_not_vscode.lspconfig" }, + dependencies = { require "plugins.lspconfig" }, }, "hrsh7th/cmp-path", "onsails/lspkind.nvim", diff --git a/home-manager/nvim/lua/plugins_not_vscode/copilot.lua b/home-manager/nvim/lua/plugins/copilot.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/copilot.lua rename to home-manager/nvim/lua/plugins/copilot.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/copilotchat.lua b/home-manager/nvim/lua/plugins/copilotchat.lua similarity index 83% rename from home-manager/nvim/lua/plugins_not_vscode/copilotchat.lua rename to home-manager/nvim/lua/plugins/copilotchat.lua index de02b05..a881c3c 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/copilotchat.lua +++ b/home-manager/nvim/lua/plugins/copilotchat.lua @@ -6,7 +6,7 @@ return { "CopilotChatToggle", }, dependencies = { - require "plugins_not_vscode.copilot", + require "plugins.copilot", require "plugins.plenary", }, opts = {}, diff --git a/home-manager/nvim/lua/plugins_not_vscode/devicons.lua b/home-manager/nvim/lua/plugins/devicons.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/devicons.lua rename to home-manager/nvim/lua/plugins/devicons.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/gitsigns.lua b/home-manager/nvim/lua/plugins/gitsigns.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/gitsigns.lua rename to home-manager/nvim/lua/plugins/gitsigns.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/lspconfig.lua rename to home-manager/nvim/lua/plugins/lspconfig.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua similarity index 85% rename from home-manager/nvim/lua/plugins_not_vscode/lualine.lua rename to home-manager/nvim/lua/plugins/lualine.lua index ae57650..cfda7b5 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -2,11 +2,11 @@ local lualine = { "nvim-lualine/lualine.nvim", dependencies = { - require "plugins_not_vscode.devicons", - require "plugins_not_vscode.vscode", + require "plugins.devicons", + require "plugins.vscode", { "AndreM222/copilot-lualine", - dependencies = { require "plugins_not_vscode.copilot" }, + dependencies = { require "plugins.copilot" }, }, }, opts = { diff --git a/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua b/home-manager/nvim/lua/plugins/neo-tree.lua similarity index 88% rename from home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua rename to home-manager/nvim/lua/plugins/neo-tree.lua index f4633d5..0311b4e 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/neo-tree.lua +++ b/home-manager/nvim/lua/plugins/neo-tree.lua @@ -2,8 +2,8 @@ local neo_tree = { "nvim-neo-tree/neo-tree.nvim", dependencies = { - require "plugins_not_vscode.devicons", - require "plugins_not_vscode.nui", + require "plugins.devicons", + require "plugins.nui", require "plugins.plenary", }, keys = { { diff --git a/home-manager/nvim/lua/plugins_not_vscode/neogit.lua b/home-manager/nvim/lua/plugins/neogit.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/neogit.lua rename to home-manager/nvim/lua/plugins/neogit.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/nui.lua b/home-manager/nvim/lua/plugins/nui.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/nui.lua rename to home-manager/nvim/lua/plugins/nui.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/scrollview.lua b/home-manager/nvim/lua/plugins/scrollview.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/scrollview.lua rename to home-manager/nvim/lua/plugins/scrollview.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua b/home-manager/nvim/lua/plugins/skim-synctex.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/skim-synctex.lua rename to home-manager/nvim/lua/plugins/skim-synctex.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua similarity index 94% rename from home-manager/nvim/lua/plugins_not_vscode/telescope.lua rename to home-manager/nvim/lua/plugins/telescope.lua index 1affee8..665d2b9 100644 --- a/home-manager/nvim/lua/plugins_not_vscode/telescope.lua +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -43,9 +43,9 @@ local telescope = { } end, dependencies = { - require "plugins_not_vscode.devicons", + require "plugins.devicons", require "plugins.plenary", - require "plugins_not_vscode.treesitter", + require "plugins.treesitter", }, keys = { { diff --git a/home-manager/nvim/lua/plugins_not_vscode/treesitter.lua b/home-manager/nvim/lua/plugins/treesitter.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/treesitter.lua rename to home-manager/nvim/lua/plugins/treesitter.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/trouble.lua b/home-manager/nvim/lua/plugins/trouble.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/trouble.lua rename to home-manager/nvim/lua/plugins/trouble.lua diff --git a/home-manager/nvim/lua/plugins_not_vscode/vscode.lua b/home-manager/nvim/lua/plugins/vscode.lua similarity index 100% rename from home-manager/nvim/lua/plugins_not_vscode/vscode.lua rename to home-manager/nvim/lua/plugins/vscode.lua -- 2.51.2 From ea2601a965f3fdc788242e5a607050e55be8bb65 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 12 Oct 2024 09:25:50 +0900 Subject: [PATCH 421/589] Update typst-preview.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 43d0a45..50342dc 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -29,7 +29,7 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "typst-preview.nvim": { "branch": "master", "commit": "7933922c1ff15fb47a13686ff9bb60e9fef5a157" }, + "typst-preview.nvim": { "branch": "master", "commit": "a53a136f893a59635166afcb4f277f581bd4bc73" }, "vim-skim-synctex": { "branch": "main", "commit": "7ffdd8077d12f1b55e177e1b64edd2c96def7545" }, "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } } -- 2.51.2 From 909d940a3e445fe649e943af0844557b55325630 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:23:07 +0900 Subject: [PATCH 422/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 50342dc..079a98b 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "bab8703a4d5406548ab7feb47efbabf023f5ae1a" }, + "neogit": { "branch": "master", "commit": "df4d61d41473360c32bafae838d817efa8d31f92" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, -- 2.51.2 From e5ae698f02518d42ccc928e88d33e75c385eadc8 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 22 Oct 2024 22:04:32 +0900 Subject: [PATCH 423/589] Add rust-analyzer --- home-manager/nvim/lua/plugins/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index bbf36ac..a444115 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -98,6 +98,7 @@ local lspconfig = { "nim_langserver", "texlab", "pylsp", + "rust_analyzer", "tinymist", "vuels", "yamlls", -- 2.51.2 From e1e03a81873ef49ae7f4191919713c880342a334 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 22 Oct 2024 23:55:08 +0900 Subject: [PATCH 424/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 079a98b..94db426 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, - "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" }, + "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, "denops.vim": { "branch": "main", "commit": "d3f43a20d0c6bbd7935a97550447aea510248c0b" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, @@ -16,10 +16,10 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "df4d61d41473360c32bafae838d817efa8d31f92" }, + "neogit": { "branch": "master", "commit": "9f504c720b5a5d5a08625bf6197c8ef799b2205c" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, @@ -29,7 +29,7 @@ "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "typst-preview.nvim": { "branch": "master", "commit": "a53a136f893a59635166afcb4f277f581bd4bc73" }, + "typst-preview.nvim": { "branch": "master", "commit": "0f43ed7fa661617751bfd0ca2f01ee13eba6569e" }, "vim-skim-synctex": { "branch": "main", "commit": "7ffdd8077d12f1b55e177e1b64edd2c96def7545" }, "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } } -- 2.51.2 From d3e2be86c7a92012e642e9aabca1b6906596992b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 23 Oct 2024 00:43:11 +0900 Subject: [PATCH 425/589] Show ahead/behind commit info --- home-manager/nvim/lua/plugins/lualine.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index cfda7b5..c338a49 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -23,6 +23,19 @@ local lualine = { }, }, }, + lualine_b = { + "branch", + { + function() + local output = io.popen "git rev-list --left-right --count HEAD...@{upstream}":read() + local ahead, behind = string.match(output, "(%d+)%s+(%d+)") + return behind .. " " .. ahead .. "" + end, + color = "NonText", + }, + "diff", + "diagnostics", + }, lualine_x = { { "copilot", -- 2.51.2 From c0e7e170fcbba61fbfcbb053d1ce695cda3ff0c6 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:16:25 +0900 Subject: [PATCH 426/589] Don't show commit count when not in a repository --- home-manager/nvim/lua/plugins/lualine.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index c338a49..12f8164 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -32,6 +32,9 @@ local lualine = { return behind .. " " .. ahead .. "" end, color = "NonText", + cond = function() + return os.execute "git rev-parse --is-inside-work-tree > /dev/null 2>&1" + end, }, "diff", "diagnostics", -- 2.51.2 From 66924b6cfa5322df16570cc2e8f58ff479557700 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:16:54 +0900 Subject: [PATCH 427/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 94db426..3bd08ba 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "9f504c720b5a5d5a08625bf6197c8ef799b2205c" }, + "neogit": { "branch": "master", "commit": "1c6f02040e128f9f8133905c2b22dd120d3030d2" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, -- 2.51.2 From ae6d903fae40e8113da611bed90e31c8daf37d00 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 25 Oct 2024 03:55:37 +0000 Subject: [PATCH 428/589] Update plugins --- home-manager/nvim/lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 3bd08ba..b3de96a 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "1c6f02040e128f9f8133905c2b22dd120d3030d2" }, + "neogit": { "branch": "master", "commit": "5e51097f964c01bc457f3a0f6fb7287d6782c04e" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, @@ -26,10 +26,10 @@ "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, + "schemastore.nvim": { "branch": "main", "commit": "fa562602268fc7335fd2b7581ddf9e67e70f18b6" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "typst-preview.nvim": { "branch": "master", "commit": "0f43ed7fa661617751bfd0ca2f01ee13eba6569e" }, + "typst-preview.nvim": { "branch": "master", "commit": "06778d1b3d4d29c34f1faf80947b586f403689ba" }, "vim-skim-synctex": { "branch": "main", "commit": "7ffdd8077d12f1b55e177e1b64edd2c96def7545" }, "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } } -- 2.51.2 From 9d381185b0cd0281455e8ec2715470338bb7d21e Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:09:59 +0900 Subject: [PATCH 429/589] Update plugins --- home-manager/nvim/lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b3de96a..22f6d9c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -16,17 +16,17 @@ "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "5e51097f964c01bc457f3a0f6fb7287d6782c04e" }, + "neogit": { "branch": "master", "commit": "20f84056c8ae570cc2997b80ec85afa17eae1b2b" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, + "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "schemastore.nvim": { "branch": "main", "commit": "fa562602268fc7335fd2b7581ddf9e67e70f18b6" }, + "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, "typst-preview.nvim": { "branch": "master", "commit": "06778d1b3d4d29c34f1faf80947b586f403689ba" }, -- 2.51.2 From a1457891c159b08bb731ce12b43d0315cba6318b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:14:07 +0900 Subject: [PATCH 430/589] Delete TeX-related plugins --- home-manager/nvim/lazy-lock.json | 2 -- home-manager/nvim/lua/plugins/denops.lua | 5 --- home-manager/nvim/lua/plugins/lspconfig.lua | 1 - .../nvim/lua/plugins/skim-synctex.lua | 34 ------------------- 4 files changed, 42 deletions(-) delete mode 100644 home-manager/nvim/lua/plugins/denops.lua delete mode 100644 home-manager/nvim/lua/plugins/skim-synctex.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 22f6d9c..4fdce91 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -9,7 +9,6 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, - "denops.vim": { "branch": "main", "commit": "d3f43a20d0c6bbd7935a97550447aea510248c0b" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, @@ -30,6 +29,5 @@ "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, "typst-preview.nvim": { "branch": "master", "commit": "06778d1b3d4d29c34f1faf80947b586f403689ba" }, - "vim-skim-synctex": { "branch": "main", "commit": "7ffdd8077d12f1b55e177e1b64edd2c96def7545" }, "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } } diff --git a/home-manager/nvim/lua/plugins/denops.lua b/home-manager/nvim/lua/plugins/denops.lua deleted file mode 100644 index 61e74a0..0000000 --- a/home-manager/nvim/lua/plugins/denops.lua +++ /dev/null @@ -1,5 +0,0 @@ ----@type LazyPluginSpec -return { - "vim-denops/denops.vim", - lazy = true, -} diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index a444115..baf7da2 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -96,7 +96,6 @@ local lspconfig = { "lemminx", "lua_ls", "nim_langserver", - "texlab", "pylsp", "rust_analyzer", "tinymist", diff --git a/home-manager/nvim/lua/plugins/skim-synctex.lua b/home-manager/nvim/lua/plugins/skim-synctex.lua deleted file mode 100644 index ad43aee..0000000 --- a/home-manager/nvim/lua/plugins/skim-synctex.lua +++ /dev/null @@ -1,34 +0,0 @@ ----@type LazyPluginSpec -return { - "ryota2357/vim-skim-synctex", - config = function() - vim.fn["synctex#option"]("autoActive", true) - -- vim.fn["synctex#option"]("autoQuit", true) - vim.fn["synctex#option"]("readingBar", true) - vim.fn["synctex#start"]() - - -- Not working - --[[ - require "vim_util".create_autocmd { - event = require "vim_event".vim_leave_pre, - config = { - group = vim.api.nvim_create_augroup("synctex_stop", {}), - callback = function() - vim.fn["synctex#stop"]() - end, - pattern = "*", - }, - } - ]] -- - end, - dependencies = { - require "plugins.denops", - }, - ft = "tex", - keys = { { - "s", - function() - vim.fn["synctex#forwardSerch"]() - end, - } }, -} -- 2.51.2 From 2aafadb843448a1ed774cf10d341f20b8877a4df Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:23:54 +0900 Subject: [PATCH 431/589] Add all CopilotChat commands (close #286) --- home-manager/nvim/lua/plugins/copilotchat.lua | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/home-manager/nvim/lua/plugins/copilotchat.lua b/home-manager/nvim/lua/plugins/copilotchat.lua index a881c3c..eda5b1c 100644 --- a/home-manager/nvim/lua/plugins/copilotchat.lua +++ b/home-manager/nvim/lua/plugins/copilotchat.lua @@ -3,6 +3,24 @@ return { "CopilotC-Nvim/CopilotChat.nvim", build = "make tiktoken", cmd = { + "CopilotChat", + "CopilotChatClose", + "CopilotChatCommit", + "CopilotChatCommitStaged", + "CopilotChatDebugInfo", + "CopilotChatDocs", + "CopilotChatExplain", + "CopilotChatFix", + "CopilotChatFixDiagnostic", + "CopilotChatLoad", + "CopilotChatModel", + "CopilotChatModels", + "CopilotChatOpen", + "CopilotChatOptimize", + "CopilotChatReset", + "CopilotChatSave", + "CopilotChatStop", + "CopilotChatTests", "CopilotChatToggle", }, dependencies = { -- 2.51.2 From 53d6951eea25c119828d0513b85f779d8141f7c3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:28:53 +0900 Subject: [PATCH 432/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 4fdce91..5b9efdf 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -12,10 +12,10 @@ "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, + "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "20f84056c8ae570cc2997b80ec85afa17eae1b2b" }, + "neogit": { "branch": "master", "commit": "51450329e04860f71a31d8c7ef5178fce6e60524" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, -- 2.51.2 From cfece951c2bbacc158acc92b5a0619a0c12eb67b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:29:06 +0900 Subject: [PATCH 433/589] Fix cond of commit count --- home-manager/nvim/lua/plugins/lualine.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 12f8164..93ea4ec 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -33,7 +33,7 @@ local lualine = { end, color = "NonText", cond = function() - return os.execute "git rev-parse --is-inside-work-tree > /dev/null 2>&1" + return os.execute "git rev-parse --is-inside-work-tree > /dev/null 2>&1" == 0 end, }, "diff", -- 2.51.2 From dc6aaaee51b1479395f3bf9f01af53ac681f31c2 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:35:55 +0900 Subject: [PATCH 434/589] Enable `cursorline` --- home-manager/nvim/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 3143567..10d0b62 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -87,6 +87,8 @@ vim.filetype.add { } vim.opt.cmdheight = 0 +vim.opt.cursorline = true +vim.api.nvim_set_hl(0, "CursorLine", { background = "#444444" }) vim.opt.expandtab = true vim.opt.fileformats = { "unix", "dos" } vim.opt.laststatus = 3 -- 2.51.2 From 2544046d607953ae22ddecb59c1864d59a5ffb54 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 27 Oct 2024 19:35:48 +0900 Subject: [PATCH 435/589] Handle error in `git rev-list` --- home-manager/nvim/lua/plugins/lualine.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 93ea4ec..9e9164a 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -27,7 +27,11 @@ local lualine = { "branch", { function() - local output = io.popen "git rev-list --left-right --count HEAD...@{upstream}":read() + local output = io.popen "git rev-list --left-right --count HEAD...@{upstream} 2>/dev/null":read() + if not output then + return "" + end + local ahead, behind = string.match(output, "(%d+)%s+(%d+)") return behind .. " " .. ahead .. "" end, -- 2.51.2 From 3c6ca8675657a54ba74a30c823d17948a956e021 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 30 Oct 2024 15:40:17 +0900 Subject: [PATCH 436/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 5b9efdf..d0e1898 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "9333944fde3c65868818e245c73aa29eef826e9b" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "82604838fa511d1cbf8174e99f2fbc3a0dc0abe4" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -15,7 +15,7 @@ "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "51450329e04860f71a31d8c7ef5178fce6e60524" }, + "neogit": { "branch": "master", "commit": "001f43f50d9589d837cec59004fd92486ab06870" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, -- 2.51.2 From 95ae704b912c42093e6eda05839376de3be1a980 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 10 Nov 2024 18:37:52 +0900 Subject: [PATCH 437/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- home-manager/nvim/lua/plugins/neogit.lua | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index d0e1898..3c89efc 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,19 +6,19 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "001f43f50d9589d837cec59004fd92486ab06870" }, + "neogit": { "branch": "master", "commit": "8e1e301c2e33c60375850bcf22ba1fb77b684b97" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, + "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, diff --git a/home-manager/nvim/lua/plugins/neogit.lua b/home-manager/nvim/lua/plugins/neogit.lua index 960af98..0169e86 100644 --- a/home-manager/nvim/lua/plugins/neogit.lua +++ b/home-manager/nvim/lua/plugins/neogit.lua @@ -10,7 +10,7 @@ local neogit = { end, } }, opts = { - disable_commit_confirmation = true, + process_spinner = false, }, } -- 2.51.2 From 453df7ab044a7e29f3c08a4f4db709b70393a408 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:17:43 +0900 Subject: [PATCH 438/589] Update plugins --- home-manager/nvim/lazy-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 3c89efc..bf3302d 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "82604838fa511d1cbf8174e99f2fbc3a0dc0abe4" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "d36b868dbdadc0037a365e862fb0bc5aae236986" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -11,14 +11,14 @@ "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "8e1e301c2e33c60375850bcf22ba1fb77b684b97" }, + "neogit": { "branch": "master", "commit": "89d13fb9898619774d359a3900959181d60dd02f" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, + "nvim-cmp": { "branch": "main", "commit": "40a03dc225383c4f6256596c2cdf27e03b8119b5" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, @@ -29,5 +29,5 @@ "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, "typst-preview.nvim": { "branch": "master", "commit": "06778d1b3d4d29c34f1faf80947b586f403689ba" }, - "vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" } + "vscode.nvim": { "branch": "main", "commit": "18097b7aa47538afa780c821309c8b992972d726" } } -- 2.51.2 From d6475db2cf94e1d643a913e8c8e11981963ad015 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:17:52 +0900 Subject: [PATCH 439/589] Remove texlab config --- home-manager/nvim/lua/plugins/lspconfig.lua | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index baf7da2..97cd86e 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -123,17 +123,6 @@ local lspconfig = { autopep8 = { enabled = false }, }, }, - texlab = { - build = { - args = { - "%f", - }, - onSave = true, - }, - chktex = { - onEdit = true, - }, - }, yaml = { keyOrdering = false }, }, -- To make tinymist work outside of a git repo -- 2.51.2 From 5eff7661e5b4c1fe51fa515e95b64c2f78c411d3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:37:43 +0900 Subject: [PATCH 440/589] Update nvim-cmp --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index bf3302d..32be76a 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -18,7 +18,7 @@ "neogit": { "branch": "master", "commit": "89d13fb9898619774d359a3900959181d60dd02f" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "40a03dc225383c4f6256596c2cdf27e03b8119b5" }, + "nvim-cmp": { "branch": "main", "commit": "be7bd4c5f860c79da97af3a26d489af50babfd4b" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, -- 2.51.2 From 1404ddae411871b9b17a1de3f5ab193e0853f0b2 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:02:41 +0900 Subject: [PATCH 441/589] Add octo.nvim --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/octo.lua | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 home-manager/nvim/lua/plugins/octo.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 32be76a..5d0f1a5 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -24,6 +24,7 @@ "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, + "octo.nvim": { "branch": "master", "commit": "51f18085561805732e0306cf7300f773ec86872c" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, diff --git a/home-manager/nvim/lua/plugins/octo.lua b/home-manager/nvim/lua/plugins/octo.lua new file mode 100644 index 0000000..3749a72 --- /dev/null +++ b/home-manager/nvim/lua/plugins/octo.lua @@ -0,0 +1,6 @@ +---@type LazyPluginSpec +return { + "pwntester/octo.nvim", + cmd = "Octo", + opts = {}, +} -- 2.51.2 From 4ea7929a3cf2882ff39d9202cdafc4d238e11d84 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:03:09 +0900 Subject: [PATCH 442/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 5d0f1a5..26d6cf4 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -15,7 +15,7 @@ "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "89d13fb9898619774d359a3900959181d60dd02f" }, + "neogit": { "branch": "master", "commit": "e32e5dcb99d65033408e9942a0ac0b239fa887e4" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, "nvim-cmp": { "branch": "main", "commit": "be7bd4c5f860c79da97af3a26d489af50babfd4b" }, -- 2.51.2 From d3949c4249c7d8ba8e7c4eab73136bf5bdd31972 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:38:04 +0900 Subject: [PATCH 443/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 26d6cf4..2e2f9bb 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -15,10 +15,10 @@ "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "e32e5dcb99d65033408e9942a0ac0b239fa887e4" }, + "neogit": { "branch": "master", "commit": "26c5550016b20e4f47b376192f12a54be8897aaa" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "be7bd4c5f860c79da97af3a26d489af50babfd4b" }, + "nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, -- 2.51.2 From 2f43c2f672eed8ca2522f4a0e263945032125c19 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:22:48 +0900 Subject: [PATCH 444/589] Update plugins --- home-manager/nvim/lazy-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 2e2f9bb..7a1b87f 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "d36b868dbdadc0037a365e862fb0bc5aae236986" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "1fe19d1fdbf9edcda8bad9b7b2d5e11aa95c1672" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -8,27 +8,27 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, - "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, + "copilot.lua": { "branch": "master", "commit": "c810500b69cb8bcea58f2be635cb1340011714b5" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, - "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, - "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" }, + "lazy.nvim": { "branch": "main", "commit": "a44e9cd165e11fa61ccfbea2a3cc1aaa3bcfc4f1" }, + "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "26c5550016b20e4f47b376192f12a54be8897aaa" }, + "neogit": { "branch": "master", "commit": "a38945a585794c716b2ff9b25668bb5c089e8cd7" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" }, + "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, - "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, + "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "51f18085561805732e0306cf7300f773ec86872c" }, + "octo.nvim": { "branch": "master", "commit": "14d412f517a3cbea4cd4299207ee067fde542062" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "typst-preview.nvim": { "branch": "master", "commit": "06778d1b3d4d29c34f1faf80947b586f403689ba" }, + "typst-preview.nvim": { "branch": "master", "commit": "ebf10fabde7406848d165b1ef13bce5d046195be" }, "vscode.nvim": { "branch": "main", "commit": "18097b7aa47538afa780c821309c8b992972d726" } } -- 2.51.2 From a4fb56ff4387052101fd8d9fb647df599bc71b79 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 8 Dec 2024 08:03:56 +0900 Subject: [PATCH 445/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7a1b87f..35bc75e 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -11,7 +11,7 @@ "copilot.lua": { "branch": "master", "commit": "c810500b69cb8bcea58f2be635cb1340011714b5" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, - "lazy.nvim": { "branch": "main", "commit": "a44e9cd165e11fa61ccfbea2a3cc1aaa3bcfc4f1" }, + "lazy.nvim": { "branch": "main", "commit": "014d1d6d78df4e58f962158e6e00261d8632612c" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, @@ -24,7 +24,7 @@ "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "14d412f517a3cbea4cd4299207ee067fde542062" }, + "octo.nvim": { "branch": "master", "commit": "111979671dd0aa9281f50867901cef9792a7b2d6" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- 2.51.2 From e50a005fdc67f2a83d842fa6ff1041178635cbde Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 10 Dec 2024 11:45:44 +0900 Subject: [PATCH 446/589] Update neogit --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 35bc75e..3c0b43b 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -15,7 +15,7 @@ "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "a38945a585794c716b2ff9b25668bb5c089e8cd7" }, + "neogit": { "branch": "master", "commit": "40038473707c54a846bd11ecaf5933dd45858972" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" }, -- 2.51.2 From 6834a0a99aa4cbdac9f1e822b5bf33e8767eacbe Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 12 Dec 2024 21:16:27 +0900 Subject: [PATCH 447/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 3c0b43b..ba3804b 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -3,28 +3,28 @@ "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, - "copilot.lua": { "branch": "master", "commit": "c810500b69cb8bcea58f2be635cb1340011714b5" }, + "copilot.lua": { "branch": "master", "commit": "d3783b9283a7c35940ed8d71549030d5f5f9f980" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, - "lazy.nvim": { "branch": "main", "commit": "014d1d6d78df4e58f962158e6e00261d8632612c" }, + "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "neogit": { "branch": "master", "commit": "40038473707c54a846bd11ecaf5933dd45858972" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" }, + "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "111979671dd0aa9281f50867901cef9792a7b2d6" }, + "octo.nvim": { "branch": "master", "commit": "dfb292d81fe844d85199bb041c55981899c95fde" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- 2.51.2 From 145c1c036abe88267a95fcb61cd41d0d6fb019f8 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 12 Dec 2024 21:27:01 +0900 Subject: [PATCH 448/589] Remove unused LSPs --- home-manager/nvim/lua/plugins/lspconfig.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 97cd86e..a1ed57d 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -95,11 +95,9 @@ local lspconfig = { "jsonls", "lemminx", "lua_ls", - "nim_langserver", "pylsp", "rust_analyzer", "tinymist", - "vuels", "yamlls", tsserver, } -- 2.51.2 From 701083df08af33d9c3b2f0c998ded7dfcffde3b2 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 15 Dec 2024 14:46:22 +0900 Subject: [PATCH 449/589] Add vacuum --- home-manager/nvim/init.lua | 3 +++ home-manager/nvim/lua/plugins/lspconfig.lua | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 10d0b62..7aa5891 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -84,6 +84,9 @@ vim.filetype.add { extension = { mdx = "markdown.mdx", }, + pattern = { + ["openapi.*%.ya?ml"] = "yaml.openapi", + }, } vim.opt.cmdheight = 0 diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index a1ed57d..ab5ed80 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -98,7 +98,7 @@ local lspconfig = { "pylsp", "rust_analyzer", "tinymist", - "yamlls", + "vacuum", tsserver, } @@ -121,7 +121,6 @@ local lspconfig = { autopep8 = { enabled = false }, }, }, - yaml = { keyOrdering = false }, }, -- To make tinymist work outside of a git repo single_file_support = true, @@ -132,6 +131,19 @@ local lspconfig = { bundle_path = "C:/PowerShellEditorServices", capabilities = capabilities, } + + lsp_config.yamlls.setup { + capabilities = capabilities, + filetypes = { + "yaml", + "yaml.docker-compose", + "yaml.gitlab", + "yaml.openapi", -- Added + }, + settings = { + yaml = { keyOrdering = false }, + }, + } end, dependencies = { "b0o/schemastore.nvim", -- 2.51.2 From 6a6df7e3518f6140ef26efc27ccd6dcd4123cc5b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 15 Dec 2024 14:46:50 +0900 Subject: [PATCH 450/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- home-manager/nvim/lua/plugins/lspconfig.lua | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ba3804b..b1f7a5e 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -11,20 +11,20 @@ "copilot.lua": { "branch": "master", "commit": "d3783b9283a7c35940ed8d71549030d5f5f9f980" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, - "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "40038473707c54a846bd11ecaf5933dd45858972" }, + "neogit": { "branch": "master", "commit": "cfea08ebb2fda22f1357e413d4ea45dcda6fcab5" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, - "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, + "nvim-lspconfig": { "branch": "master", "commit": "124be12d782d656b3c75b513a44d9e4728406078" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "dfb292d81fe844d85199bb041c55981899c95fde" }, + "octo.nvim": { "branch": "master", "commit": "1fee3592194d7d90d65382401b59ffb008983a19" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index ab5ed80..dcdf6eb 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -122,8 +122,6 @@ local lspconfig = { }, }, }, - -- To make tinymist work outside of a git repo - single_file_support = true, } end -- 2.51.2 From ceef6f923b8ad024ddd2f236db12e3914e592d2b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 22 Dec 2024 10:23:34 +0900 Subject: [PATCH 451/589] Update plugins --- home-manager/nvim/lazy-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b1f7a5e..6291753 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "1fe19d1fdbf9edcda8bad9b7b2d5e11aa95c1672" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -15,20 +15,20 @@ "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "cfea08ebb2fda22f1357e413d4ea45dcda6fcab5" }, + "neogit": { "branch": "master", "commit": "dc926b93e0bb0affce888f0014dbbfa31f966ef7" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, - "nvim-lspconfig": { "branch": "master", "commit": "124be12d782d656b3c75b513a44d9e4728406078" }, + "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, + "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "1fee3592194d7d90d65382401b59ffb008983a19" }, + "octo.nvim": { "branch": "master", "commit": "cb6a548f0ce181992f045ca50a71e634e37da024" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "typst-preview.nvim": { "branch": "master", "commit": "ebf10fabde7406848d165b1ef13bce5d046195be" }, + "typst-preview.nvim": { "branch": "master", "commit": "23db1bd5a32ff0b346817ed72e615c6419b11f48" }, "vscode.nvim": { "branch": "main", "commit": "18097b7aa47538afa780c821309c8b992972d726" } } -- 2.51.2 From 5e1cf006acbc22f5c22b7eb4e80accdc4592faf6 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:14:37 +0900 Subject: [PATCH 452/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 6291753..be5e715 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,14 +8,14 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, - "copilot.lua": { "branch": "master", "commit": "d3783b9283a7c35940ed8d71549030d5f5f9f980" }, + "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "dc926b93e0bb0affce888f0014dbbfa31f966ef7" }, + "neogit": { "branch": "master", "commit": "9ea60f79e370d8f4847efc145e53afe4b0613fc1" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, @@ -24,11 +24,11 @@ "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "cb6a548f0ce181992f045ca50a71e634e37da024" }, + "octo.nvim": { "branch": "master", "commit": "aa3cb8e27a708d137d2540509928a3e7736f8eba" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "typst-preview.nvim": { "branch": "master", "commit": "23db1bd5a32ff0b346817ed72e615c6419b11f48" }, + "typst-preview.nvim": { "branch": "master", "commit": "c1100e8788baabe8ca8f8cd7fd63d3d479e49e36" }, "vscode.nvim": { "branch": "main", "commit": "18097b7aa47538afa780c821309c8b992972d726" } } -- 2.51.2 From 3649fc0bc07d208f5df07934b772b6349dd17070 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:14:48 +0900 Subject: [PATCH 453/589] Set white space to `eob` --- home-manager/nvim/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 7aa5891..0ba2ce2 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -94,6 +94,9 @@ vim.opt.cursorline = true vim.api.nvim_set_hl(0, "CursorLine", { background = "#444444" }) vim.opt.expandtab = true vim.opt.fileformats = { "unix", "dos" } +vim.opt.fillchars = { + eob = " ", +} vim.opt.laststatus = 3 vim.opt.list = true vim.opt.listchars = { -- 2.51.2 From f2829b56ca0f85b2c997d075d49b36caafa0ecea Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:15:25 +0900 Subject: [PATCH 454/589] Replace periods and commas on save --- home-manager/nvim/after/ftplugin/typst.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/home-manager/nvim/after/ftplugin/typst.lua b/home-manager/nvim/after/ftplugin/typst.lua index 9bf3222..a13fccf 100644 --- a/home-manager/nvim/after/ftplugin/typst.lua +++ b/home-manager/nvim/after/ftplugin/typst.lua @@ -3,3 +3,17 @@ require "ftbase.text" require "nvim-autopairs".add_rule( require "nvim-autopairs.rule" ("$", "$", "typst") ) + +local util = require "vim_util" + +util.create_autocmd { + event = require "vim_event".buf_write_pre, + config = { + group = util.create_augroup "typst_fmt", + callback = function() + vim.cmd ":silent! %s/。/./g" + vim.cmd ":silent! %s/、/,/g" + end, + pattern = "*.typ", + }, +} -- 2.51.2 From d6b1a7da9e211d4e973347b8d8017a60849763e8 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:26:58 +0900 Subject: [PATCH 455/589] Add move rule for `$` in Typst --- home-manager/nvim/after/ftplugin/typst.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/after/ftplugin/typst.lua b/home-manager/nvim/after/ftplugin/typst.lua index a13fccf..3c29251 100644 --- a/home-manager/nvim/after/ftplugin/typst.lua +++ b/home-manager/nvim/after/ftplugin/typst.lua @@ -1,7 +1,7 @@ require "ftbase.text" require "nvim-autopairs".add_rule( - require "nvim-autopairs.rule" ("$", "$", "typst") + require "nvim-autopairs.rule" ("$", "$", "typst"):with_move(function() return true end) ) local util = require "vim_util" -- 2.51.2 From 5f8d4b998c550debdf24cba215832897712be29b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 29 Dec 2024 10:35:19 +0900 Subject: [PATCH 456/589] Update octo.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index be5e715..a68c280 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -24,7 +24,7 @@ "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "aa3cb8e27a708d137d2540509928a3e7736f8eba" }, + "octo.nvim": { "branch": "master", "commit": "b099b0ade680d6bba14828319627276a8334d8de" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- 2.51.2 From cdc0ee2894025a5e84113ef78d2899307a5d0b23 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 1 Jan 2025 11:18:30 +0900 Subject: [PATCH 457/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index a68c280..25b80b1 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -17,14 +17,14 @@ "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "neogit": { "branch": "master", "commit": "9ea60f79e370d8f4847efc145e53afe4b0613fc1" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, + "nvim-autopairs": { "branch": "master", "commit": "a50878826cb035a56cb17c1c442d0617f2677dac" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "b099b0ade680d6bba14828319627276a8334d8de" }, + "octo.nvim": { "branch": "master", "commit": "339e024dea88d13a1d8b04821fa2bd0defb5cf8a" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- 2.51.2 From 64e21ac02e60f931c3f7b037ceb65cffd430e062 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 1 Jan 2025 12:05:11 +0900 Subject: [PATCH 458/589] Replace some filetypes with prettier formats --- home-manager/nvim/lua/plugins/lualine.lua | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 9e9164a..fa4228c 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -1,3 +1,13 @@ +local ftmap = { + gitcommit = "Git Commit", + ["markdown.mdx"] = "MDX", + toml = "TOML", + typescript = "TypeScript", + typescriptreact = "TSX", + yaml = "YAML", + ["yaml.openapi"] = "OpenAPI", +} + ---@type LazyPluginSpec local lualine = { "nvim-lualine/lualine.nvim", @@ -57,8 +67,8 @@ local lualine = { "fileformat", { "filetype", - fmt = function(str) - return string.gsub(str, "^%l", string.upper) + fmt = function(filetype) + return ftmap[filetype] or string.gsub(filetype, "^%l", string.upper) end, }, }, -- 2.51.2 From 323831d560a8cca1f5196bb3d5a01929a89870b3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 1 Jan 2025 12:40:34 +0900 Subject: [PATCH 459/589] Add treesitter-context --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/treesitter-context.lua | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 home-manager/nvim/lua/plugins/treesitter-context.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 25b80b1..ecd979f 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -23,6 +23,7 @@ "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "octo.nvim": { "branch": "master", "commit": "339e024dea88d13a1d8b04821fa2bd0defb5cf8a" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, diff --git a/home-manager/nvim/lua/plugins/treesitter-context.lua b/home-manager/nvim/lua/plugins/treesitter-context.lua new file mode 100644 index 0000000..07cc62d --- /dev/null +++ b/home-manager/nvim/lua/plugins/treesitter-context.lua @@ -0,0 +1,8 @@ +---@type LazyPluginSpec +return { + "nvim-treesitter/nvim-treesitter-context", + event = require "vim_event".buf_read_pre, + dependencies = { + require "plugins.treesitter", + }, +} -- 2.51.2 From 7a2a48d33cbb85c517cdd8e84837fad1fa653a7f Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 1 Jan 2025 21:57:11 +0900 Subject: [PATCH 460/589] Update nvim-autopairs --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ecd979f..4577ae4 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -17,7 +17,7 @@ "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "neogit": { "branch": "master", "commit": "9ea60f79e370d8f4847efc145e53afe4b0613fc1" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "a50878826cb035a56cb17c1c442d0617f2677dac" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, -- 2.51.2 From 6c4d71bb036ee1d8cf1774aa3e5c5f0a670eb1be Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 1 Jan 2025 21:57:40 +0900 Subject: [PATCH 461/589] Add HTML --- home-manager/nvim/lua/plugins/lualine.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index fa4228c..3de98f7 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -1,5 +1,6 @@ local ftmap = { gitcommit = "Git Commit", + html = "HTML", ["markdown.mdx"] = "MDX", toml = "TOML", typescript = "TypeScript", -- 2.51.2 From 4546532f7bae524615d06f4ef3d7b2920d62e3d5 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 2 Jan 2025 13:51:59 +0900 Subject: [PATCH 462/589] Add CSS --- home-manager/nvim/lua/plugins/lualine.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 3de98f7..09d0fbc 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -1,4 +1,5 @@ local ftmap = { + css = "CSS", gitcommit = "Git Commit", html = "HTML", ["markdown.mdx"] = "MDX", -- 2.51.2 From 26eba5faf8d2d2b17fcecc7af35bd942b96da079 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 2 Jan 2025 23:18:28 +0900 Subject: [PATCH 463/589] Update octo.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 4577ae4..4c4c013 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -25,7 +25,7 @@ "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "339e024dea88d13a1d8b04821fa2bd0defb5cf8a" }, + "octo.nvim": { "branch": "master", "commit": "59303c8a34267f6e1002bd1d6fa3ec50cd2b7027" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- 2.51.2 From ae7d79f51252902614d59f7d27d0a845937182b7 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 2 Jan 2025 23:19:22 +0900 Subject: [PATCH 464/589] Disable Copilot in Project Euler directory --- home-manager/nvim/lua/plugins/copilot.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/copilot.lua b/home-manager/nvim/lua/plugins/copilot.lua index f409b6d..1b23a43 100644 --- a/home-manager/nvim/lua/plugins/copilot.lua +++ b/home-manager/nvim/lua/plugins/copilot.lua @@ -2,7 +2,7 @@ local copilot = { "zbirenbaum/copilot.lua", cond = function() - return string.find(vim.fn.getcwd(), "AtCoder") == nil + return string.find(vim.fn.getcwd(), "AtCoder") == nil and string.find(vim.fn.getcwd(), "project-euler") == nil end, event = require "vim_event".buf_read_post, opts = { -- 2.51.2 From 9b00be7aa046b8ca179e7b9a68e67cb3c0f62ea2 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 2 Jan 2025 23:29:09 +0900 Subject: [PATCH 465/589] Escape `-` as it's regex --- home-manager/nvim/lua/plugins/copilot.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/copilot.lua b/home-manager/nvim/lua/plugins/copilot.lua index 1b23a43..8e3ad06 100644 --- a/home-manager/nvim/lua/plugins/copilot.lua +++ b/home-manager/nvim/lua/plugins/copilot.lua @@ -2,7 +2,7 @@ local copilot = { "zbirenbaum/copilot.lua", cond = function() - return string.find(vim.fn.getcwd(), "AtCoder") == nil and string.find(vim.fn.getcwd(), "project-euler") == nil + return string.find(vim.fn.getcwd(), "AtCoder") == nil and string.find(vim.fn.getcwd(), "project\\-euler") == nil end, event = require "vim_event".buf_read_post, opts = { -- 2.51.2 From 42d09302d2c2a475a7861793800bb6e1acabf02f Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 2 Jan 2025 23:32:50 +0900 Subject: [PATCH 466/589] Use `%` to escape --- home-manager/nvim/lua/plugins/copilot.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/copilot.lua b/home-manager/nvim/lua/plugins/copilot.lua index 8e3ad06..a11b6b5 100644 --- a/home-manager/nvim/lua/plugins/copilot.lua +++ b/home-manager/nvim/lua/plugins/copilot.lua @@ -2,7 +2,7 @@ local copilot = { "zbirenbaum/copilot.lua", cond = function() - return string.find(vim.fn.getcwd(), "AtCoder") == nil and string.find(vim.fn.getcwd(), "project\\-euler") == nil + return string.find(vim.fn.getcwd(), "AtCoder") == nil and string.find(vim.fn.getcwd(), "project%-euler") == nil end, event = require "vim_event".buf_read_post, opts = { -- 2.51.2 From 43ac1554dfc738591f9a6c0dba9bb8c2de53a9b8 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 8 Jan 2025 13:03:06 +0900 Subject: [PATCH 467/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- home-manager/nvim/lua/plugins/neogit.lua | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 4c4c013..2bb1e45 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -15,17 +15,17 @@ "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "9ea60f79e370d8f4847efc145e53afe4b0613fc1" }, + "neogit": { "branch": "master", "commit": "a1fc4e50fa494e04097cf2d02e86bcd7ac5760d6" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, - "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, + "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, + "nvim-lspconfig": { "branch": "master", "commit": "343ac34abc7ab53fae33357f915024aaacb76a3e" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" }, + "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "59303c8a34267f6e1002bd1d6fa3ec50cd2b7027" }, + "octo.nvim": { "branch": "master", "commit": "ec0d2b50e7405b786b3ea84040a177a07a1f458d" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, diff --git a/home-manager/nvim/lua/plugins/neogit.lua b/home-manager/nvim/lua/plugins/neogit.lua index 0169e86..7b58476 100644 --- a/home-manager/nvim/lua/plugins/neogit.lua +++ b/home-manager/nvim/lua/plugins/neogit.lua @@ -9,9 +9,6 @@ local neogit = { require "neogit".open() end, } }, - opts = { - process_spinner = false, - }, } return neogit -- 2.51.2 From 2bf6a390919711cfbcae3736029254041044f7bb Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:14:55 +0900 Subject: [PATCH 468/589] Add JSON --- home-manager/nvim/lua/plugins/lualine.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 09d0fbc..f855c58 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -2,6 +2,7 @@ local ftmap = { css = "CSS", gitcommit = "Git Commit", html = "HTML", + json = "JSON", ["markdown.mdx"] = "MDX", toml = "TOML", typescript = "TypeScript", -- 2.51.2 From 6f257ba6906263e470fb777a727d691ae8f5dd76 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 27 Jan 2025 16:35:31 +0900 Subject: [PATCH 469/589] Update plugins --- home-manager/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 2bb1e45..32d2e1d 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "0a62c9f002c7adc533610d53386e09ede96274b6" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -7,29 +7,29 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" }, + "copilot-lualine": { "branch": "main", "commit": "dc4b8ed0f75bc2557b3158c526624bf04ad233ea" }, "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "a1fc4e50fa494e04097cf2d02e86bcd7ac5760d6" }, + "neo-tree.nvim": { "branch": "main", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" }, + "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, - "nvim-lspconfig": { "branch": "master", "commit": "343ac34abc7ab53fae33357f915024aaacb76a3e" }, + "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "nvim-lspconfig": { "branch": "master", "commit": "513f4f0bde469ecb3abe2e1b606f63cf142e751e" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, - "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, + "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" }, + "nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "ec0d2b50e7405b786b3ea84040a177a07a1f458d" }, + "octo.nvim": { "branch": "master", "commit": "75d1f6a09536e3bffa86a781cdb0bd72da57acc3" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, "typst-preview.nvim": { "branch": "master", "commit": "c1100e8788baabe8ca8f8cd7fd63d3d479e49e36" }, - "vscode.nvim": { "branch": "main", "commit": "18097b7aa47538afa780c821309c8b992972d726" } + "vscode.nvim": { "branch": "main", "commit": "298c5ce4750a256ea208b72d7a472b8824ef2a49" } } -- 2.51.2 From fae8b5bbef11f74f5d12b9c404d210fbe32050ac Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 27 Jan 2025 16:36:17 +0900 Subject: [PATCH 470/589] Remove ftbase file --- home-manager/nvim/after/ftplugin/markdown.lua | 2 +- home-manager/nvim/after/ftplugin/markdown.mdx.lua | 2 +- home-manager/nvim/after/ftplugin/text.lua | 2 +- home-manager/nvim/after/ftplugin/typst.lua | 2 +- home-manager/nvim/lua/ftbase/text.lua | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 home-manager/nvim/lua/ftbase/text.lua diff --git a/home-manager/nvim/after/ftplugin/markdown.lua b/home-manager/nvim/after/ftplugin/markdown.lua index a920bb8..481f90a 100644 --- a/home-manager/nvim/after/ftplugin/markdown.lua +++ b/home-manager/nvim/after/ftplugin/markdown.lua @@ -1 +1 @@ -require "ftbase.text" +vim.opt_local.wrap = true diff --git a/home-manager/nvim/after/ftplugin/markdown.mdx.lua b/home-manager/nvim/after/ftplugin/markdown.mdx.lua index a920bb8..481f90a 100644 --- a/home-manager/nvim/after/ftplugin/markdown.mdx.lua +++ b/home-manager/nvim/after/ftplugin/markdown.mdx.lua @@ -1 +1 @@ -require "ftbase.text" +vim.opt_local.wrap = true diff --git a/home-manager/nvim/after/ftplugin/text.lua b/home-manager/nvim/after/ftplugin/text.lua index a920bb8..481f90a 100644 --- a/home-manager/nvim/after/ftplugin/text.lua +++ b/home-manager/nvim/after/ftplugin/text.lua @@ -1 +1 @@ -require "ftbase.text" +vim.opt_local.wrap = true diff --git a/home-manager/nvim/after/ftplugin/typst.lua b/home-manager/nvim/after/ftplugin/typst.lua index 3c29251..7f57a7a 100644 --- a/home-manager/nvim/after/ftplugin/typst.lua +++ b/home-manager/nvim/after/ftplugin/typst.lua @@ -1,4 +1,4 @@ -require "ftbase.text" +vim.opt_local.wrap = true require "nvim-autopairs".add_rule( require "nvim-autopairs.rule" ("$", "$", "typst"):with_move(function() return true end) diff --git a/home-manager/nvim/lua/ftbase/text.lua b/home-manager/nvim/lua/ftbase/text.lua deleted file mode 100644 index 481f90a..0000000 --- a/home-manager/nvim/lua/ftbase/text.lua +++ /dev/null @@ -1 +0,0 @@ -vim.opt_local.wrap = true -- 2.51.2 From 2ebaa0bbea5df084f593da4bbe23bc49c1a4d9e4 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 29 Jan 2025 22:28:04 +0900 Subject: [PATCH 471/589] Update plugins --- home-manager/nvim/lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 32d2e1d..7164733 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -19,17 +19,17 @@ "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "513f4f0bde469ecb3abe2e1b606f63cf142e751e" }, + "nvim-lspconfig": { "branch": "master", "commit": "637293ce23c6a965d2f11dfbf92f604bb1978052" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "75d1f6a09536e3bffa86a781cdb0bd72da57acc3" }, + "octo.nvim": { "branch": "master", "commit": "d66d886f1ec889d63ac29cb818d22931948450de" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, + "trouble.nvim": { "branch": "main", "commit": "bac1d9a9f51eecf4424b6ca8675db5a170fe572b" }, "typst-preview.nvim": { "branch": "master", "commit": "c1100e8788baabe8ca8f8cd7fd63d3d479e49e36" }, "vscode.nvim": { "branch": "main", "commit": "298c5ce4750a256ea208b72d7a472b8824ef2a49" } } -- 2.51.2 From 466a530214ea1c5b1e542c59a8a0d6dea38653aa Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 29 Jan 2025 22:28:15 +0900 Subject: [PATCH 472/589] Accept Copilot suggestion with `` --- home-manager/nvim/lua/plugins/copilot.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/nvim/lua/plugins/copilot.lua b/home-manager/nvim/lua/plugins/copilot.lua index a11b6b5..168d8bc 100644 --- a/home-manager/nvim/lua/plugins/copilot.lua +++ b/home-manager/nvim/lua/plugins/copilot.lua @@ -12,6 +12,9 @@ local copilot = { }, suggestion = { auto_trigger = true, + keymap = { + accept = "", + }, }, }, } -- 2.51.2 From 1a152d66259c26e9d255526f8e0b0be147d3f4e4 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 5 Feb 2025 08:54:44 +0900 Subject: [PATCH 473/589] Update plugins --- home-manager/nvim/lazy-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7164733..3f95f3c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -19,13 +19,13 @@ "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "637293ce23c6a965d2f11dfbf92f604bb1978052" }, + "nvim-lspconfig": { "branch": "master", "commit": "bf81bef7d75a0f4a0cf61462b318ea00b3c97cc8" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" }, + "nvim-treesitter-context": { "branch": "master", "commit": "9a49f43a2ec9bf77aecfb0fcbc43af43338375c0" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "d66d886f1ec889d63ac29cb818d22931948450de" }, + "octo.nvim": { "branch": "master", "commit": "d668d8051bc8539cbbdb4b0d155160dfd9ca0e2b" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- 2.51.2 From 7fdd94be78595364bff5edf4e2b6ab3fe2b40199 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 5 Feb 2025 08:54:58 +0900 Subject: [PATCH 474/589] Load barbar.nvim on `TremOpen` --- home-manager/nvim/lua/plugins/barbar.lua | 1 + home-manager/nvim/lua/vim_event/init.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua index 0635ce4..816bbad 100644 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -44,6 +44,7 @@ local barbar = { event = { event.buf_new_file, event.buf_read_pre, + event.term_open, }, keys = keys, } diff --git a/home-manager/nvim/lua/vim_event/init.lua b/home-manager/nvim/lua/vim_event/init.lua index 57f5654..a4e2dd5 100644 --- a/home-manager/nvim/lua/vim_event/init.lua +++ b/home-manager/nvim/lua/vim_event/init.lua @@ -3,8 +3,8 @@ local M = { buf_read_post = "BufReadPost", buf_read_pre = "BufReadPre", buf_write_pre = "BufWritePre", - -- vim_leave_pre = "VimLeavePre", insert_enter = "InsertEnter", + term_open = "TermOpen", } return M -- 2.51.2 From 5143a021b2374aea30545c30e62c56de43ba5ba0 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 10 Feb 2025 22:38:21 +0900 Subject: [PATCH 475/589] Update plugins --- home-manager/nvim/lazy-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 3f95f3c..0e7becf 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "0a62c9f002c7adc533610d53386e09ede96274b6" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "058b8d3a922255a94da9dc5fab220fd7d7ea9fe9" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -9,11 +9,11 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "dc4b8ed0f75bc2557b3158c526624bf04ad233ea" }, "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, - "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, + "gitsigns.nvim": { "branch": "main", "commit": "c23bbd3ed2c7a3fdc3399e97e24f9e158f57612f" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, "neo-tree.nvim": { "branch": "main", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" }, "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, @@ -23,13 +23,13 @@ "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-treesitter-context": { "branch": "master", "commit": "9a49f43a2ec9bf77aecfb0fcbc43af43338375c0" }, + "nvim-treesitter-context": { "branch": "master", "commit": "03f382ef224c27a8508cdab2d0b463dcb8ca12a6" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "d668d8051bc8539cbbdb4b0d155160dfd9ca0e2b" }, + "octo.nvim": { "branch": "master", "commit": "940d7af617015fd5c65f707a267d3daa29be480e" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "bac1d9a9f51eecf4424b6ca8675db5a170fe572b" }, - "typst-preview.nvim": { "branch": "master", "commit": "c1100e8788baabe8ca8f8cd7fd63d3d479e49e36" }, + "typst-preview.nvim": { "branch": "master", "commit": "00ff6829030f302e8ff24d0e3a68625dd1a3ac40" }, "vscode.nvim": { "branch": "main", "commit": "298c5ce4750a256ea208b72d7a472b8824ef2a49" } } -- 2.51.2 From d938d985de7db0c7e204c8c7d6cb22e030e4af31 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 10 Feb 2025 23:38:28 +0900 Subject: [PATCH 476/589] Update CopilotChat.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 0e7becf..ff7dd40 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "058b8d3a922255a94da9dc5fab220fd7d7ea9fe9" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "dbce8a231d1ac72c68ce00b86b415c9304417102" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, -- 2.51.2 From dacbc3a304c18c71d13c633a9bc3650dccccd5c4 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 10 Feb 2025 23:38:46 +0900 Subject: [PATCH 477/589] Configure Typst formatting Format on save not working for now --- home-manager/nvim/lua/plugins/lspconfig.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index dcdf6eb..b633cbb 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -97,7 +97,6 @@ local lspconfig = { "lua_ls", "pylsp", "rust_analyzer", - "tinymist", "vacuum", tsserver, } @@ -130,6 +129,13 @@ local lspconfig = { capabilities = capabilities, } + lsp_config.tinymist.setup { + capabilities = capabilities, + settings = { + formatterMode = "typstyle", + }, + } + lsp_config.yamlls.setup { capabilities = capabilities, filetypes = { -- 2.51.2 From 8e3531e484d23fd88949e15de31960dff958a793 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 11 Feb 2025 18:10:56 +0900 Subject: [PATCH 478/589] Update copilot.lua --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ff7dd40..a131349 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "dc4b8ed0f75bc2557b3158c526624bf04ad233ea" }, - "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, + "copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" }, "gitsigns.nvim": { "branch": "main", "commit": "c23bbd3ed2c7a3fdc3399e97e24f9e158f57612f" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, -- 2.51.2 From 76c456fb75b3b893024134236ce0c2a4b13d242f Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 21 Feb 2025 23:08:37 +0900 Subject: [PATCH 479/589] Update plugins --- home-manager/nvim/lazy-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index a131349..a3cf221 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "dbce8a231d1ac72c68ce00b86b415c9304417102" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "49aae4df360d4cbdb3fe6e12e2c101341442fe9a" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -9,27 +9,27 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "dc4b8ed0f75bc2557b3158c526624bf04ad233ea" }, "copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" }, - "gitsigns.nvim": { "branch": "main", "commit": "c23bbd3ed2c7a3fdc3399e97e24f9e158f57612f" }, + "gitsigns.nvim": { "branch": "main", "commit": "6668f379ca634c36b8e11453118590b91bf8b295" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, - "neo-tree.nvim": { "branch": "main", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" }, + "neo-tree.nvim": { "branch": "main", "commit": "e96fd85bf18bc345dab332b345098fa5460dffac" }, "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, + "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, "nvim-lspconfig": { "branch": "master", "commit": "bf81bef7d75a0f4a0cf61462b318ea00b3c97cc8" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-treesitter-context": { "branch": "master", "commit": "03f382ef224c27a8508cdab2d0b463dcb8ca12a6" }, + "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "940d7af617015fd5c65f707a267d3daa29be480e" }, + "octo.nvim": { "branch": "master", "commit": "2940fdcc0e38eca401b1f0a2e229d500128ccfcd" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "trouble.nvim": { "branch": "main", "commit": "bac1d9a9f51eecf4424b6ca8675db5a170fe572b" }, + "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "typst-preview.nvim": { "branch": "master", "commit": "00ff6829030f302e8ff24d0e3a68625dd1a3ac40" }, "vscode.nvim": { "branch": "main", "commit": "298c5ce4750a256ea208b72d7a472b8824ef2a49" } } -- 2.51.2 From 6037f3abc911437b578e44524b9b3a85a5287e57 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 21 Feb 2025 23:29:18 +0900 Subject: [PATCH 480/589] Add Biome LSP proxy --- home-manager/nvim/lua/plugins/lspconfig.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index b633cbb..05a8e55 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -124,6 +124,11 @@ local lspconfig = { } end + lsp_config.biome.setup { + capabilities = capabilities, + cmd = { "bunx", "biome", "lsp-proxy" }, + } + lsp_config.powershell_es.setup { bundle_path = "C:/PowerShellEditorServices", capabilities = capabilities, -- 2.51.2 From 49ea748a448ed722f9929525c694a5c9fc11e155 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 22 Feb 2025 20:43:07 +0900 Subject: [PATCH 481/589] Add nvim-ts-autotag --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/ts-autotag.lua | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 home-manager/nvim/lua/plugins/ts-autotag.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index a3cf221..5a23e55 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -24,6 +24,7 @@ "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "octo.nvim": { "branch": "master", "commit": "2940fdcc0e38eca401b1f0a2e229d500128ccfcd" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, diff --git a/home-manager/nvim/lua/plugins/ts-autotag.lua b/home-manager/nvim/lua/plugins/ts-autotag.lua new file mode 100644 index 0000000..f4f0642 --- /dev/null +++ b/home-manager/nvim/lua/plugins/ts-autotag.lua @@ -0,0 +1,9 @@ +---@type LazyPluginSpec +return { + "windwp/nvim-ts-autotag", + ft = { + "html", + "typescriptreact", + }, + opts = {}, +} -- 2.51.2 From 01b6a0c33944bdb10026ad08026e43ac7a54cf55 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 22 Feb 2025 20:44:35 +0900 Subject: [PATCH 482/589] Enable indent by Tree-sitter --- home-manager/nvim/lua/plugins/treesitter.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/nvim/lua/plugins/treesitter.lua b/home-manager/nvim/lua/plugins/treesitter.lua index f00ff3b..f087050 100644 --- a/home-manager/nvim/lua/plugins/treesitter.lua +++ b/home-manager/nvim/lua/plugins/treesitter.lua @@ -11,6 +11,9 @@ local treesitter = { highlight = { enable = true, }, + indent = { + enable = true, + }, } require "nvim-treesitter.install".prefer_git = false -- 2.51.2 From 946d68f8fb979fe9e023a3786db8459ebe103b41 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 22 Feb 2025 21:00:13 +0900 Subject: [PATCH 483/589] Support formatting with dynamic capability --- home-manager/nvim/lua/plugins/lspconfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 05a8e55..465d557 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -15,7 +15,7 @@ local lspconfig = { callback = function() vim.lsp.buf.format { filter = function(client) - return client.server_capabilities.documentFormattingProvider ~= nil + return client.supports_method "textDocument/formatting" end, } end, -- 2.51.2 From de8f5516f80243c50e40623346979860d215c3ab Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 24 Feb 2025 10:11:18 +0900 Subject: [PATCH 484/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 5a23e55..21ab11f 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -15,18 +15,18 @@ "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, "neo-tree.nvim": { "branch": "main", "commit": "e96fd85bf18bc345dab332b345098fa5460dffac" }, - "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" }, + "neogit": { "branch": "master", "commit": "8710d4f014f00262fd89f4067b3f9e6baa69ad2c" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, - "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "bf81bef7d75a0f4a0cf61462b318ea00b3c97cc8" }, + "nvim-cmp": { "branch": "main", "commit": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3" }, + "nvim-lspconfig": { "branch": "master", "commit": "6b63bdf2399b9bedf93297d98419550523a9ad68" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "2940fdcc0e38eca401b1f0a2e229d500128ccfcd" }, + "octo.nvim": { "branch": "master", "commit": "7793e76e6d20f5fe1232446273fa6c32463ac5b3" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- 2.51.2 From c35718dff3f4695b258aa501c54092e6f58e4691 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 27 Feb 2025 17:09:14 +0900 Subject: [PATCH 485/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 21ab11f..e9dc712 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "49aae4df360d4cbdb3fe6e12e2c101341442fe9a" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "a3932a1505a990c238183617b5c5cb239f43f5ec" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -11,11 +11,11 @@ "copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" }, "gitsigns.nvim": { "branch": "main", "commit": "6668f379ca634c36b8e11453118590b91bf8b295" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, - "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, "neo-tree.nvim": { "branch": "main", "commit": "e96fd85bf18bc345dab332b345098fa5460dffac" }, - "neogit": { "branch": "master", "commit": "8710d4f014f00262fd89f4067b3f9e6baa69ad2c" }, + "neogit": { "branch": "master", "commit": "12f78aaabb37b4946254dd5e47cf7b552904937a" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, "nvim-cmp": { "branch": "main", "commit": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3" }, @@ -26,11 +26,11 @@ "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "7793e76e6d20f5fe1232446273fa6c32463ac5b3" }, + "octo.nvim": { "branch": "master", "commit": "d794a4ce0feb7358b6b8ff9107c1447490cc8d46" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "typst-preview.nvim": { "branch": "master", "commit": "00ff6829030f302e8ff24d0e3a68625dd1a3ac40" }, - "vscode.nvim": { "branch": "main", "commit": "298c5ce4750a256ea208b72d7a472b8824ef2a49" } + "vscode.nvim": { "branch": "main", "commit": "e5e61a0ea00b5de7a74dada2760e61ac59ecb98e" } } -- 2.51.2 From 18754ce579db1f1c5ef4925fdccf1c9d706da114 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 27 Feb 2025 17:50:24 +0900 Subject: [PATCH 486/589] Support organizing imports using servers other than gopls --- home-manager/nvim/lua/plugins/lspconfig.lua | 32 +++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 465d557..0d5404d 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -23,25 +23,33 @@ local lspconfig = { }, }, -- https://github.com/golang/tools/blob/master/gopls/doc/vim.md#neovim-imports + -- https://zenn.dev/izumin/articles/b8046e64eaa2b5 { event = event.buf_write_pre, config = { - group = vim.api.nvim_create_augroup("goimports", {}), - callback = function() - local params = vim.lsp.util.make_range_params() - params.context = { only = { "source.organizeImports" } } - local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params) - - for cid, res in pairs(result or {}) do - for _, r in pairs(res.result or {}) do - if r.edit then - local enc = (vim.lsp.get_client_by_id(cid) or {}).offset_encodint or "utf-16" - vim.lsp.util.apply_workspace_edit(r.edit, enc) + group = vim.api.nvim_create_augroup("organize_imports", {}), + callback = function(args) + local supported_clients = { + "biome", + "gopls", + } + + for _, client in ipairs(vim.lsp.get_clients { bufnr = args.buf }) do + if vim.tbl_contains(supported_clients, client.name) then + local params = vim.lsp.util.make_range_params() + params.context = { only = { "source.organizeImports" }, diagnostics = {} } + local res = client.request_sync("textDocument/codeAction", params) + + for _, r in pairs(res and res.result or {}) do + if r.edit then + local enc = (vim.lsp.get_client_by_id(client.id) or {}).offset_encodint or "utf-16" + vim.lsp.util.apply_workspace_edit(r.edit, enc) + end end end end end, - pattern = "*.go", + pattern = any_pattern, }, }, { -- 2.51.2 From 39959b6494839b252ce39567f8227f399e53e6c3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 27 Feb 2025 17:51:32 +0900 Subject: [PATCH 487/589] Update vscode.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index e9dc712..945d428 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -32,5 +32,5 @@ "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "typst-preview.nvim": { "branch": "master", "commit": "00ff6829030f302e8ff24d0e3a68625dd1a3ac40" }, - "vscode.nvim": { "branch": "main", "commit": "e5e61a0ea00b5de7a74dada2760e61ac59ecb98e" } + "vscode.nvim": { "branch": "main", "commit": "7331e8316d558e9b3f63b066e98029704f281e91" } } -- 2.51.2 From e064b42fdf5d577895317c4d6ec9dfea25fb0444 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 4 Mar 2025 07:49:24 +0900 Subject: [PATCH 488/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 945d428..88c53e5 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -18,7 +18,7 @@ "neogit": { "branch": "master", "commit": "12f78aaabb37b4946254dd5e47cf7b552904937a" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, - "nvim-cmp": { "branch": "main", "commit": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3" }, + "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, "nvim-lspconfig": { "branch": "master", "commit": "6b63bdf2399b9bedf93297d98419550523a9ad68" }, "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, @@ -26,7 +26,7 @@ "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "d794a4ce0feb7358b6b8ff9107c1447490cc8d46" }, + "octo.nvim": { "branch": "master", "commit": "b96d0c02e6b670f4f343903baa120d3c4b200d57" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- 2.51.2 From 5f14165bcc1ef47a3cb7405c6c2b1bb32bcfc144 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 4 Mar 2025 07:53:43 +0900 Subject: [PATCH 489/589] Update plenary.nvim --- home-manager/nvim/lazy-lock.json | 6 +++--- home-manager/nvim/lua/plugins/plenary.lua | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 88c53e5..b971ed7 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "a3932a1505a990c238183617b5c5cb239f43f5ec" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "a0b1e415336fa2562ad8e14553f7888b7acb1010" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -26,8 +26,8 @@ "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "b96d0c02e6b670f4f343903baa120d3c4b200d57" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "octo.nvim": { "branch": "master", "commit": "1bafbb2cf74cda2e57f578635ea1bfe4c4ec1f80" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, diff --git a/home-manager/nvim/lua/plugins/plenary.lua b/home-manager/nvim/lua/plugins/plenary.lua index 11f5aa5..3dd4680 100644 --- a/home-manager/nvim/lua/plugins/plenary.lua +++ b/home-manager/nvim/lua/plugins/plenary.lua @@ -1,6 +1,7 @@ ---@type LazyPluginSpec local plenary = { "nvim-lua/plenary.nvim", + branch = "master", lazy = true, } -- 2.51.2 From 510e5bfb5a606db68ef9a28380d1a82549dd4ff5 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 5 Mar 2025 14:43:04 +0900 Subject: [PATCH 490/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b971ed7..b0ca2bc 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "a0b1e415336fa2562ad8e14553f7888b7acb1010" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "736fabd590df20c9a4301211f3c133d4d2b72deb" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -14,7 +14,7 @@ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, - "neo-tree.nvim": { "branch": "main", "commit": "e96fd85bf18bc345dab332b345098fa5460dffac" }, + "neo-tree.nvim": { "branch": "main", "commit": "16854ed5559b940f69a6f7138906ebb22c15c553" }, "neogit": { "branch": "master", "commit": "12f78aaabb37b4946254dd5e47cf7b552904937a" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, -- 2.51.2 From ab09a9696cf1f9797b69406efd70e7bef1f95ec6 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 29 Mar 2025 00:51:37 +0900 Subject: [PATCH 491/589] Update plugins --- home-manager/nvim/lazy-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index b0ca2bc..126a57b 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,29 +8,29 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "dc4b8ed0f75bc2557b3158c526624bf04ad233ea" }, - "copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" }, - "gitsigns.nvim": { "branch": "main", "commit": "6668f379ca634c36b8e11453118590b91bf8b295" }, + "copilot.lua": { "branch": "master", "commit": "99654fe9ad6cb2500c66b178a03326f75c95f176" }, + "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, - "neo-tree.nvim": { "branch": "main", "commit": "16854ed5559b940f69a6f7138906ebb22c15c553" }, - "neogit": { "branch": "master", "commit": "12f78aaabb37b4946254dd5e47cf7b552904937a" }, + "lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" }, + "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, + "neogit": { "branch": "master", "commit": "333968f8222fda475d3e4545a9b15fe9912ca26a" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, - "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, + "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, + "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, "nvim-lspconfig": { "branch": "master", "commit": "6b63bdf2399b9bedf93297d98419550523a9ad68" }, - "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" }, - "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, + "nvim-scrollview": { "branch": "main", "commit": "7fa64439e47803956317e4afc456f16a492b4a6a" }, + "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" }, + "nvim-treesitter-context": { "branch": "master", "commit": "93b29a32d5f4be10e39226c6b796f28d68a8b483" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "1bafbb2cf74cda2e57f578635ea1bfe4c4ec1f80" }, + "octo.nvim": { "branch": "master", "commit": "dbe1e09936709f1dbb76b99b4cbaaaf48632f7a8" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, - "typst-preview.nvim": { "branch": "master", "commit": "00ff6829030f302e8ff24d0e3a68625dd1a3ac40" }, - "vscode.nvim": { "branch": "main", "commit": "7331e8316d558e9b3f63b066e98029704f281e91" } + "typst-preview.nvim": { "branch": "master", "commit": "ddcc71126f910ec83037622bc8d506f91a290ade" }, + "vscode.nvim": { "branch": "main", "commit": "3faeb317dab9db5d2310b2dc6472632399ead88f" } } -- 2.51.2 From 64494d333973f818d312d8a81c87dcdbd1e85fe9 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 29 Mar 2025 13:37:04 +0900 Subject: [PATCH 492/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 126a57b..0f62b8a 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,14 +8,14 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "dc4b8ed0f75bc2557b3158c526624bf04ad233ea" }, - "copilot.lua": { "branch": "master", "commit": "99654fe9ad6cb2500c66b178a03326f75c95f176" }, + "copilot.lua": { "branch": "master", "commit": "f7e800b83ccbe512f45725aac6639ba036086474" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" }, + "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" }, "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, - "neogit": { "branch": "master", "commit": "333968f8222fda475d3e4545a9b15fe9912ca26a" }, + "neogit": { "branch": "master", "commit": "6d1bd94f7fca92a50a892f494920696b5defa8c8" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, @@ -26,11 +26,11 @@ "nvim-treesitter-context": { "branch": "master", "commit": "93b29a32d5f4be10e39226c6b796f28d68a8b483" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "dbe1e09936709f1dbb76b99b4cbaaaf48632f7a8" }, + "octo.nvim": { "branch": "master", "commit": "97660ea338c3c94e9e367258a322afc1e154cbbd" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "typst-preview.nvim": { "branch": "master", "commit": "ddcc71126f910ec83037622bc8d506f91a290ade" }, - "vscode.nvim": { "branch": "main", "commit": "3faeb317dab9db5d2310b2dc6472632399ead88f" } + "vscode.nvim": { "branch": "main", "commit": "49d6014ba151fc6cc585b8d5f057ca7839077bf8" } } -- 2.51.2 From 62ffae82fafd4572b01f50f27ddf6abca6968a9b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 29 Mar 2025 13:40:14 +0900 Subject: [PATCH 493/589] Use Telescope to list LSP references --- home-manager/nvim/lua/plugins/lspconfig.lua | 4 ---- home-manager/nvim/lua/plugins/telescope.lua | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 0d5404d..b5c608a 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -179,10 +179,6 @@ local lspconfig = { "h", vim.lsp.buf.hover, }, - { - "rf", - vim.lsp.buf.references, - }, { "rn", vim.lsp.buf.rename, diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua index 665d2b9..bdd3132 100644 --- a/home-manager/nvim/lua/plugins/telescope.lua +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -66,6 +66,12 @@ local telescope = { require(builtin).live_grep() end, }, + { + "rf", + function() + require(builtin).lsp_references() + end, + }, { "?", function() -- 2.51.2 From 00f5df6d6fc1f06d9edcbbbebed90a448734190a Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 29 Mar 2025 21:37:59 +0900 Subject: [PATCH 494/589] Remove `virtual_text = false`, which is disabled by default now --- home-manager/nvim/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 0ba2ce2..b3a35cd 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -75,7 +75,6 @@ vim.diagnostic.config { [vim.diagnostic.severity.HINT] = "DiagnosticSignHint", }, }, - virtual_text = false, } vim.api.nvim_set_keymap("t", "", "", { noremap = true }) -- 2.51.2 From bbc9d5bc8556b035ef61b503ee76390bc4ff2ef5 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 29 Mar 2025 21:56:06 +0900 Subject: [PATCH 495/589] Specify `offset_encoding` --- home-manager/nvim/lua/plugins/lspconfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index b5c608a..75a612f 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -36,7 +36,7 @@ local lspconfig = { for _, client in ipairs(vim.lsp.get_clients { bufnr = args.buf }) do if vim.tbl_contains(supported_clients, client.name) then - local params = vim.lsp.util.make_range_params() + local params = vim.lsp.util.make_range_params(nil, client.offset_encoding) params.context = { only = { "source.organizeImports" }, diagnostics = {} } local res = client.request_sync("textDocument/codeAction", params) -- 2.51.2 From 99e6bc6ae7aa9513725003a0ef25c21d5c667342 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 30 Mar 2025 10:45:59 +0900 Subject: [PATCH 496/589] Add telescope-ui-select.nvim --- home-manager/nvim/lazy-lock.json | 5 +++-- home-manager/nvim/lua/plugins/copilotchat.lua | 1 + home-manager/nvim/lua/plugins/lspconfig.lua | 1 + home-manager/nvim/lua/plugins/telescope-ui-select.lua | 5 +++++ home-manager/nvim/lua/plugins/telescope.lua | 10 +++++++++- 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 home-manager/nvim/lua/plugins/telescope-ui-select.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 0f62b8a..480feb9 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "dc4b8ed0f75bc2557b3158c526624bf04ad233ea" }, - "copilot.lua": { "branch": "master", "commit": "f7e800b83ccbe512f45725aac6639ba036086474" }, + "copilot.lua": { "branch": "master", "commit": "827fd1c75be7263ec832296b771a34f7661a84f1" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, @@ -19,7 +19,7 @@ "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, - "nvim-lspconfig": { "branch": "master", "commit": "6b63bdf2399b9bedf93297d98419550523a9ad68" }, + "nvim-lspconfig": { "branch": "master", "commit": "0a1ac55d7d4ec2b2ed9616dfc5406791234d1d2b" }, "nvim-scrollview": { "branch": "main", "commit": "7fa64439e47803956317e4afc456f16a492b4a6a" }, "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, @@ -29,6 +29,7 @@ "octo.nvim": { "branch": "master", "commit": "97660ea338c3c94e9e367258a322afc1e154cbbd" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "typst-preview.nvim": { "branch": "master", "commit": "ddcc71126f910ec83037622bc8d506f91a290ade" }, diff --git a/home-manager/nvim/lua/plugins/copilotchat.lua b/home-manager/nvim/lua/plugins/copilotchat.lua index eda5b1c..6d5e90a 100644 --- a/home-manager/nvim/lua/plugins/copilotchat.lua +++ b/home-manager/nvim/lua/plugins/copilotchat.lua @@ -26,6 +26,7 @@ return { dependencies = { require "plugins.copilot", require "plugins.plenary", + require "plugins.telescope", }, opts = {}, } diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 75a612f..428787e 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -3,6 +3,7 @@ local event = require "vim_event" ---@type LazyPluginSpec local lspconfig = { "neovim/nvim-lspconfig", + branch = "master", -- TODO: Remove this line after the v1.7.0 release config = function() local any_pattern = "*" diff --git a/home-manager/nvim/lua/plugins/telescope-ui-select.lua b/home-manager/nvim/lua/plugins/telescope-ui-select.lua new file mode 100644 index 0000000..c32f7a8 --- /dev/null +++ b/home-manager/nvim/lua/plugins/telescope-ui-select.lua @@ -0,0 +1,5 @@ +---@type LazyPluginSpec +return { + "nvim-telescope/telescope-ui-select.nvim", + lazy = true, +} diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua index bdd3132..7a72657 100644 --- a/home-manager/nvim/lua/plugins/telescope.lua +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -15,7 +15,9 @@ local telescope = { table.insert(args, v) end - require "telescope".setup { + local telescope = require "telescope" + + telescope.setup { defaults = { layout_config = { prompt_position = "top", @@ -29,6 +31,11 @@ local telescope = { sorting_strategy = "ascending", vimgrep_arguments = args, }, + extensions = { + ["ui-select"] = { + require "telescope.themes".get_dropdown {}, + }, + }, pickers = { find_files = { find_command = { @@ -41,6 +48,7 @@ local telescope = { }, }, } + telescope.load_extension "ui-select" end, dependencies = { require "plugins.devicons", -- 2.51.2 From abdb4e4121f1bce1538e0b37e4c2dea795c38a3a Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 13 Apr 2025 21:30:53 +0900 Subject: [PATCH 497/589] Add avante.nvim --- home-manager/nvim/lazy-lock.json | 25 +++++++++--------- home-manager/nvim/lua/plugins/avante.lua | 33 ++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 home-manager/nvim/lua/plugins/avante.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 480feb9..f6ab77e 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,32 +1,33 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "736fabd590df20c9a4301211f3c133d4d2b72deb" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "a89f5f1162b04a0962e5f4c3cdf248a81e7e53cb" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, + "avante.nvim": { "branch": "main", "commit": "e295fe82f0714188615a524604bdaccd266ced35" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "copilot-lualine": { "branch": "main", "commit": "dc4b8ed0f75bc2557b3158c526624bf04ad233ea" }, - "copilot.lua": { "branch": "master", "commit": "827fd1c75be7263ec832296b771a34f7661a84f1" }, + "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, + "copilot.lua": { "branch": "master", "commit": "c62a2a7616a9789a7676b6b7a8d9263b1082cdc8" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" }, + "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" }, "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, - "neogit": { "branch": "master", "commit": "6d1bd94f7fca92a50a892f494920696b5defa8c8" }, + "neogit": { "branch": "master", "commit": "97f83f1dc51dee41e08e3c7a8adf00e1083e3178" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, - "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, - "nvim-lspconfig": { "branch": "master", "commit": "0a1ac55d7d4ec2b2ed9616dfc5406791234d1d2b" }, + "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "b6936cb85d1e95b5ff00016b1185ab1a14450579" }, "nvim-scrollview": { "branch": "main", "commit": "7fa64439e47803956317e4afc456f16a492b4a6a" }, "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-treesitter-context": { "branch": "master", "commit": "93b29a32d5f4be10e39226c6b796f28d68a8b483" }, + "nvim-treesitter-context": { "branch": "master", "commit": "439789a9a8df9639ecd749bb3286b77117024a6f" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "97660ea338c3c94e9e367258a322afc1e154cbbd" }, + "octo.nvim": { "branch": "master", "commit": "9ccdfccb4ae5f2d5e6c8df01f0298a4bdfb4999e" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/home-manager/nvim/lua/plugins/avante.lua b/home-manager/nvim/lua/plugins/avante.lua new file mode 100644 index 0000000..14eeecd --- /dev/null +++ b/home-manager/nvim/lua/plugins/avante.lua @@ -0,0 +1,33 @@ +---@type LazyPluginSpec +return { + "yetone/avante.nvim", + build = "make", + cmd = { + "AvanteAsk", + "AvanteBuild", + "AvanteChat", + "AvanteClear", + "AvanteEdit", + "AvanteFocus", + "AvanteHistory", + "AvanteModels", + "AvanteRefresh", + "AvanteStop", + "AvanteSwitchFileSelectorProvider", + "AvanteSwitchProvider", + "AvanteShowRepoMap", + "AvanteToggle", + }, + dependencies = { + require "plugins.copilot", + require "plugins.devicons", + require "plugins.nui", + require "plugins.plenary", + require "plugins.telescope", + require "plugins.treesitter", + }, + opts = { + provider = "copilot", + }, + version = false, +} -- 2.51.2 From 085544b448b38d58cc110121fdba0a5440e0ef56 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 19 Apr 2025 22:49:03 +0900 Subject: [PATCH 498/589] Update plugins --- home-manager/nvim/lazy-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index f6ab77e..8861ddc 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "CopilotChat.nvim": { "branch": "canary", "commit": "a89f5f1162b04a0962e5f4c3cdf248a81e7e53cb" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "avante.nvim": { "branch": "main", "commit": "e295fe82f0714188615a524604bdaccd266ced35" }, + "avante.nvim": { "branch": "main", "commit": "eb1cd44731783024621beafe4e46204cbc9a4320" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, @@ -9,25 +9,25 @@ "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "c62a2a7616a9789a7676b6b7a8d9263b1082cdc8" }, + "copilot.lua": { "branch": "master", "commit": "b3988bb51e87a057fee79192c3cc0932a0360bf6" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" }, "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, - "neogit": { "branch": "master", "commit": "97f83f1dc51dee41e08e3c7a8adf00e1083e3178" }, + "neogit": { "branch": "master", "commit": "9bb1e73c534f767607e0a888f3de4c942825c501" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "b6936cb85d1e95b5ff00016b1185ab1a14450579" }, - "nvim-scrollview": { "branch": "main", "commit": "7fa64439e47803956317e4afc456f16a492b4a6a" }, - "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, + "nvim-lspconfig": { "branch": "master", "commit": "32b6a6449aaba11461fffbb596dd6310af79eea4" }, + "nvim-scrollview": { "branch": "main", "commit": "8144aff01251beefd563fce55e8408dd2025c621" }, + "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-treesitter-context": { "branch": "master", "commit": "439789a9a8df9639ecd749bb3286b77117024a6f" }, + "nvim-treesitter-context": { "branch": "master", "commit": "6daca3ad780f045550b820f262002f35175a6c04" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "9ccdfccb4ae5f2d5e6c8df01f0298a4bdfb4999e" }, + "octo.nvim": { "branch": "master", "commit": "03059cf4d694e2b3065136f074b42ee98ff8e4b2" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From 4c661238b4f76f3b95e6b2ccab1d8d971cc0780d Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 20 Apr 2025 10:20:40 +0900 Subject: [PATCH 499/589] Update copilot.lua --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 8861ddc..d0c44ed 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -9,7 +9,7 @@ "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "b3988bb51e87a057fee79192c3cc0932a0360bf6" }, + "copilot.lua": { "branch": "master", "commit": "dc579f98536029610cfa32c6bad86c0d24363679" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, -- 2.51.2 From dfd545cab5d3ffe0aa28f7a95ddf81e2ba49dd6c Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 5 May 2025 21:31:54 +0900 Subject: [PATCH 500/589] Update plugins --- home-manager/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index d0c44ed..896a0ba 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "a89f5f1162b04a0962e5f4c3cdf248a81e7e53cb" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "6cb362d040f4f7e1177145fa27b3aee1c0bd6bff" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "avante.nvim": { "branch": "main", "commit": "eb1cd44731783024621beafe4e46204cbc9a4320" }, + "avante.nvim": { "branch": "main", "commit": "e21f1f07bd5282819b2ced170db5da226dfa5c85" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, @@ -9,30 +9,30 @@ "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "dc579f98536029610cfa32c6bad86c0d24363679" }, + "copilot.lua": { "branch": "master", "commit": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" }, - "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, - "neogit": { "branch": "master", "commit": "9bb1e73c534f767607e0a888f3de4c942825c501" }, - "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "neo-tree.nvim": { "branch": "main", "commit": "1ef260eb4f54515fe121a2267b477efb054d108a" }, + "neogit": { "branch": "master", "commit": "0b9aebe6a51f88d291cbf972b7aad7ad58ea3998" }, + "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "32b6a6449aaba11461fffbb596dd6310af79eea4" }, + "nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" }, "nvim-scrollview": { "branch": "main", "commit": "8144aff01251beefd563fce55e8408dd2025c621" }, "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, "nvim-treesitter-context": { "branch": "master", "commit": "6daca3ad780f045550b820f262002f35175a6c04" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "03059cf4d694e2b3065136f074b42ee98ff8e4b2" }, + "octo.nvim": { "branch": "master", "commit": "974d2247b64535bedbbdbb7bec29dfa4e2395037" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, - "typst-preview.nvim": { "branch": "master", "commit": "ddcc71126f910ec83037622bc8d506f91a290ade" }, - "vscode.nvim": { "branch": "main", "commit": "49d6014ba151fc6cc585b8d5f057ca7839077bf8" } + "typst-preview.nvim": { "branch": "master", "commit": "2503b188cd2a17ce44fdd21a944a93335e935215" }, + "vscode.nvim": { "branch": "main", "commit": "5769f298af4abf371528b25623fecb1e069c858c" } } -- 2.51.2 From 3c6ba096298639b6bd8aea8960fd7e4cdb9cafab Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 5 May 2025 21:32:51 +0900 Subject: [PATCH 501/589] Add C++ to `ftmap` --- home-manager/nvim/lua/plugins/lualine.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index f855c58..fcc16f2 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -1,5 +1,6 @@ local ftmap = { css = "CSS", + cpp = "C++", gitcommit = "Git Commit", html = "HTML", json = "JSON", -- 2.51.2 From d9f539323897f927df2951c5c32fb758cfedb527 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 6 May 2025 15:51:23 +0900 Subject: [PATCH 502/589] Fix nvim-lspconfig version --- home-manager/nvim/lazy-lock.json | 6 +++--- home-manager/nvim/lua/plugins/lspconfig.lua | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 896a0ba..1fac9c4 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "CopilotChat.nvim": { "branch": "canary", "commit": "6cb362d040f4f7e1177145fa27b3aee1c0bd6bff" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "avante.nvim": { "branch": "main", "commit": "e21f1f07bd5282819b2ced170db5da226dfa5c85" }, + "avante.nvim": { "branch": "main", "commit": "0b78b58760a5fd257797936e74e0bf5ddb445de1" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, @@ -9,7 +9,7 @@ "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0" }, + "copilot.lua": { "branch": "master", "commit": "7ba73866b9b3c696f80579c470c6eec374d3acec" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, @@ -20,7 +20,7 @@ "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" }, + "nvim-lspconfig": { "branch": "master", "commit": "fa2662510d30b06168b6e2e6915518decde6bbac" }, "nvim-scrollview": { "branch": "main", "commit": "8144aff01251beefd563fce55e8408dd2025c621" }, "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 428787e..75a612f 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -3,7 +3,6 @@ local event = require "vim_event" ---@type LazyPluginSpec local lspconfig = { "neovim/nvim-lspconfig", - branch = "master", -- TODO: Remove this line after the v1.7.0 release config = function() local any_pattern = "*" -- 2.51.2 From 09bf954f24a95cc2b7526a48b1b902ae9a77ac2b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 14 Jun 2025 09:15:09 +0900 Subject: [PATCH 503/589] Update plugins --- home-manager/nvim/lazy-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 1fac9c4..7e2a7ba 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,38 +1,38 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "6cb362d040f4f7e1177145fa27b3aee1c0bd6bff" }, - "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "avante.nvim": { "branch": "main", "commit": "0b78b58760a5fd257797936e74e0bf5ddb445de1" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "eddc9a98930cda0b3819cc1d93427b402697dfab" }, + "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "avante.nvim": { "branch": "main", "commit": "fdf4716ec04cf5d9f8f39a44b7d42ab37cc2bd40" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, + "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "7ba73866b9b3c696f80579c470c6eec374d3acec" }, + "copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, - "neo-tree.nvim": { "branch": "main", "commit": "1ef260eb4f54515fe121a2267b477efb054d108a" }, - "neogit": { "branch": "master", "commit": "0b9aebe6a51f88d291cbf972b7aad7ad58ea3998" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, + "neogit": { "branch": "master", "commit": "1b4f44374f97d9262caa680e41ecbebcaf1553bd" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "fa2662510d30b06168b6e2e6915518decde6bbac" }, - "nvim-scrollview": { "branch": "main", "commit": "8144aff01251beefd563fce55e8408dd2025c621" }, - "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, - "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-treesitter-context": { "branch": "master", "commit": "6daca3ad780f045550b820f262002f35175a6c04" }, + "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" }, + "nvim-scrollview": { "branch": "main", "commit": "23db9bbd210fed942085070071fdac921837a55f" }, + "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "974d2247b64535bedbbdbb7bec29dfa4e2395037" }, + "octo.nvim": { "branch": "master", "commit": "06f2c37d2cdda36a76166de461589359345a870c" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, - "typst-preview.nvim": { "branch": "master", "commit": "2503b188cd2a17ce44fdd21a944a93335e935215" }, - "vscode.nvim": { "branch": "main", "commit": "5769f298af4abf371528b25623fecb1e069c858c" } + "typst-preview.nvim": { "branch": "master", "commit": "dea4525d5420b7c32eebda7de15a6beb9d6574fa" }, + "vscode.nvim": { "branch": "main", "commit": "4d1c3c64d1afddd7934fb0e687fd9557fc66be41" } } -- 2.51.2 From 76f71c10b87572e9e76efe5d1536f28f711f3836 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 14 Jun 2025 09:31:25 +0900 Subject: [PATCH 504/589] Make tab line and status line transparent --- home-manager/nvim/lua/plugins/vscode.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/lua/plugins/vscode.lua b/home-manager/nvim/lua/plugins/vscode.lua index c923c58..2db1034 100644 --- a/home-manager/nvim/lua/plugins/vscode.lua +++ b/home-manager/nvim/lua/plugins/vscode.lua @@ -6,6 +6,8 @@ local vscode_plugin = { local is_wezterm = os.getenv "TERM_PROGRAM" == "WezTerm" vscode.setup { transparent = is_wezterm } vscode.load() + vim.api.nvim_set_hl(0, "StatusLine", { bg = "none" }) + vim.api.nvim_set_hl(0, "TabLineFill", { bg = "none" }) end, } -- 2.51.2 From 3cb1256f837fe83df25efe5fd0586185eace20c6 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 7 Jul 2025 11:41:44 +0900 Subject: [PATCH 505/589] Update plugins --- home-manager/nvim/lazy-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7e2a7ba..356afa3 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,24 +1,24 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "eddc9a98930cda0b3819cc1d93427b402697dfab" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "4944b11123ef7c8f9f6ddd0c85de5e4d20b45690" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "avante.nvim": { "branch": "main", "commit": "fdf4716ec04cf5d9f8f39a44b7d42ab37cc2bd40" }, + "avante.nvim": { "branch": "main", "commit": "39ac64aca65d66d05409e712fac666eb298561f5" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, + "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" }, + "copilot.lua": { "branch": "master", "commit": "46f4b7d026cba9497159dcd3e6aa61a185cb1c48" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, - "neogit": { "branch": "master", "commit": "1b4f44374f97d9262caa680e41ecbebcaf1553bd" }, + "neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" }, + "neogit": { "branch": "master", "commit": "59725524d25f9a8a9474f113d60db52bad8504d0" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, - "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, + "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" }, "nvim-scrollview": { "branch": "main", "commit": "23db9bbd210fed942085070071fdac921837a55f" }, @@ -27,7 +27,7 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "06f2c37d2cdda36a76166de461589359345a870c" }, + "octo.nvim": { "branch": "master", "commit": "e5405d01c0252d711ff6256179140d8dd5c847d6" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From cb8dd6a2c70381f836e8356db3bd213125ea7738 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 16 Jul 2025 15:26:49 +0900 Subject: [PATCH 506/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 356afa3..7e362ca 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "4944b11123ef7c8f9f6ddd0c85de5e4d20b45690" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "bdb270dac270a0e27b23bf2ef40482405b3c984d" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "avante.nvim": { "branch": "main", "commit": "39ac64aca65d66d05409e712fac666eb298561f5" }, + "avante.nvim": { "branch": "main", "commit": "966eef743bbf8e9ef4a2664747dbfbd093c2355c" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, @@ -9,7 +9,7 @@ "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "46f4b7d026cba9497159dcd3e6aa61a185cb1c48" }, + "copilot.lua": { "branch": "master", "commit": "3680bebcc95dfd6c7509466367e66f6dc64a5140" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, @@ -27,7 +27,7 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "e5405d01c0252d711ff6256179140d8dd5c847d6" }, + "octo.nvim": { "branch": "master", "commit": "ebcd49809e6377687757b16ab383ee63917cae98" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From 63455699ec0e67a3ba7ea75eea7bc4dc757e4992 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 16 Jul 2025 15:40:19 +0900 Subject: [PATCH 507/589] Add vimade --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/vimade.lua | 13 +++++++++++++ home-manager/nvim/lua/vim_event/init.lua | 1 + 3 files changed, 15 insertions(+) create mode 100644 home-manager/nvim/lua/plugins/vimade.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7e362ca..bbf59df 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -34,5 +34,6 @@ "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "typst-preview.nvim": { "branch": "master", "commit": "dea4525d5420b7c32eebda7de15a6beb9d6574fa" }, + "vimade": { "branch": "master", "commit": "f63ca5cb9cf811b2c526694e820b87fe2238deb6" }, "vscode.nvim": { "branch": "main", "commit": "4d1c3c64d1afddd7934fb0e687fd9557fc66be41" } } diff --git a/home-manager/nvim/lua/plugins/vimade.lua b/home-manager/nvim/lua/plugins/vimade.lua new file mode 100644 index 0000000..02040f7 --- /dev/null +++ b/home-manager/nvim/lua/plugins/vimade.lua @@ -0,0 +1,13 @@ +---@type LazyPluginSpec +return { + "TaDaa/vimade", + event = require "vim_event".very_lazy, + opts = { + recipe = { + "default", + { + animate = true, + }, + }, + }, +} diff --git a/home-manager/nvim/lua/vim_event/init.lua b/home-manager/nvim/lua/vim_event/init.lua index a4e2dd5..f61b9f0 100644 --- a/home-manager/nvim/lua/vim_event/init.lua +++ b/home-manager/nvim/lua/vim_event/init.lua @@ -5,6 +5,7 @@ local M = { buf_write_pre = "BufWritePre", insert_enter = "InsertEnter", term_open = "TermOpen", + very_lazy = "VeryLazy", } return M -- 2.51.2 From d328a6b65fac76f85e2905ec50ed27c039990f34 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Wed, 16 Jul 2025 16:01:13 +0900 Subject: [PATCH 508/589] Enable vimade only for Telescope --- home-manager/nvim/lua/plugins/telescope.lua | 1 + home-manager/nvim/lua/plugins/vimade.lua | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua index 7a72657..c35cdb4 100644 --- a/home-manager/nvim/lua/plugins/telescope.lua +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -54,6 +54,7 @@ local telescope = { require "plugins.devicons", require "plugins.plenary", require "plugins.treesitter", + require "plugins.vimade", }, keys = { { diff --git a/home-manager/nvim/lua/plugins/vimade.lua b/home-manager/nvim/lua/plugins/vimade.lua index 02040f7..8d0d5a3 100644 --- a/home-manager/nvim/lua/plugins/vimade.lua +++ b/home-manager/nvim/lua/plugins/vimade.lua @@ -1,8 +1,18 @@ ---@type LazyPluginSpec return { "TaDaa/vimade", - event = require "vim_event".very_lazy, + lazy = true, opts = { + blocklist = { + default = function(_, active) + -- Enable only if the active buffer is a Telescope prompt + if active and active.buf_opts.filetype ~= "TelescopePrompt" then + return true + end + + return false + end, + }, recipe = { "default", { -- 2.51.2 From ec7d97a9891e1bb45e27f269a18be45c30bf9d56 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 25 Jul 2025 17:47:52 +0900 Subject: [PATCH 509/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index bbf59df..45d5f45 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "CopilotChat.nvim": { "branch": "canary", "commit": "bdb270dac270a0e27b23bf2ef40482405b3c984d" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "avante.nvim": { "branch": "main", "commit": "966eef743bbf8e9ef4a2664747dbfbd093c2355c" }, + "avante.nvim": { "branch": "main", "commit": "bd69ae14f6f1f21642e16c16cbd18954f62365aa" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, @@ -9,14 +9,14 @@ "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "3680bebcc95dfd6c7509466367e66f6dc64a5140" }, + "copilot.lua": { "branch": "master", "commit": "64422b725c4ae102838f3efe832dafb68be2246d" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, "neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" }, - "neogit": { "branch": "master", "commit": "59725524d25f9a8a9474f113d60db52bad8504d0" }, + "neogit": { "branch": "master", "commit": "99b811a99a195c4d3a627341bb7ccf6a22c4e6ea" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, @@ -27,7 +27,7 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "ebcd49809e6377687757b16ab383ee63917cae98" }, + "octo.nvim": { "branch": "master", "commit": "17331ce1fc2537429786db91842c1013721adf38" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From 7fe0622a91cf8926fdec427fef27866f789a0542 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 25 Jul 2025 17:48:14 +0900 Subject: [PATCH 510/589] Add Caddyfile pattern --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index b3a35cd..d7f9ab2 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -84,6 +84,7 @@ vim.filetype.add { mdx = "markdown.mdx", }, pattern = { + Caddyfile = "caddy", ["openapi.*%.ya?ml"] = "yaml.openapi", }, } -- 2.51.2 From d59f86ed4484378c8bb963941d445f198243a435 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 26 Jul 2025 21:44:57 +0900 Subject: [PATCH 511/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 45d5f45..6201b0c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "CopilotChat.nvim": { "branch": "canary", "commit": "bdb270dac270a0e27b23bf2ef40482405b3c984d" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "avante.nvim": { "branch": "main", "commit": "bd69ae14f6f1f21642e16c16cbd18954f62365aa" }, + "avante.nvim": { "branch": "main", "commit": "d8ec4e4aa464b29c6ee276a701a691a042053c3f" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, @@ -9,7 +9,7 @@ "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "64422b725c4ae102838f3efe832dafb68be2246d" }, + "copilot.lua": { "branch": "master", "commit": "4958fb9390f624cb389be2772e3c5e718e94d8b6" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, -- 2.51.2 From 11e5f797e47a1bb6009445e09facb68da8fdffd6 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 26 Jul 2025 21:58:22 +0900 Subject: [PATCH 512/589] Set `winborder` to `rounded` --- home-manager/nvim/init.lua | 1 + home-manager/nvim/lua/plugins/telescope.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index d7f9ab2..50cb6da 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -112,6 +112,7 @@ vim.opt.shiftwidth = 2 vim.opt.signcolumn = "yes" vim.opt.splitright = true vim.opt.tabstop = 4 +vim.opt.winborder = "rounded" vim.opt.wrap = false if is_windows then diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua index c35cdb4..b06284e 100644 --- a/home-manager/nvim/lua/plugins/telescope.lua +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -19,6 +19,7 @@ local telescope = { telescope.setup { defaults = { + border = false, layout_config = { prompt_position = "top", }, -- 2.51.2 From 130c9a69acf44c78743ff7e03838e820e00162fa Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 27 Jul 2025 10:05:47 +0900 Subject: [PATCH 513/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 6201b0c..929fa05 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -22,13 +22,13 @@ "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" }, "nvim-scrollview": { "branch": "main", "commit": "23db9bbd210fed942085070071fdac921837a55f" }, - "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" }, + "nvim-surround": { "branch": "main", "commit": "7a7a78a52219a3312c1fcabf880cea07a7956a5f" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "octo.nvim": { "branch": "master", "commit": "17331ce1fc2537429786db91842c1013721adf38" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, -- 2.51.2 From 92175ad46fd317e0845b04c9843ef972dd548783 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 27 Jul 2025 10:05:57 +0900 Subject: [PATCH 514/589] Re-enable Telescope border As Plenary now supports native winborder --- home-manager/nvim/lua/plugins/telescope.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/telescope.lua b/home-manager/nvim/lua/plugins/telescope.lua index b06284e..c35cdb4 100644 --- a/home-manager/nvim/lua/plugins/telescope.lua +++ b/home-manager/nvim/lua/plugins/telescope.lua @@ -19,7 +19,6 @@ local telescope = { telescope.setup { defaults = { - border = false, layout_config = { prompt_position = "top", }, -- 2.51.2 From 3ddc2dab9d5132db82925b5c2fe1ee1c15856bee Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 27 Jul 2025 14:51:45 +0900 Subject: [PATCH 515/589] Use hard tab in Caddyfile --- home-manager/nvim/after/ftplugin/caddy.lua | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 home-manager/nvim/after/ftplugin/caddy.lua diff --git a/home-manager/nvim/after/ftplugin/caddy.lua b/home-manager/nvim/after/ftplugin/caddy.lua new file mode 100644 index 0000000..43264bd --- /dev/null +++ b/home-manager/nvim/after/ftplugin/caddy.lua @@ -0,0 +1,2 @@ +vim.opt_local.expandtab = false +vim.opt_local.shiftwidth = 4 -- 2.51.2 From 08e4c3d005240e365b93e992e0e86e036b0055f5 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 11 Aug 2025 09:15:05 +0900 Subject: [PATCH 516/589] Update plugins --- home-manager/nvim/lazy-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 929fa05..8e9e743 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,33 +1,33 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "bdb270dac270a0e27b23bf2ef40482405b3c984d" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "0553496607717e539f08780a75c292a81619dcb6" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "avante.nvim": { "branch": "main", "commit": "d8ec4e4aa464b29c6ee276a701a691a042053c3f" }, + "avante.nvim": { "branch": "main", "commit": "5a4ed4ac924adb148075b461016078ac18792816" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" }, + "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "4958fb9390f624cb389be2772e3c5e718e94d8b6" }, + "copilot.lua": { "branch": "master", "commit": "0f2fd3829dd27d682e46c244cf48d9715726f612" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, - "hex.nvim": { "branch": "master", "commit": "fcff75fcf43b5a6c5b471eed65b3a06c412d6020" }, + "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, "neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" }, - "neogit": { "branch": "master", "commit": "99b811a99a195c4d3a627341bb7ccf6a22c4e6ea" }, + "neogit": { "branch": "master", "commit": "269a813161b009de19db416ad159891502cf0c85" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" }, + "nvim-lspconfig": { "branch": "master", "commit": "3db16ceeea947517f0dc1404c24dcb5ab0c91d26" }, "nvim-scrollview": { "branch": "main", "commit": "23db9bbd210fed942085070071fdac921837a55f" }, "nvim-surround": { "branch": "main", "commit": "7a7a78a52219a3312c1fcabf880cea07a7956a5f" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "17331ce1fc2537429786db91842c1013721adf38" }, + "octo.nvim": { "branch": "master", "commit": "1d8abaffbd8a8e5e6a2ece8523fc00a1dc38a41b" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, @@ -35,5 +35,5 @@ "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "typst-preview.nvim": { "branch": "master", "commit": "dea4525d5420b7c32eebda7de15a6beb9d6574fa" }, "vimade": { "branch": "master", "commit": "f63ca5cb9cf811b2c526694e820b87fe2238deb6" }, - "vscode.nvim": { "branch": "main", "commit": "4d1c3c64d1afddd7934fb0e687fd9557fc66be41" } + "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" } } -- 2.51.2 From 920f2cd56a4ac137a87dd426c148c86635dd7489 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 11 Aug 2025 09:15:52 +0900 Subject: [PATCH 517/589] Do not use `bunx` --- home-manager/nvim/lua/plugins/lspconfig.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 75a612f..b669715 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -132,11 +132,6 @@ local lspconfig = { } end - lsp_config.biome.setup { - capabilities = capabilities, - cmd = { "bunx", "biome", "lsp-proxy" }, - } - lsp_config.powershell_es.setup { bundle_path = "C:/PowerShellEditorServices", capabilities = capabilities, -- 2.51.2 From 3abce09aa0f31764082f226eafb30d444dc27181 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 11 Aug 2025 12:16:29 +0900 Subject: [PATCH 518/589] Display sql filetype in uppercase --- home-manager/nvim/lua/plugins/lualine.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index fcc16f2..e185292 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -5,6 +5,7 @@ local ftmap = { html = "HTML", json = "JSON", ["markdown.mdx"] = "MDX", + sql = "SQL", toml = "TOML", typescript = "TypeScript", typescriptreact = "TSX", -- 2.51.2 From 1002a406684bb26d14956c37ddcb37e5a7ccd6e9 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 13 Sep 2025 14:20:50 +0900 Subject: [PATCH 519/589] Update plugins --- home-manager/nvim/lazy-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 8e9e743..97da1c1 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,33 +1,33 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "0553496607717e539f08780a75c292a81619dcb6" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "1d8aa27e2317950b0b7ddc023487c6f2b7b074ca" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "avante.nvim": { "branch": "main", "commit": "5a4ed4ac924adb148075b461016078ac18792816" }, + "avante.nvim": { "branch": "main", "commit": "39336ca00af2c8feedd929aa35d57a9fdac831bf" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "0f2fd3829dd27d682e46c244cf48d9715726f612" }, + "copilot.lua": { "branch": "master", "commit": "81d289a8ce5d4ee1dea9b1c8ee4ac376b2e27a5f" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" }, - "neogit": { "branch": "master", "commit": "269a813161b009de19db416ad159891502cf0c85" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "neo-tree.nvim": { "branch": "main", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" }, + "neogit": { "branch": "master", "commit": "6617978288d58eb121754b5dd890e893d9a7e8d6" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-lspconfig": { "branch": "master", "commit": "3db16ceeea947517f0dc1404c24dcb5ab0c91d26" }, "nvim-scrollview": { "branch": "main", "commit": "23db9bbd210fed942085070071fdac921837a55f" }, - "nvim-surround": { "branch": "main", "commit": "7a7a78a52219a3312c1fcabf880cea07a7956a5f" }, + "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "1d8abaffbd8a8e5e6a2ece8523fc00a1dc38a41b" }, + "octo.nvim": { "branch": "master", "commit": "6dabe62fb6678804ad38fb0f060854a5d1d4a7ef" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From 8568e7144ab4077c2b11278f80ff3b2cce2e9e13 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 23 Sep 2025 11:01:43 +0900 Subject: [PATCH 520/589] Update plugins --- home-manager/nvim/lazy-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 97da1c1..8283ef5 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "1d8aa27e2317950b0b7ddc023487c6f2b7b074ca" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "181a523f5bf6b8f277e6a994907c23f9e84d2445" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "avante.nvim": { "branch": "main", "commit": "39336ca00af2c8feedd929aa35d57a9fdac831bf" }, + "avante.nvim": { "branch": "main", "commit": "44db8eba870f6c123da5efa70384b2889f3e3495" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, @@ -9,25 +9,25 @@ "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "81d289a8ce5d4ee1dea9b1c8ee4ac376b2e27a5f" }, + "copilot.lua": { "branch": "master", "commit": "46e9895565fdae79833eda075b9b05d8543d7a77" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, + "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "neo-tree.nvim": { "branch": "main", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" }, - "neogit": { "branch": "master", "commit": "6617978288d58eb121754b5dd890e893d9a7e8d6" }, + "neo-tree.nvim": { "branch": "main", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" }, + "neogit": { "branch": "master", "commit": "704ed34e957c8702df994bdcc8404e134d1e8212" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "3db16ceeea947517f0dc1404c24dcb5ab0c91d26" }, + "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "23db9bbd210fed942085070071fdac921837a55f" }, "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "6dabe62fb6678804ad38fb0f060854a5d1d4a7ef" }, + "octo.nvim": { "branch": "master", "commit": "76c2a426c0d3d9d1cc340f2989ed9f607b33c7a8" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From 1d3d5228d880a9d5951c7d3f4c6da4ecf56051d4 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 23 Sep 2025 11:50:25 +0900 Subject: [PATCH 521/589] Configure LSP capability using `vim.lsp.config` --- home-manager/nvim/lua/plugins/cmp-nvim-lsp.lua | 14 ++++++++++++++ home-manager/nvim/lua/plugins/cmp.lua | 5 +---- home-manager/nvim/lua/plugins/lspconfig.lua | 8 -------- 3 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 home-manager/nvim/lua/plugins/cmp-nvim-lsp.lua diff --git a/home-manager/nvim/lua/plugins/cmp-nvim-lsp.lua b/home-manager/nvim/lua/plugins/cmp-nvim-lsp.lua new file mode 100644 index 0000000..2d915f0 --- /dev/null +++ b/home-manager/nvim/lua/plugins/cmp-nvim-lsp.lua @@ -0,0 +1,14 @@ +---@type LazyPluginSpec +return { + "hrsh7th/cmp-nvim-lsp", + config = function() + local capabilities = require "cmp_nvim_lsp".default_capabilities() + + capabilities.textDocument.completion.completionItem.snippetSupport = true + + vim.lsp.config("*", { + capabilities = capabilities, + }) + end, + lazy = true, +} diff --git a/home-manager/nvim/lua/plugins/cmp.lua b/home-manager/nvim/lua/plugins/cmp.lua index 70e0e50..075234e 100644 --- a/home-manager/nvim/lua/plugins/cmp.lua +++ b/home-manager/nvim/lua/plugins/cmp.lua @@ -68,10 +68,7 @@ local cmp = { dependencies = { "hrsh7th/cmp-cmdline", "hrsh7th/cmp-nvim-lua", - { - "hrsh7th/cmp-nvim-lsp", - dependencies = { require "plugins.lspconfig" }, - }, + require "plugins.cmp-nvim-lsp", "hrsh7th/cmp-path", "onsails/lspkind.nvim", { diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index b669715..325adae 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -72,9 +72,6 @@ local lspconfig = { end local lsp_config = require "lspconfig" - local capabilities = require "cmp_nvim_lsp".default_capabilities() - capabilities.textDocument.completion.completionItem.snippetSupport = true - ---@type boolean local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. "/deno.json") == 1 or vim.fn.filereadable(vim.fn.getcwd() .. "/deno.jsonc") == 1 @@ -114,7 +111,6 @@ local lspconfig = { for _, lsp in ipairs(servers) do lsp_config[lsp].setup { - capabilities = capabilities, settings = { gopls = { ["local"] = goimports_local, @@ -134,18 +130,15 @@ local lspconfig = { lsp_config.powershell_es.setup { bundle_path = "C:/PowerShellEditorServices", - capabilities = capabilities, } lsp_config.tinymist.setup { - capabilities = capabilities, settings = { formatterMode = "typstyle", }, } lsp_config.yamlls.setup { - capabilities = capabilities, filetypes = { "yaml", "yaml.docker-compose", @@ -159,7 +152,6 @@ local lspconfig = { end, dependencies = { "b0o/schemastore.nvim", - "hrsh7th/cmp-nvim-lsp", }, event = { event.buf_new_file, -- 2.51.2 From 024997aec918b5251dae6c0fa67c690f25216d0c Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 23 Sep 2025 12:00:03 +0900 Subject: [PATCH 522/589] Configure lua_ls without using lspconfig --- home-manager/nvim/init.lua | 4 ++++ home-manager/nvim/lua/plugins/lspconfig.lua | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 50cb6da..17d367b 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -89,6 +89,10 @@ vim.filetype.add { }, } +vim.lsp.enable { + "lua_ls", +} + vim.opt.cmdheight = 0 vim.opt.cursorline = true vim.api.nvim_set_hl(0, "CursorLine", { background = "#444444" }) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 325adae..9ed2957 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -99,7 +99,6 @@ local lspconfig = { "gopls", "jsonls", "lemminx", - "lua_ls", "pylsp", "rust_analyzer", "vacuum", -- 2.51.2 From 2c79ad7f5c2bbe61113c896033fa4ba0db002bc2 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 23 Sep 2025 12:23:33 +0900 Subject: [PATCH 523/589] Enable inlay hints for lua_ls --- home-manager/nvim/after/lsp/lua_ls.lua | 11 +++++++++++ home-manager/nvim/init.lua | 1 + 2 files changed, 12 insertions(+) create mode 100644 home-manager/nvim/after/lsp/lua_ls.lua diff --git a/home-manager/nvim/after/lsp/lua_ls.lua b/home-manager/nvim/after/lsp/lua_ls.lua new file mode 100644 index 0000000..46093ff --- /dev/null +++ b/home-manager/nvim/after/lsp/lua_ls.lua @@ -0,0 +1,11 @@ +---@type vim.lsp.Config +return { + settings = { + Lua = { + hint = { + enable = true, + setType = true, + }, + }, + }, +} diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 17d367b..1d6e271 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -92,6 +92,7 @@ vim.filetype.add { vim.lsp.enable { "lua_ls", } +vim.lsp.inlay_hint.enable() vim.opt.cmdheight = 0 vim.opt.cursorline = true -- 2.51.2 From 2bf7f471bb9add530433cb0eefe458e82cf0b417 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 23 Sep 2025 14:52:11 +0900 Subject: [PATCH 524/589] Move TypeScript-related LSPs into separate files --- home-manager/nvim/after/lsp/denols.lua | 4 ++++ home-manager/nvim/after/lsp/ts_ls.lua | 6 ++++++ home-manager/nvim/init.lua | 2 ++ home-manager/nvim/lua/plugins/lspconfig.lua | 7 ------- 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 home-manager/nvim/after/lsp/denols.lua create mode 100644 home-manager/nvim/after/lsp/ts_ls.lua diff --git a/home-manager/nvim/after/lsp/denols.lua b/home-manager/nvim/after/lsp/denols.lua new file mode 100644 index 0000000..ac80ebf --- /dev/null +++ b/home-manager/nvim/after/lsp/denols.lua @@ -0,0 +1,4 @@ +return { + root_markers = { "deno.json", "deno.jsonc" }, + workspace_required = true, +} diff --git a/home-manager/nvim/after/lsp/ts_ls.lua b/home-manager/nvim/after/lsp/ts_ls.lua new file mode 100644 index 0000000..8e206a6 --- /dev/null +++ b/home-manager/nvim/after/lsp/ts_ls.lua @@ -0,0 +1,6 @@ +return { + root_dir = function() + end, -- Prevent lspconfig from automatically setting root_dir + root_markers = { "tsconfig.json" }, + workspace_required = true, +} diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 1d6e271..32cb96b 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -90,7 +90,9 @@ vim.filetype.add { } vim.lsp.enable { + "denols", "lua_ls", + "ts_ls", } vim.lsp.inlay_hint.enable() diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 9ed2957..d468c53 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -72,12 +72,6 @@ local lspconfig = { end local lsp_config = require "lspconfig" - ---@type boolean - local use_deno = vim.fn.filereadable(vim.fn.getcwd() .. "/deno.json") == 1 or - vim.fn.filereadable(vim.fn.getcwd() .. "/deno.jsonc") == 1 - ---@type string - local tsserver = use_deno and "denols" or "ts_ls" - ---@type string local goimports_local ---@type string @@ -102,7 +96,6 @@ local lspconfig = { "pylsp", "rust_analyzer", "vacuum", - tsserver, } local schemastore = require "schemastore" -- 2.51.2 From 063d8a38ac64c793136ef54e6d8d9e3b56972474 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 23 Sep 2025 14:55:10 +0900 Subject: [PATCH 525/589] Enable inlay hints for denols --- home-manager/nvim/after/lsp/denols.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/home-manager/nvim/after/lsp/denols.lua b/home-manager/nvim/after/lsp/denols.lua index ac80ebf..10871e8 100644 --- a/home-manager/nvim/after/lsp/denols.lua +++ b/home-manager/nvim/after/lsp/denols.lua @@ -1,4 +1,16 @@ return { root_markers = { "deno.json", "deno.jsonc" }, + settings = { + deno = { + inlayHints = { + parameterNames = { enabled = "all", suppressWhenArgumentMatchesName = true }, + parameterTypes = { enabled = true }, + variableTypes = { enabled = true, suppressWhenTypeMatchesName = true }, + propertyDeclarationTypes = { enabled = true }, + functionLikeReturnTypes = { enable = true }, + enumMemberValues = { enabled = true }, + }, + }, + }, workspace_required = true, } -- 2.51.2 From d96254bbeb4996952c18ce0670398fd155177aa4 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 23 Sep 2025 15:40:06 +0900 Subject: [PATCH 526/589] Move jsonls config to separate file --- home-manager/nvim/after/lsp/jsonls.lua | 8 ++++++++ home-manager/nvim/init.lua | 1 + home-manager/nvim/lua/plugins/lspconfig.lua | 10 ---------- home-manager/nvim/lua/plugins/schemastore.lua | 4 ++++ 4 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 home-manager/nvim/after/lsp/jsonls.lua create mode 100644 home-manager/nvim/lua/plugins/schemastore.lua diff --git a/home-manager/nvim/after/lsp/jsonls.lua b/home-manager/nvim/after/lsp/jsonls.lua new file mode 100644 index 0000000..f7012f9 --- /dev/null +++ b/home-manager/nvim/after/lsp/jsonls.lua @@ -0,0 +1,8 @@ +return { + settings = { + json = { + schemas = require "schemastore".json.schemas(), + validate = { enable = true }, + }, + }, +} diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 32cb96b..0feb78d 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -91,6 +91,7 @@ vim.filetype.add { vim.lsp.enable { "denols", + "jsonls", "lua_ls", "ts_ls", } diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index d468c53..7ce6291 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -98,19 +98,12 @@ local lspconfig = { "vacuum", } - local schemastore = require "schemastore" - local schemas = schemastore.json.schemas() - for _, lsp in ipairs(servers) do lsp_config[lsp].setup { settings = { gopls = { ["local"] = goimports_local, }, - json = { - schemas = schemas, - validate = { enable = true }, - }, pylsp = { plugins = { autopep8 = { enabled = false }, @@ -142,9 +135,6 @@ local lspconfig = { }, } end, - dependencies = { - "b0o/schemastore.nvim", - }, event = { event.buf_new_file, event.buf_read_pre, diff --git a/home-manager/nvim/lua/plugins/schemastore.lua b/home-manager/nvim/lua/plugins/schemastore.lua new file mode 100644 index 0000000..ee40ea5 --- /dev/null +++ b/home-manager/nvim/lua/plugins/schemastore.lua @@ -0,0 +1,4 @@ +---@type LazyPluginSpec +return { + "b0o/schemastore.nvim", +} -- 2.51.2 From b4226eb1a40c0aeb08dc01d8b8c9d017a181dd8a Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 23 Sep 2025 22:14:07 +0900 Subject: [PATCH 527/589] Stop using deprecated `deno.*` properties --- home-manager/nvim/after/lsp/denols.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/after/lsp/denols.lua b/home-manager/nvim/after/lsp/denols.lua index 10871e8..558ee73 100644 --- a/home-manager/nvim/after/lsp/denols.lua +++ b/home-manager/nvim/after/lsp/denols.lua @@ -1,14 +1,14 @@ return { root_markers = { "deno.json", "deno.jsonc" }, settings = { - deno = { + typescript = { inlayHints = { + enumMemberValues = { enabled = true }, + functionLikeReturnTypes = { enabled = true }, parameterNames = { enabled = "all", suppressWhenArgumentMatchesName = true }, parameterTypes = { enabled = true }, - variableTypes = { enabled = true, suppressWhenTypeMatchesName = true }, propertyDeclarationTypes = { enabled = true }, - functionLikeReturnTypes = { enable = true }, - enumMemberValues = { enabled = true }, + variableTypes = { enabled = true, suppressWhenTypeMatchesName = true }, }, }, }, -- 2.51.2 From cd7ff1b9b6dfd8a7de131c206c350894c9b4bdd4 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 3 Oct 2025 14:41:33 +0900 Subject: [PATCH 528/589] Update plugins --- home-manager/nvim/lazy-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 8283ef5..e49945c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "181a523f5bf6b8f277e6a994907c23f9e84d2445" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "1e06be97df058fa0bb4af54659c39918a4999c86" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "avante.nvim": { "branch": "main", "commit": "44db8eba870f6c123da5efa70384b2889f3e3495" }, + "avante.nvim": { "branch": "main", "commit": "5e4bb50ddaa8c4688675df6f437712c0e793a51c" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, @@ -9,25 +9,25 @@ "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "46e9895565fdae79833eda075b9b05d8543d7a77" }, + "copilot.lua": { "branch": "master", "commit": "3cd5086c28c5769f5db147721f457a3e081de254" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "neo-tree.nvim": { "branch": "main", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" }, - "neogit": { "branch": "master", "commit": "704ed34e957c8702df994bdcc8404e134d1e8212" }, + "neo-tree.nvim": { "branch": "main", "commit": "9130e58424ad95bf2dd8b40afbb8cf04d648638c" }, + "neogit": { "branch": "master", "commit": "90dcfa7b2bd5f3f35d1a7afe24dde9e2bc482cd4" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, - "nvim-scrollview": { "branch": "main", "commit": "23db9bbd210fed942085070071fdac921837a55f" }, + "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "76c2a426c0d3d9d1cc340f2989ed9f607b33c7a8" }, + "octo.nvim": { "branch": "master", "commit": "2a758bd6f121c63cd0d0a749ffda89993f869101" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From e7ac63059b1f121a7a6f1a726fee31f71ce4b9f5 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 3 Oct 2025 19:35:25 +0900 Subject: [PATCH 529/589] Add metals --- home-manager/nvim/after/lsp/metals.lua | 34 ++++++++++++++++++++++++++ home-manager/nvim/init.lua | 1 + 2 files changed, 35 insertions(+) create mode 100644 home-manager/nvim/after/lsp/metals.lua diff --git a/home-manager/nvim/after/lsp/metals.lua b/home-manager/nvim/after/lsp/metals.lua new file mode 100644 index 0000000..5cd5bee --- /dev/null +++ b/home-manager/nvim/after/lsp/metals.lua @@ -0,0 +1,34 @@ +---@type vim.lsp.Config +return { + settings = { + -- https://scalameta.org/metals/docs/editors/user-configuration + metals = { + inlayHints = { + byNameParameters = { + enable = true, + }, + hintsInPatternMatch = { + enable = true, + }, + hintsXRayMode = { + enable = true, + }, + implicitArguments = { + enable = true, + }, + implicitConversions = { + enable = true, + }, + inferredTypes = { + enable = true, + }, + namedParameters = { + enable = true, + }, + typeParameters = { + enable = true, + }, + }, + }, + }, +} diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 0feb78d..2e0a3b0 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -93,6 +93,7 @@ vim.lsp.enable { "denols", "jsonls", "lua_ls", + "metals", "ts_ls", } vim.lsp.inlay_hint.enable() -- 2.51.2 From 634238ffbbbf61846dd216dab8c2377da9839cc7 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 4 Oct 2025 19:39:18 +0900 Subject: [PATCH 530/589] Remove unnecessary type annotation --- home-manager/nvim/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 2e0a3b0..a8a6f74 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -1,6 +1,5 @@ vim.g.mapleader = " " ----@type string local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" if not vim.uv.fs_stat(lazypath) then os.execute("git clone --filter=blob:none https://github.com/folke/lazy.nvim.git --branch=stable " .. lazypath) -- 2.51.2 From 97b7d9bc3f7d48ad376fd01a37fb556b59fc1ae7 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 4 Oct 2025 21:03:33 +0900 Subject: [PATCH 531/589] Add nvim-lsp-file-operations --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/lsp-file-operations.lua | 9 +++++++++ home-manager/nvim/lua/plugins/neo-tree.lua | 1 + 3 files changed, 11 insertions(+) create mode 100644 home-manager/nvim/lua/plugins/lsp-file-operations.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index e49945c..4d7e5cc 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -20,6 +20,7 @@ "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, diff --git a/home-manager/nvim/lua/plugins/lsp-file-operations.lua b/home-manager/nvim/lua/plugins/lsp-file-operations.lua new file mode 100644 index 0000000..bf38ac4 --- /dev/null +++ b/home-manager/nvim/lua/plugins/lsp-file-operations.lua @@ -0,0 +1,9 @@ +---@type LazyPluginSpec +return { + "antosha417/nvim-lsp-file-operations", + dependencies = { + require "plugins.plenary", + }, + lazy = true, + opts = {}, +} diff --git a/home-manager/nvim/lua/plugins/neo-tree.lua b/home-manager/nvim/lua/plugins/neo-tree.lua index 0311b4e..f16c194 100644 --- a/home-manager/nvim/lua/plugins/neo-tree.lua +++ b/home-manager/nvim/lua/plugins/neo-tree.lua @@ -3,6 +3,7 @@ local neo_tree = { "nvim-neo-tree/neo-tree.nvim", dependencies = { require "plugins.devicons", + require "plugins.lsp-file-operations", require "plugins.nui", require "plugins.plenary", }, -- 2.51.2 From 2cdbc615770b71f67ead06495572943b09feecf3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 4 Oct 2025 21:17:53 +0900 Subject: [PATCH 532/589] Delete Avante.nvim and CopilotChat.nvim --- home-manager/nvim/lazy-lock.json | 2 -- home-manager/nvim/lua/plugins/avante.lua | 33 ------------------- home-manager/nvim/lua/plugins/copilotchat.lua | 32 ------------------ 3 files changed, 67 deletions(-) delete mode 100644 home-manager/nvim/lua/plugins/avante.lua delete mode 100644 home-manager/nvim/lua/plugins/copilotchat.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 4d7e5cc..d886f3d 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,7 +1,5 @@ { - "CopilotChat.nvim": { "branch": "canary", "commit": "1e06be97df058fa0bb4af54659c39918a4999c86" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "avante.nvim": { "branch": "main", "commit": "5e4bb50ddaa8c4688675df6f437712c0e793a51c" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, diff --git a/home-manager/nvim/lua/plugins/avante.lua b/home-manager/nvim/lua/plugins/avante.lua deleted file mode 100644 index 14eeecd..0000000 --- a/home-manager/nvim/lua/plugins/avante.lua +++ /dev/null @@ -1,33 +0,0 @@ ----@type LazyPluginSpec -return { - "yetone/avante.nvim", - build = "make", - cmd = { - "AvanteAsk", - "AvanteBuild", - "AvanteChat", - "AvanteClear", - "AvanteEdit", - "AvanteFocus", - "AvanteHistory", - "AvanteModels", - "AvanteRefresh", - "AvanteStop", - "AvanteSwitchFileSelectorProvider", - "AvanteSwitchProvider", - "AvanteShowRepoMap", - "AvanteToggle", - }, - dependencies = { - require "plugins.copilot", - require "plugins.devicons", - require "plugins.nui", - require "plugins.plenary", - require "plugins.telescope", - require "plugins.treesitter", - }, - opts = { - provider = "copilot", - }, - version = false, -} diff --git a/home-manager/nvim/lua/plugins/copilotchat.lua b/home-manager/nvim/lua/plugins/copilotchat.lua deleted file mode 100644 index 6d5e90a..0000000 --- a/home-manager/nvim/lua/plugins/copilotchat.lua +++ /dev/null @@ -1,32 +0,0 @@ ----@type LazyPluginSpec -return { - "CopilotC-Nvim/CopilotChat.nvim", - build = "make tiktoken", - cmd = { - "CopilotChat", - "CopilotChatClose", - "CopilotChatCommit", - "CopilotChatCommitStaged", - "CopilotChatDebugInfo", - "CopilotChatDocs", - "CopilotChatExplain", - "CopilotChatFix", - "CopilotChatFixDiagnostic", - "CopilotChatLoad", - "CopilotChatModel", - "CopilotChatModels", - "CopilotChatOpen", - "CopilotChatOptimize", - "CopilotChatReset", - "CopilotChatSave", - "CopilotChatStop", - "CopilotChatTests", - "CopilotChatToggle", - }, - dependencies = { - require "plugins.copilot", - require "plugins.plenary", - require "plugins.telescope", - }, - opts = {}, -} -- 2.51.2 From 0fe263876ec7251f10eaa47c4486d296f223dd58 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 4 Oct 2025 22:40:39 +0900 Subject: [PATCH 533/589] Add CodeCompanion.nvim --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/codecompanion.lua | 11 +++++++++++ home-manager/nvim/lua/plugins/lualine.lua | 15 ++++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 home-manager/nvim/lua/plugins/codecompanion.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index d886f3d..06b2056 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,6 +6,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "codecompanion.nvim": { "branch": "main", "commit": "dfab587efc84b651fb13148ae8b27a931f88b303" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, "copilot.lua": { "branch": "master", "commit": "3cd5086c28c5769f5db147721f457a3e081de254" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, diff --git a/home-manager/nvim/lua/plugins/codecompanion.lua b/home-manager/nvim/lua/plugins/codecompanion.lua new file mode 100644 index 0000000..c2234ed --- /dev/null +++ b/home-manager/nvim/lua/plugins/codecompanion.lua @@ -0,0 +1,11 @@ +---@type LazyPluginSpec +return { + "olimorris/codecompanion.nvim", + cmd = { + "CodeCompanionChat", + }, + dependencies = { + require "plugins.plenary", + }, + opts = {}, +} diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index e185292..5b726c1 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -1,6 +1,7 @@ local ftmap = { - css = "CSS", + codecompanion = "CodeCompanion", cpp = "C++", + css = "CSS", gitcommit = "Git Commit", html = "HTML", json = "JSON", @@ -61,8 +62,20 @@ local lualine = { lualine_x = { { "copilot", + cond = function() + return vim.bo.filetype ~= "codecompanion" + end, show_colors = true, }, + { + function() + local chat_strategy = require "codecompanion.strategies.chat" + local chat = chat_strategy.buf_get_chat(0) + + return (type(chat.adapter.model) == "table" and chat.adapter.model.name) + or chat.settings.model + end, + }, { "encoding", fmt = function(str) -- 2.51.2 From 9a32da942e2cbd4d56607fb0b5247347f79a1c2a Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 4 Oct 2025 23:03:32 +0900 Subject: [PATCH 534/589] Configure keymap for CodeCompanion --- home-manager/nvim/lua/plugins/barbar.lua | 2 +- home-manager/nvim/lua/plugins/codecompanion.lua | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua index 816bbad..2f6631c 100644 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -3,7 +3,7 @@ local event = require "vim_event" ---@type LazyKeysSpec[] local keys = { { - "c", + "", "BufferClose", }, { diff --git a/home-manager/nvim/lua/plugins/codecompanion.lua b/home-manager/nvim/lua/plugins/codecompanion.lua index c2234ed..a0b406d 100644 --- a/home-manager/nvim/lua/plugins/codecompanion.lua +++ b/home-manager/nvim/lua/plugins/codecompanion.lua @@ -1,11 +1,16 @@ ---@type LazyPluginSpec return { "olimorris/codecompanion.nvim", - cmd = { - "CodeCompanionChat", - }, dependencies = { require "plugins.plenary", }, + keys = { + { + "c", + function() + require "codecompanion".toggle() + end, + }, + }, opts = {}, } -- 2.51.2 From c36a5f60d8f90afd9f50b6d7d08cb44e14eab029 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 4 Oct 2025 23:04:58 +0900 Subject: [PATCH 535/589] Don't use `` to avoid conflict with window management --- home-manager/nvim/lua/plugins/barbar.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/barbar.lua b/home-manager/nvim/lua/plugins/barbar.lua index 2f6631c..eb20184 100644 --- a/home-manager/nvim/lua/plugins/barbar.lua +++ b/home-manager/nvim/lua/plugins/barbar.lua @@ -3,7 +3,7 @@ local event = require "vim_event" ---@type LazyKeysSpec[] local keys = { { - "", + "w", "BufferClose", }, { -- 2.51.2 From 11992c625d6eb9ec6ba7231409bf19fed3429235 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 4 Oct 2025 23:14:38 +0900 Subject: [PATCH 536/589] Optimize lualine dependencies --- home-manager/nvim/lua/plugins/copilot-lualine.lua | 5 +++++ home-manager/nvim/lua/plugins/lualine.lua | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 home-manager/nvim/lua/plugins/copilot-lualine.lua diff --git a/home-manager/nvim/lua/plugins/copilot-lualine.lua b/home-manager/nvim/lua/plugins/copilot-lualine.lua new file mode 100644 index 0000000..b08aad5 --- /dev/null +++ b/home-manager/nvim/lua/plugins/copilot-lualine.lua @@ -0,0 +1,5 @@ +---@type LazyPluginSpec +return { + "AndreM222/copilot-lualine", + lazy = true, +} diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 5b726c1..9f01792 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -20,10 +20,6 @@ local lualine = { dependencies = { require "plugins.devicons", require "plugins.vscode", - { - "AndreM222/copilot-lualine", - dependencies = { require "plugins.copilot" }, - }, }, opts = { options = { @@ -63,7 +59,7 @@ local lualine = { { "copilot", cond = function() - return vim.bo.filetype ~= "codecompanion" + return vim.bo.filetype ~= "codecompanion" and package.loaded["copilot"] ~= nil end, show_colors = true, }, @@ -75,6 +71,9 @@ local lualine = { return (type(chat.adapter.model) == "table" and chat.adapter.model.name) or chat.settings.model end, + cond = function() + return vim.bo.filetype == "codecompanion" and package.loaded["codecompanion"] ~= nil + end, }, { "encoding", -- 2.51.2 From bd445039c77ffca9874f8ebfc5b23e614b4c2d76 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 5 Oct 2025 09:24:29 +0900 Subject: [PATCH 537/589] Move gopls settings to file --- home-manager/nvim/after/lsp/gopls.lua | 20 ++++++++++++++++++++ home-manager/nvim/init.lua | 1 + home-manager/nvim/lua/plugins/lspconfig.lua | 16 ---------------- 3 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 home-manager/nvim/after/lsp/gopls.lua diff --git a/home-manager/nvim/after/lsp/gopls.lua b/home-manager/nvim/after/lsp/gopls.lua new file mode 100644 index 0000000..a87bfcd --- /dev/null +++ b/home-manager/nvim/after/lsp/gopls.lua @@ -0,0 +1,20 @@ +---@type string +local goimports_local +local gomod_path = vim.fn.getcwd() .. "/go.mod" + +if vim.fn.filereadable(gomod_path) == 1 then + local f = io.open(gomod_path) + + if f then + goimports_local = vim.split(f:read(), " ")[2] + end +end + +---@type vim.lsp.Config +return { + settings = { + gopls = { + ["local"] = goimports_local, + }, + }, +} diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index a8a6f74..116f089 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -90,6 +90,7 @@ vim.filetype.add { vim.lsp.enable { "denols", + "gopls", "jsonls", "lua_ls", "metals", diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 7ce6291..8eeed9c 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -72,25 +72,12 @@ local lspconfig = { end local lsp_config = require "lspconfig" - ---@type string - local goimports_local - ---@type string - local gomod_path = vim.fn.getcwd() .. "/go.mod" - if vim.fn.filereadable(gomod_path) == 1 then - local f = io.open(gomod_path) - - if f then - goimports_local = vim.split(f:read(), " ")[2] - end - end - ---@type string[] local servers = { "bashls", "clangd", "cssls", "dockerls", - "gopls", "jsonls", "lemminx", "pylsp", @@ -101,9 +88,6 @@ local lspconfig = { for _, lsp in ipairs(servers) do lsp_config[lsp].setup { settings = { - gopls = { - ["local"] = goimports_local, - }, pylsp = { plugins = { autopep8 = { enabled = false }, -- 2.51.2 From d5c8c1cf0fb4d8a3a2bdfe28e1e5b8ecd9c29b13 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 5 Oct 2025 09:31:41 +0900 Subject: [PATCH 538/589] Set golangci_lint_ls up --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 116f089..3724135 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -90,6 +90,7 @@ vim.filetype.add { vim.lsp.enable { "denols", + "golangci_lint_ls", "gopls", "jsonls", "lua_ls", -- 2.51.2 From cd0df431c2e029cb5ee0024bd7b7448fda79ae0e Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 5 Oct 2025 09:38:45 +0900 Subject: [PATCH 539/589] Enable inlay hints for gopls --- home-manager/nvim/after/lsp/gopls.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/home-manager/nvim/after/lsp/gopls.lua b/home-manager/nvim/after/lsp/gopls.lua index a87bfcd..0e1cf58 100644 --- a/home-manager/nvim/after/lsp/gopls.lua +++ b/home-manager/nvim/after/lsp/gopls.lua @@ -15,6 +15,16 @@ return { settings = { gopls = { ["local"] = goimports_local, + hints = { + assignVariableTypes = true, + compositeLiteralFields = true, + compositeLiteralTypes = true, + constantValues = true, + functionTypeParameters = true, + ignoredError = true, + parameterNames = true, + rangeVariableTypes = true, + }, }, }, } -- 2.51.2 From 4c3e0536390b7727b87e40fbca82135e82a30adb Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 5 Oct 2025 11:35:44 +0900 Subject: [PATCH 540/589] Add adapter prefix --- home-manager/nvim/lua/plugins/lualine.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 9f01792..707bbe3 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -67,9 +67,11 @@ local lualine = { function() local chat_strategy = require "codecompanion.strategies.chat" local chat = chat_strategy.buf_get_chat(0) + local adapter = chat.adapter + local model = adapter.model + local model_name = model and model.name - return (type(chat.adapter.model) == "table" and chat.adapter.model.name) - or chat.settings.model + return adapter.name .. (model_name and "/" .. model_name or "") end, cond = function() return vim.bo.filetype == "codecompanion" and package.loaded["codecompanion"] ~= nil -- 2.51.2 From e919642f68e57ff823c860fdee8a1443add33fcd Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 5 Oct 2025 12:36:03 +0900 Subject: [PATCH 541/589] fix method usage of `vim.lsp.Client` --- home-manager/nvim/lua/plugins/lspconfig.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 8eeed9c..ab6ce34 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -15,7 +15,7 @@ local lspconfig = { callback = function() vim.lsp.buf.format { filter = function(client) - return client.supports_method "textDocument/formatting" + return client:supports_method "textDocument/formatting" end, } end, @@ -38,7 +38,7 @@ local lspconfig = { if vim.tbl_contains(supported_clients, client.name) then local params = vim.lsp.util.make_range_params(nil, client.offset_encoding) params.context = { only = { "source.organizeImports" }, diagnostics = {} } - local res = client.request_sync("textDocument/codeAction", params) + local res = client:request_sync("textDocument/codeAction", params) for _, r in pairs(res and res.result or {}) do if r.edit then -- 2.51.2 From 679829625255245dbca2ef4b65100dc968b865ef Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 5 Oct 2025 12:38:02 +0900 Subject: [PATCH 542/589] fix typo --- home-manager/nvim/lua/plugins/lspconfig.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index ab6ce34..9165a94 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -42,7 +42,7 @@ local lspconfig = { for _, r in pairs(res and res.result or {}) do if r.edit then - local enc = (vim.lsp.get_client_by_id(client.id) or {}).offset_encodint or "utf-16" + local enc = (vim.lsp.get_client_by_id(client.id) or {}).offset_encoding or "utf-16" vim.lsp.util.apply_workspace_edit(r.edit, enc) end end -- 2.51.2 From 25db4f0eaf96ea0cb8e3cd1f6cd0b3ae489275ef Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 6 Oct 2025 12:17:54 +0900 Subject: [PATCH 543/589] Add codecompanion-spinner extension --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/codecompanion-spinner.lua | 5 +++++ home-manager/nvim/lua/plugins/codecompanion.lua | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 home-manager/nvim/lua/plugins/codecompanion-spinner.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 06b2056..5fcc14a 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,6 +6,7 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, "codecompanion.nvim": { "branch": "main", "commit": "dfab587efc84b651fb13148ae8b27a931f88b303" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, "copilot.lua": { "branch": "master", "commit": "3cd5086c28c5769f5db147721f457a3e081de254" }, diff --git a/home-manager/nvim/lua/plugins/codecompanion-spinner.lua b/home-manager/nvim/lua/plugins/codecompanion-spinner.lua new file mode 100644 index 0000000..9296271 --- /dev/null +++ b/home-manager/nvim/lua/plugins/codecompanion-spinner.lua @@ -0,0 +1,5 @@ +---@type LazyPluginSpec +return { + "franco-ruggeri/codecompanion-spinner.nvim", + lazy = true, +} diff --git a/home-manager/nvim/lua/plugins/codecompanion.lua b/home-manager/nvim/lua/plugins/codecompanion.lua index a0b406d..d14be3d 100644 --- a/home-manager/nvim/lua/plugins/codecompanion.lua +++ b/home-manager/nvim/lua/plugins/codecompanion.lua @@ -12,5 +12,9 @@ return { end, }, }, - opts = {}, + opts = { + extensions = { + spinner = {}, + }, + }, } -- 2.51.2 From 51200dc5a89ab2498d57fdf7938a3e566d05c071 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 6 Oct 2025 13:11:58 +0900 Subject: [PATCH 544/589] Add codecompanion-history extension --- home-manager/nvim/lazy-lock.json | 3 ++- home-manager/nvim/lua/plugins/codecompanion-history.lua | 5 +++++ home-manager/nvim/lua/plugins/codecompanion.lua | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 home-manager/nvim/lua/plugins/codecompanion-history.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 5fcc14a..872f6ff 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,10 +6,11 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "codecompanion-history.nvim": { "branch": "main", "commit": "eb99d256352144cf3b6a1c45608ec25544a0813d" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, "codecompanion.nvim": { "branch": "main", "commit": "dfab587efc84b651fb13148ae8b27a931f88b303" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "3cd5086c28c5769f5db147721f457a3e081de254" }, + "copilot.lua": { "branch": "master", "commit": "30b98a4c25d6152c14084020f703b6d56e1f1122" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, diff --git a/home-manager/nvim/lua/plugins/codecompanion-history.lua b/home-manager/nvim/lua/plugins/codecompanion-history.lua new file mode 100644 index 0000000..9730735 --- /dev/null +++ b/home-manager/nvim/lua/plugins/codecompanion-history.lua @@ -0,0 +1,5 @@ +---@type LazyPluginSpec +return { + "ravitemer/codecompanion-history.nvim", + lazy = true, +} diff --git a/home-manager/nvim/lua/plugins/codecompanion.lua b/home-manager/nvim/lua/plugins/codecompanion.lua index d14be3d..a1a7333 100644 --- a/home-manager/nvim/lua/plugins/codecompanion.lua +++ b/home-manager/nvim/lua/plugins/codecompanion.lua @@ -14,6 +14,7 @@ return { }, opts = { extensions = { + history = {}, spinner = {}, }, }, -- 2.51.2 From dd9f316fc5a2464f6cb717d6a926a8b0d0c56878 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 14 Oct 2025 14:29:27 +0900 Subject: [PATCH 545/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 872f6ff..69d9da3 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,16 +8,16 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "eb99d256352144cf3b6a1c45608ec25544a0813d" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, - "codecompanion.nvim": { "branch": "main", "commit": "dfab587efc84b651fb13148ae8b27a931f88b303" }, + "codecompanion.nvim": { "branch": "main", "commit": "683242e59393ce877906956abe3e540613d42275" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "30b98a4c25d6152c14084020f703b6d56e1f1122" }, + "copilot.lua": { "branch": "master", "commit": "92e08cd472653beaece28ad9c8508a851a613358" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "neo-tree.nvim": { "branch": "main", "commit": "9130e58424ad95bf2dd8b40afbb8cf04d648638c" }, - "neogit": { "branch": "master", "commit": "90dcfa7b2bd5f3f35d1a7afe24dde9e2bc482cd4" }, + "neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" }, + "neogit": { "branch": "master", "commit": "0f48491ae0046796841aaa97d439267982fe72db" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, @@ -29,7 +29,7 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "2a758bd6f121c63cd0d0a749ffda89993f869101" }, + "octo.nvim": { "branch": "master", "commit": "fded71669b61c6ccae9d8ade30f667c3c4962b48" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From e9e1723b4fb903b2f8910ed70ab6503bdeb164fb Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 18 Oct 2025 00:26:26 +0900 Subject: [PATCH 546/589] Enable inlay hints for rust_analyzer --- home-manager/nvim/after/lsp/rust_analyzer.lua | 53 +++++++++++++++++++ home-manager/nvim/init.lua | 1 + home-manager/nvim/lua/plugins/lspconfig.lua | 1 - 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 home-manager/nvim/after/lsp/rust_analyzer.lua diff --git a/home-manager/nvim/after/lsp/rust_analyzer.lua b/home-manager/nvim/after/lsp/rust_analyzer.lua new file mode 100644 index 0000000..d798cd4 --- /dev/null +++ b/home-manager/nvim/after/lsp/rust_analyzer.lua @@ -0,0 +1,53 @@ +---@type vim.lsp.Config +return { + settings = { + ["rust-analyzer"] = { + inlayHints = { + bindingModeHints = { + enable = true, + }, + chainingHints = { + enable = true, + }, + closingBraceHints = { + enable = true, + }, + closureCaptureHints = { + enable = true, + }, + closureReturnTypeHints = { + enable = true, + }, + discriminantHints = { + enable = true, + }, + expressionAdjustmentHints = { + enable = true, + }, + genericParameterHints = { + lifetime = { + enable = true, + }, + type = { + enable = true, + }, + }, + implicitDrops = { + enable = true, + }, + implicitSizedBoundHints = { + enable = true, + }, + lifetimeElisionHints = { + enable = true, + }, + rangeExclusiveHints = { + enable = true, + }, + reborrowHints = { + enable = true, + }, + }, + }, + }, +} diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 3724135..855ecbb 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -95,6 +95,7 @@ vim.lsp.enable { "jsonls", "lua_ls", "metals", + "rust_analyzer", "ts_ls", } vim.lsp.inlay_hint.enable() diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 9165a94..6a207ce 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -81,7 +81,6 @@ local lspconfig = { "jsonls", "lemminx", "pylsp", - "rust_analyzer", "vacuum", } -- 2.51.2 From 3327ccaf9f2041ae63e17d09150377327896a5c7 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 18 Oct 2025 00:26:46 +0900 Subject: [PATCH 547/589] update lualine.nvim --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 69d9da3..9c1cf07 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -15,7 +15,7 @@ "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, - "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" }, "neogit": { "branch": "master", "commit": "0f48491ae0046796841aaa97d439267982fe72db" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, -- 2.51.2 From c2ac40224cef18387899d2a6f363b9b382eecd53 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 31 Oct 2025 14:36:01 +0900 Subject: [PATCH 548/589] Update plugins --- home-manager/nvim/lazy-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 9c1cf07..595b96d 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,34 +8,34 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "eb99d256352144cf3b6a1c45608ec25544a0813d" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, - "codecompanion.nvim": { "branch": "main", "commit": "683242e59393ce877906956abe3e540613d42275" }, + "codecompanion.nvim": { "branch": "main", "commit": "9c646bd193cb622fff1f9717177502fc6ad30a4a" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "92e08cd472653beaece28ad9c8508a851a613358" }, + "copilot.lua": { "branch": "master", "commit": "93adf9844dcbe09a37e7a72eaa286d33d38bf628" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, - "neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" }, - "neogit": { "branch": "master", "commit": "0f48491ae0046796841aaa97d439267982fe72db" }, + "neo-tree.nvim": { "branch": "main", "commit": "8cdd6b1940f333c1dd085526a9c45b30fb2dbf50" }, + "neogit": { "branch": "master", "commit": "c6d00913f802acedfb93c01267e89185f25800ca" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-cmp": { "branch": "main", "commit": "cf22c9e32512de3be1fd6b65fd25e3aabead4d8b" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, - "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, + "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "fded71669b61c6ccae9d8ade30f667c3c4962b48" }, + "octo.nvim": { "branch": "master", "commit": "4be7903a962875a47422110d0e9ff3e475db1d27" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, - "typst-preview.nvim": { "branch": "master", "commit": "dea4525d5420b7c32eebda7de15a6beb9d6574fa" }, + "typst-preview.nvim": { "branch": "master", "commit": "e544812bba84b4f7976590f2b6c0dfbd099e1893" }, "vimade": { "branch": "master", "commit": "f63ca5cb9cf811b2c526694e820b87fe2238deb6" }, "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" } } -- 2.51.2 From 3373b817d5267934d8eb2ea2c026346c0b12a99f Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 31 Oct 2025 14:38:08 +0900 Subject: [PATCH 549/589] Mark denols as it supports organizing imports --- home-manager/nvim/lua/plugins/lspconfig.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index 6a207ce..e78c9f0 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -31,6 +31,7 @@ local lspconfig = { callback = function(args) local supported_clients = { "biome", + "denols", "gopls", } -- 2.51.2 From 33f19c9a3b0a13126b18fcc7514ff75eef315d0b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 8 Nov 2025 16:15:35 +0900 Subject: [PATCH 550/589] Update plugins --- home-manager/nvim/lazy-lock.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 595b96d..fec6aff 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, @@ -8,19 +8,19 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "eb99d256352144cf3b6a1c45608ec25544a0813d" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, - "codecompanion.nvim": { "branch": "main", "commit": "9c646bd193cb622fff1f9717177502fc6ad30a4a" }, - "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, - "copilot.lua": { "branch": "master", "commit": "93adf9844dcbe09a37e7a72eaa286d33d38bf628" }, + "codecompanion.nvim": { "branch": "main", "commit": "ec2261d19b1daff9a14f79bb1274ff5852ceffd9" }, + "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, + "copilot.lua": { "branch": "master", "commit": "5bde2cfe01f049f522eeb8b52c5c723407db8bdf" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, - "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, - "neo-tree.nvim": { "branch": "main", "commit": "8cdd6b1940f333c1dd085526a9c45b30fb2dbf50" }, - "neogit": { "branch": "master", "commit": "c6d00913f802acedfb93c01267e89185f25800ca" }, + "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, + "neogit": { "branch": "master", "commit": "d2a2ae4415872fbddb2441920ab109ee52fd4916" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "cf22c9e32512de3be1fd6b65fd25e3aabead4d8b" }, + "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, @@ -29,11 +29,11 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "4be7903a962875a47422110d0e9ff3e475db1d27" }, + "octo.nvim": { "branch": "master", "commit": "13ba3e8651ee02c52cb3e60ce78aff68acec97ea" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "telescope.nvim": { "branch": "master", "commit": "84b9ba066d1860f7a586ce9cd732fd6c4f77d1d9" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "typst-preview.nvim": { "branch": "master", "commit": "e544812bba84b4f7976590f2b6c0dfbd099e1893" }, "vimade": { "branch": "master", "commit": "f63ca5cb9cf811b2c526694e820b87fe2238deb6" }, -- 2.51.2 From db84721efcb2034a749e6ef7e0298c0ddb74a810 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 8 Nov 2025 16:17:17 +0900 Subject: [PATCH 551/589] Enable memory --- home-manager/nvim/lua/plugins/codecompanion.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home-manager/nvim/lua/plugins/codecompanion.lua b/home-manager/nvim/lua/plugins/codecompanion.lua index a1a7333..b8daaf6 100644 --- a/home-manager/nvim/lua/plugins/codecompanion.lua +++ b/home-manager/nvim/lua/plugins/codecompanion.lua @@ -17,5 +17,12 @@ return { history = {}, spinner = {}, }, + memory = { + opts = { + chat = { + enabled = true, + }, + }, + }, }, } -- 2.51.2 From b256e4ad1e84e983a57ab9a73511e8a648d7084b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 15 Nov 2025 12:54:19 +0900 Subject: [PATCH 552/589] Update plugins --- home-manager/nvim/lazy-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index fec6aff..e749f6b 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -2,25 +2,25 @@ "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, + "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "eb99d256352144cf3b6a1c45608ec25544a0813d" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, "codecompanion.nvim": { "branch": "main", "commit": "ec2261d19b1daff9a14f79bb1274ff5852ceffd9" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "5bde2cfe01f049f522eeb8b52c5c723407db8bdf" }, + "copilot.lua": { "branch": "master", "commit": "e919876a5523b06406f0bc7285477da87a338a61" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, - "neogit": { "branch": "master", "commit": "d2a2ae4415872fbddb2441920ab109ee52fd4916" }, + "neogit": { "branch": "master", "commit": "614a63489be5734b14f314c3449535566b8352d4" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" }, + "nvim-cmp": { "branch": "main", "commit": "d78fb3b64eedb701c9939f97361c06483af575e0" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, @@ -29,7 +29,7 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "13ba3e8651ee02c52cb3e60ce78aff68acec97ea" }, + "octo.nvim": { "branch": "master", "commit": "5e5794fb464d4c7f84498d9cc2fccea23856b09e" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From f2b8962d6bb5b80bc93c8409a727355328827cb7 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 15 Nov 2025 12:54:29 +0900 Subject: [PATCH 553/589] Add `wasm_language_tools` --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 855ecbb..0b6c95b 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -97,6 +97,7 @@ vim.lsp.enable { "metals", "rust_analyzer", "ts_ls", + "wasm_language_tools", } vim.lsp.inlay_hint.enable() -- 2.51.2 From 872fc89ec77a0890fd3b28aeda5da1d72c1ba19d Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 15 Nov 2025 13:46:54 +0900 Subject: [PATCH 554/589] Add keybinding to go to definition --- home-manager/nvim/lua/plugins/lspconfig.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index e78c9f0..cfbbf9d 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -128,6 +128,10 @@ local lspconfig = { "a", vim.lsp.buf.code_action, }, + { + "df", + vim.lsp.buf.definition, + }, { "h", vim.lsp.buf.hover, -- 2.51.2 From 9ced6f2c1652a970701a6464f3c71fc823027fd2 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 15 Nov 2025 16:17:04 +0900 Subject: [PATCH 555/589] Add img-clip.nvim --- home-manager/nvim/lazy-lock.json | 1 + home-manager/nvim/lua/plugins/img-clip.lua | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 home-manager/nvim/lua/plugins/img-clip.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index e749f6b..c70f4f1 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -13,6 +13,7 @@ "copilot.lua": { "branch": "master", "commit": "e919876a5523b06406f0bc7285477da87a338a61" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, + "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, diff --git a/home-manager/nvim/lua/plugins/img-clip.lua b/home-manager/nvim/lua/plugins/img-clip.lua new file mode 100644 index 0000000..86ea360 --- /dev/null +++ b/home-manager/nvim/lua/plugins/img-clip.lua @@ -0,0 +1,16 @@ +---@type LazyPluginSpec +return { + "hakonharnes/img-clip.nvim", + cmd = { + "PasteImage", + }, + opts = { + filetypes = { + codecompanion = { + prompt_for_file_name = false, + template = "[Image]($FILE_PATH)", + use_absolute_path = true, + }, + }, + }, +} -- 2.51.2 From 66bfcf8104df16e748e29bb54806698db0ba0941 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 15 Nov 2025 19:39:42 +0900 Subject: [PATCH 556/589] Add fidget.nvim --- home-manager/nvim/lazy-lock.json | 2 ++ home-manager/nvim/lua/plugins/fidget.lua | 12 ++++++++++++ home-manager/nvim/lua/vim_event/init.lua | 1 + 3 files changed, 15 insertions(+) create mode 100644 home-manager/nvim/lua/plugins/fidget.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index c70f4f1..214ad28 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -11,12 +11,14 @@ "codecompanion.nvim": { "branch": "main", "commit": "ec2261d19b1daff9a14f79bb1274ff5852ceffd9" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, "copilot.lua": { "branch": "master", "commit": "e919876a5523b06406f0bc7285477da87a338a61" }, + "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "mcphub.nvim": { "branch": "main", "commit": "163b3ad0caa3987e04e5b1d89bb89d230686d17b" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, "neogit": { "branch": "master", "commit": "614a63489be5734b14f314c3449535566b8352d4" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, diff --git a/home-manager/nvim/lua/plugins/fidget.lua b/home-manager/nvim/lua/plugins/fidget.lua new file mode 100644 index 0000000..f34d717 --- /dev/null +++ b/home-manager/nvim/lua/plugins/fidget.lua @@ -0,0 +1,12 @@ +---@type LazyPluginSpec +return { + "j-hui/fidget.nvim", + event = require "vim_event".lsp_attach, + opts = { + notification = { + window = { + winblend = 0, + }, + }, + }, +} diff --git a/home-manager/nvim/lua/vim_event/init.lua b/home-manager/nvim/lua/vim_event/init.lua index f61b9f0..782f16a 100644 --- a/home-manager/nvim/lua/vim_event/init.lua +++ b/home-manager/nvim/lua/vim_event/init.lua @@ -4,6 +4,7 @@ local M = { buf_read_pre = "BufReadPre", buf_write_pre = "BufWritePre", insert_enter = "InsertEnter", + lsp_attach = "LspAttach", term_open = "TermOpen", very_lazy = "VeryLazy", } -- 2.51.2 From 88da26e6f270b774f1dd5641d675c9e1f6f912b0 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 15 Nov 2025 19:40:33 +0900 Subject: [PATCH 557/589] Add mcphub.nvim --- home-manager/nvim/lua/plugins/codecompanion.lua | 10 +++++++++- home-manager/nvim/lua/plugins/mcphub.lua | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 home-manager/nvim/lua/plugins/mcphub.lua diff --git a/home-manager/nvim/lua/plugins/codecompanion.lua b/home-manager/nvim/lua/plugins/codecompanion.lua index b8daaf6..1d30d16 100644 --- a/home-manager/nvim/lua/plugins/codecompanion.lua +++ b/home-manager/nvim/lua/plugins/codecompanion.lua @@ -14,7 +14,15 @@ return { }, opts = { extensions = { - history = {}, + history = { + title_generation_opts = { + adapter = "copilot", + model = "gpt-4.1", + }, + }, + mcphub = { + callback = "mcphub.extensions.codecompanion", + }, spinner = {}, }, memory = { diff --git a/home-manager/nvim/lua/plugins/mcphub.lua b/home-manager/nvim/lua/plugins/mcphub.lua new file mode 100644 index 0000000..53ee12b --- /dev/null +++ b/home-manager/nvim/lua/plugins/mcphub.lua @@ -0,0 +1,6 @@ +---@type LazyPluginSpec +return { + "ravitemer/mcphub.nvim", + lazy = true, + opts = {}, +} -- 2.51.2 From ef90241082052ae62d2a992bca2b0c9d9b77ea78 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 23 Nov 2025 01:11:30 +0900 Subject: [PATCH 558/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 214ad28..37df4dc 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,9 +8,9 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "eb99d256352144cf3b6a1c45608ec25544a0813d" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, - "codecompanion.nvim": { "branch": "main", "commit": "ec2261d19b1daff9a14f79bb1274ff5852ceffd9" }, + "codecompanion.nvim": { "branch": "main", "commit": "68fcda022fce25ee380e267d4b0fe98113b3957d" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "e919876a5523b06406f0bc7285477da87a338a61" }, + "copilot.lua": { "branch": "master", "commit": "4383e05a47493d7ff77b058c0548129eb38ec7fb" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, @@ -20,10 +20,10 @@ "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "mcphub.nvim": { "branch": "main", "commit": "163b3ad0caa3987e04e5b1d89bb89d230686d17b" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, - "neogit": { "branch": "master", "commit": "614a63489be5734b14f314c3449535566b8352d4" }, + "neogit": { "branch": "master", "commit": "4ba620addbeeca2594c794b151e611c037973480" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "d78fb3b64eedb701c9939f97361c06483af575e0" }, + "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, @@ -32,7 +32,7 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "5e5794fb464d4c7f84498d9cc2fccea23856b09e" }, + "octo.nvim": { "branch": "master", "commit": "be559fe0fdb570f243f51830318868fbac5e9c8b" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From 65803f22fd049d053228876ff2d95cd337524d80 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 27 Nov 2025 18:37:13 +0900 Subject: [PATCH 559/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 37df4dc..311b65c 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "eb99d256352144cf3b6a1c45608ec25544a0813d" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, - "codecompanion.nvim": { "branch": "main", "commit": "68fcda022fce25ee380e267d4b0fe98113b3957d" }, + "codecompanion.nvim": { "branch": "main", "commit": "e7762c68daf24c3e356401f5223eeb5217047754" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, "copilot.lua": { "branch": "master", "commit": "4383e05a47493d7ff77b058c0548129eb38ec7fb" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, @@ -17,10 +17,10 @@ "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, - "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "mcphub.nvim": { "branch": "main", "commit": "163b3ad0caa3987e04e5b1d89bb89d230686d17b" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, - "neogit": { "branch": "master", "commit": "4ba620addbeeca2594c794b151e611c037973480" }, + "neogit": { "branch": "master", "commit": "451e57fa3633c935c4c32c669ad5aa447d3db257" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, @@ -32,7 +32,7 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "be559fe0fdb570f243f51830318868fbac5e9c8b" }, + "octo.nvim": { "branch": "master", "commit": "e6cef8d1889be92b7393717750fa5af5b6890ad3" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From 522857feebd04d6ad205acfc6aa7ec5b8eacdcbd Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 27 Nov 2025 18:49:48 +0900 Subject: [PATCH 560/589] Remove outdated LSP configuration --- home-manager/nvim/lua/plugins/lspconfig.lua | 48 --------------------- 1 file changed, 48 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lspconfig.lua b/home-manager/nvim/lua/plugins/lspconfig.lua index cfbbf9d..1a29d82 100644 --- a/home-manager/nvim/lua/plugins/lspconfig.lua +++ b/home-manager/nvim/lua/plugins/lspconfig.lua @@ -30,7 +30,6 @@ local lspconfig = { group = vim.api.nvim_create_augroup("organize_imports", {}), callback = function(args) local supported_clients = { - "biome", "denols", "gopls", } @@ -71,53 +70,6 @@ local lspconfig = { for _, autocmd in ipairs(autocmds) do util.create_autocmd(autocmd) end - local lsp_config = require "lspconfig" - - ---@type string[] - local servers = { - "bashls", - "clangd", - "cssls", - "dockerls", - "jsonls", - "lemminx", - "pylsp", - "vacuum", - } - - for _, lsp in ipairs(servers) do - lsp_config[lsp].setup { - settings = { - pylsp = { - plugins = { - autopep8 = { enabled = false }, - }, - }, - }, - } - end - - lsp_config.powershell_es.setup { - bundle_path = "C:/PowerShellEditorServices", - } - - lsp_config.tinymist.setup { - settings = { - formatterMode = "typstyle", - }, - } - - lsp_config.yamlls.setup { - filetypes = { - "yaml", - "yaml.docker-compose", - "yaml.gitlab", - "yaml.openapi", -- Added - }, - settings = { - yaml = { keyOrdering = false }, - }, - } end, event = { event.buf_new_file, -- 2.51.2 From da54281562dac270b08bafe33a8b7a97acb915c7 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 2 Dec 2025 10:53:32 +0900 Subject: [PATCH 561/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 311b65c..923077f 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -10,7 +10,7 @@ "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, "codecompanion.nvim": { "branch": "main", "commit": "e7762c68daf24c3e356401f5223eeb5217047754" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "4383e05a47493d7ff77b058c0548129eb38ec7fb" }, + "copilot.lua": { "branch": "master", "commit": "881f99b827d65b41f522eecc21b112cf518028ac" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, @@ -20,7 +20,7 @@ "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "mcphub.nvim": { "branch": "main", "commit": "163b3ad0caa3987e04e5b1d89bb89d230686d17b" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, - "neogit": { "branch": "master", "commit": "451e57fa3633c935c4c32c669ad5aa447d3db257" }, + "neogit": { "branch": "master", "commit": "40347fbc45bd87339eb702bb70dab23c40c15482" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, @@ -32,13 +32,13 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "e6cef8d1889be92b7393717750fa5af5b6890ad3" }, + "octo.nvim": { "branch": "master", "commit": "94511b43869d484348a8eb897dabaffb39a7e9e1" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "84b9ba066d1860f7a586ce9cd732fd6c4f77d1d9" }, + "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, - "typst-preview.nvim": { "branch": "master", "commit": "e544812bba84b4f7976590f2b6c0dfbd099e1893" }, + "typst-preview.nvim": { "branch": "master", "commit": "87d0f3a1beedefe6fdd96422c04c3dceb69d1063" }, "vimade": { "branch": "master", "commit": "f63ca5cb9cf811b2c526694e820b87fe2238deb6" }, "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" } } -- 2.51.2 From 0fa117a19d3a57debe126992bee6691711789f19 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Tue, 2 Dec 2025 10:57:49 +0900 Subject: [PATCH 562/589] Enable pylsp --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 0b6c95b..4e0434b 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -95,6 +95,7 @@ vim.lsp.enable { "jsonls", "lua_ls", "metals", + "pylsp", "rust_analyzer", "ts_ls", "wasm_language_tools", -- 2.51.2 From a9017329587e2dc25933350448c97fa8a2ee2b93 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 5 Dec 2025 14:22:27 +0900 Subject: [PATCH 563/589] Enable clangd --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 4e0434b..881f0f9 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -89,6 +89,7 @@ vim.filetype.add { } vim.lsp.enable { + "clangd", "denols", "golangci_lint_ls", "gopls", -- 2.51.2 From 8beb5aa13ca6e99e22167b6d40a188b774b40681 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 19 Dec 2025 04:50:42 +0900 Subject: [PATCH 564/589] Enable nixd --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 881f0f9..e3ff7af 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -96,6 +96,7 @@ vim.lsp.enable { "jsonls", "lua_ls", "metals", + "nixd", "pylsp", "rust_analyzer", "ts_ls", -- 2.51.2 From 2fb38266137b58a75f05e214f8df35545224dfdd Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 22 Dec 2025 14:33:27 +0900 Subject: [PATCH 565/589] Update mcphub --- home-manager/nvim/lazy-lock.json | 19 ++++++++++--------- home-manager/nvim/lua/plugins/mcphub.lua | 1 + 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 923077f..e0fc2e3 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,16 +1,17 @@ { "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "e300259ec777a40b4b9e3c8e6ade203e78d15881" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "codecompanion-history.nvim": { "branch": "main", "commit": "eb99d256352144cf3b6a1c45608ec25544a0813d" }, + "codecompanion-history.nvim": { "branch": "main", "commit": "8c6ca9f998aeef89f3543343070f8562bf911fb4" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, - "codecompanion.nvim": { "branch": "main", "commit": "e7762c68daf24c3e356401f5223eeb5217047754" }, + "codecompanion.nvim": { "branch": "main", "commit": "57232d7aedcc0675933fe5596d3167029d9057a8" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "881f99b827d65b41f522eecc21b112cf518028ac" }, + "copilot.lua": { "branch": "master", "commit": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, @@ -18,27 +19,27 @@ "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mcphub.nvim": { "branch": "main", "commit": "163b3ad0caa3987e04e5b1d89bb89d230686d17b" }, + "mcphub.nvim": { "branch": "main", "commit": "5193329d510a68f1f5bf189960642c925c177a3a" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, - "neogit": { "branch": "master", "commit": "40347fbc45bd87339eb702bb70dab23c40c15482" }, + "neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, - "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" }, + "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "94511b43869d484348a8eb897dabaffb39a7e9e1" }, + "octo.nvim": { "branch": "master", "commit": "09ff70efd885fe1cdf62505dce3a9bc6baeb85e1" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "typst-preview.nvim": { "branch": "master", "commit": "87d0f3a1beedefe6fdd96422c04c3dceb69d1063" }, - "vimade": { "branch": "master", "commit": "f63ca5cb9cf811b2c526694e820b87fe2238deb6" }, - "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" } + "vimade": { "branch": "master", "commit": "266cb28a451448754eb8ae2a2a46d6ae526b33f8" }, + "vscode.nvim": { "branch": "main", "commit": "aa1102a7e15195c9cca22730b09224a7f7745ba8" } } diff --git a/home-manager/nvim/lua/plugins/mcphub.lua b/home-manager/nvim/lua/plugins/mcphub.lua index 53ee12b..7634904 100644 --- a/home-manager/nvim/lua/plugins/mcphub.lua +++ b/home-manager/nvim/lua/plugins/mcphub.lua @@ -1,6 +1,7 @@ ---@type LazyPluginSpec return { "ravitemer/mcphub.nvim", + branch = "main", -- For CodeCompanion v18 support lazy = true, opts = {}, } -- 2.51.2 From 474e1f43b8cabbb41fac338ca2b5f43698f692f3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 22 Dec 2025 14:41:53 +0900 Subject: [PATCH 566/589] Fix duplicate LSP icons --- home-manager/nvim/lua/plugins/cmp.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager/nvim/lua/plugins/cmp.lua b/home-manager/nvim/lua/plugins/cmp.lua index 075234e..6b44a39 100644 --- a/home-manager/nvim/lua/plugins/cmp.lua +++ b/home-manager/nvim/lua/plugins/cmp.lua @@ -14,7 +14,9 @@ local cmp = { local bordered_window = cmp.config.window.bordered() cmp.setup { - formatting = { format = require "lspkind".cmp_format() }, + formatting = { format = require "lspkind".cmp_format({ + mode = 'text' -- Do not show icons as nvim-cmp already does + }) }, mapping = { [""] = cmp.mapping(function(fallback) if cmp.visible() then -- 2.51.2 From 7c886c2f9c3ee6c2acd78a7b5ff92a1314633084 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 22 Dec 2025 15:16:58 +0900 Subject: [PATCH 567/589] Change default chat adapter to gemini_cli --- home-manager/nvim/lua/plugins/codecompanion.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/nvim/lua/plugins/codecompanion.lua b/home-manager/nvim/lua/plugins/codecompanion.lua index 1d30d16..67cf490 100644 --- a/home-manager/nvim/lua/plugins/codecompanion.lua +++ b/home-manager/nvim/lua/plugins/codecompanion.lua @@ -13,6 +13,11 @@ return { }, }, opts = { + interactions = { + chat = { + adapter = "gemini_cli", + }, + }, extensions = { history = { title_generation_opts = { -- 2.51.2 From 8d6fb1fe71ecc8b8bb36130b3ee35a6f29215976 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 22 Dec 2025 15:17:19 +0900 Subject: [PATCH 568/589] Fix adapter info in lualine --- home-manager/nvim/lua/plugins/lualine.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/plugins/lualine.lua b/home-manager/nvim/lua/plugins/lualine.lua index 707bbe3..a68b42a 100644 --- a/home-manager/nvim/lua/plugins/lualine.lua +++ b/home-manager/nvim/lua/plugins/lualine.lua @@ -65,8 +65,8 @@ local lualine = { }, { function() - local chat_strategy = require "codecompanion.strategies.chat" - local chat = chat_strategy.buf_get_chat(0) + local chat_interaction = require "codecompanion.interactions.chat" + local chat = chat_interaction.buf_get_chat(0) local adapter = chat.adapter local model = adapter.model local model_name = model and model.name -- 2.51.2 From 4a2dc936d17a9b6dbb16961d2c56ba82b286236c Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 25 Dec 2025 22:40:27 +0900 Subject: [PATCH 569/589] Update plugins --- home-manager/nvim/lazy-lock.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index e0fc2e3..a5f24f9 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -1,6 +1,5 @@ { "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "e300259ec777a40b4b9e3c8e6ade203e78d15881" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, @@ -9,7 +8,7 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "8c6ca9f998aeef89f3543343070f8562bf911fb4" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, - "codecompanion.nvim": { "branch": "main", "commit": "57232d7aedcc0675933fe5596d3167029d9057a8" }, + "codecompanion.nvim": { "branch": "main", "commit": "b3bb0d73079643d4a5b0d8b621cde619a73bc91a" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, "copilot.lua": { "branch": "master", "commit": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, -- 2.51.2 From 2ecc87d8a83297adc370235f5d7bedfb4ec98773 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 1 Jan 2026 07:36:53 +0900 Subject: [PATCH 570/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index a5f24f9..7ba3d0b 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -7,8 +7,8 @@ "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "8c6ca9f998aeef89f3543343070f8562bf911fb4" }, - "codecompanion-spinner.nvim": { "branch": "main", "commit": "c1fa2a84ea1aed687aaed60df65e347c280f4f22" }, - "codecompanion.nvim": { "branch": "main", "commit": "b3bb0d73079643d4a5b0d8b621cde619a73bc91a" }, + "codecompanion-spinner.nvim": { "branch": "main", "commit": "bfb31ca124bd1a2e032faea09844c8609154bdb5" }, + "codecompanion.nvim": { "branch": "main", "commit": "a8fcdb7ee9d47593bccb52def47d0583caeec0f9" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, "copilot.lua": { "branch": "master", "commit": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, @@ -32,13 +32,13 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "09ff70efd885fe1cdf62505dce3a9bc6baeb85e1" }, + "octo.nvim": { "branch": "master", "commit": "b878511b2130be3946d63b4d8899e58b96357490" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" }, + "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, - "typst-preview.nvim": { "branch": "master", "commit": "87d0f3a1beedefe6fdd96422c04c3dceb69d1063" }, + "typst-preview.nvim": { "branch": "master", "commit": "e123a7ab64e52d836e00dea9251e85b201f38966" }, "vimade": { "branch": "master", "commit": "266cb28a451448754eb8ae2a2a46d6ae526b33f8" }, "vscode.nvim": { "branch": "main", "commit": "aa1102a7e15195c9cca22730b09224a7f7745ba8" } } -- 2.51.2 From 1ae4867bb3e89f657ce233b59ec49e6ef4ba0d6b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 2 Jan 2026 23:40:16 +0900 Subject: [PATCH 571/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7ba3d0b..ad0c8c6 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -23,7 +23,7 @@ "neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, + "nvim-cmp": { "branch": "main", "commit": "c4f7dc770cdebfc9723333175bcd88d9cdbe8408" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, @@ -32,7 +32,7 @@ "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "b878511b2130be3946d63b4d8899e58b96357490" }, + "octo.nvim": { "branch": "master", "commit": "4a3a4fc5a9d3a372c91041f5b846f33b8d6b31fa" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, -- 2.51.2 From 91e1a2bdc5ca8833eadbb94bbcc880fa6ed1356b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 2 Jan 2026 23:44:47 +0900 Subject: [PATCH 572/589] Replace `XDG_STATE_HOME` with `TMPDIR` in Neovim --- home-manager/nvim/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index e3ff7af..02fe032 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -1,3 +1,5 @@ +-- https://zenn.dev/vim_jp/articles/c96e9b1bdb9241 +vim.env.XDG_STATE_HOME = os.getenv "TMPDIR" or "/tmp" vim.g.mapleader = " " local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" -- 2.51.2 From b6a967f819907f25d2f7943a41dce6f92b57bba9 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 3 Jan 2026 02:33:57 +0900 Subject: [PATCH 573/589] Update nvim-cmp --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index ad0c8c6..eb929fc 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -23,7 +23,7 @@ "neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "c4f7dc770cdebfc9723333175bcd88d9cdbe8408" }, + "nvim-cmp": { "branch": "main", "commit": "85bbfad83f804f11688d1ab9486b459e699292d6" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, -- 2.51.2 From 46d16c13200417277bd69c98a852e6323c438304 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 3 Jan 2026 23:33:14 +0900 Subject: [PATCH 574/589] Migrate from WezTerm to Ghostty --- home-manager/nvim/lua/plugins/vscode.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/plugins/vscode.lua b/home-manager/nvim/lua/plugins/vscode.lua index 2db1034..aba6e94 100644 --- a/home-manager/nvim/lua/plugins/vscode.lua +++ b/home-manager/nvim/lua/plugins/vscode.lua @@ -3,8 +3,8 @@ local vscode_plugin = { "Mofiqul/vscode.nvim", config = function() local vscode = require "vscode" - local is_wezterm = os.getenv "TERM_PROGRAM" == "WezTerm" - vscode.setup { transparent = is_wezterm } + local is_ghostty = os.getenv "TERM_PROGRAM" == "ghostty" + vscode.setup { transparent = is_ghostty } vscode.load() vim.api.nvim_set_hl(0, "StatusLine", { bg = "none" }) vim.api.nvim_set_hl(0, "TabLineFill", { bg = "none" }) -- 2.51.2 From ad5d70a01d59f8e3f7c525adeda32818fd42dbd4 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 4 Jan 2026 23:37:37 +0900 Subject: [PATCH 575/589] Update nvim-lsp-file-operations --- home-manager/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index eb929fc..da54c97 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -24,7 +24,7 @@ "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "85bbfad83f804f11688d1ab9486b459e699292d6" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "b9c795d3973e8eec22706af14959bc60c579e771" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, -- 2.51.2 From 897bf065fbe0f1c1607e1f11f6e7769c11d09551 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Thu, 8 Jan 2026 21:44:24 +0900 Subject: [PATCH 576/589] Fix codecompanion-history plugin's opts structure --- home-manager/nvim/lua/plugins/codecompanion.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home-manager/nvim/lua/plugins/codecompanion.lua b/home-manager/nvim/lua/plugins/codecompanion.lua index 67cf490..c95defd 100644 --- a/home-manager/nvim/lua/plugins/codecompanion.lua +++ b/home-manager/nvim/lua/plugins/codecompanion.lua @@ -20,9 +20,11 @@ return { }, extensions = { history = { - title_generation_opts = { - adapter = "copilot", - model = "gpt-4.1", + opts = { + title_generation_opts = { + adapter = "copilot", + model = "gpt-4.1", + }, }, }, mcphub = { -- 2.51.2 From 2cbc19cb7d7618c7dd1f5fae3fa544b9b54b6314 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 9 Jan 2026 15:32:40 +0900 Subject: [PATCH 577/589] Update Tree-sitter and add render-markdown.nvim --- home-manager/nvim/lazy-lock.json | 7 ++--- .../nvim/lua/plugins/render-markdown.lua | 5 ++++ home-manager/nvim/lua/plugins/treesitter.lua | 26 ++++++++++++------- home-manager/nvim/lua/vim_event/init.lua | 1 + 4 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 home-manager/nvim/lua/plugins/render-markdown.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index da54c97..15e1221 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,9 +8,9 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "8c6ca9f998aeef89f3543343070f8562bf911fb4" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "bfb31ca124bd1a2e032faea09844c8609154bdb5" }, - "codecompanion.nvim": { "branch": "main", "commit": "a8fcdb7ee9d47593bccb52def47d0583caeec0f9" }, + "codecompanion.nvim": { "branch": "main", "commit": "bfc0cd91db525f9652f91074d2b524dd3ede0c3f" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64" }, + "copilot.lua": { "branch": "master", "commit": "c13f6f5147b80298301eb409991f28a991736cc3" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, @@ -28,12 +28,13 @@ "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter": { "branch": "main", "commit": "2ba5ec184609a96b513bf4c53a20512d64e27f39" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "octo.nvim": { "branch": "master", "commit": "4a3a4fc5a9d3a372c91041f5b846f33b8d6b31fa" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "render-markdown.nvim": { "branch": "main", "commit": "82aa306873db26c91f1c175bd902514a627a5d95" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" }, diff --git a/home-manager/nvim/lua/plugins/render-markdown.lua b/home-manager/nvim/lua/plugins/render-markdown.lua new file mode 100644 index 0000000..13218d2 --- /dev/null +++ b/home-manager/nvim/lua/plugins/render-markdown.lua @@ -0,0 +1,5 @@ +---@type LazyPluginSpec +return { + "MeanderingProgrammer/render-markdown.nvim", + ft = { "codecompanion", "markdown" }, +} diff --git a/home-manager/nvim/lua/plugins/treesitter.lua b/home-manager/nvim/lua/plugins/treesitter.lua index f087050..be0cb77 100644 --- a/home-manager/nvim/lua/plugins/treesitter.lua +++ b/home-manager/nvim/lua/plugins/treesitter.lua @@ -1,22 +1,28 @@ ---@type LazyPluginSpec local treesitter = { "nvim-treesitter/nvim-treesitter", + branch = "main", build = function() require "nvim-treesitter.install".update { with_sync = true } end, config = function() - require "nvim-treesitter.configs".setup { - auto_install = true, - sync_install = true, - highlight = { - enable = true, + vim.api.nvim_create_autocmd(require "vim_event".file_type, { + pattern = { + "gitcommit", + "nix", + "python", + "rust", + "typescript", + "sql", + "typescriptreact", + "yaml", }, - indent = { - enable = true, - }, - } + callback = function() + vim.treesitter.start() - require "nvim-treesitter.install".prefer_git = false + vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" + end, + }) end, event = require "vim_event".buf_read_pre, } diff --git a/home-manager/nvim/lua/vim_event/init.lua b/home-manager/nvim/lua/vim_event/init.lua index 782f16a..9a875b2 100644 --- a/home-manager/nvim/lua/vim_event/init.lua +++ b/home-manager/nvim/lua/vim_event/init.lua @@ -3,6 +3,7 @@ local M = { buf_read_post = "BufReadPost", buf_read_pre = "BufReadPre", buf_write_pre = "BufWritePre", + file_type = "FileType", insert_enter = "InsertEnter", lsp_attach = "LspAttach", term_open = "TermOpen", -- 2.51.2 From 61c26a611a1d433490cadf181cf1b1dcceb7bdf7 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 9 Jan 2026 22:19:49 +0900 Subject: [PATCH 578/589] Enable Tree-sitter for asm and markdown --- home-manager/nvim/lua/plugins/treesitter.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/nvim/lua/plugins/treesitter.lua b/home-manager/nvim/lua/plugins/treesitter.lua index be0cb77..42092ad 100644 --- a/home-manager/nvim/lua/plugins/treesitter.lua +++ b/home-manager/nvim/lua/plugins/treesitter.lua @@ -8,7 +8,9 @@ local treesitter = { config = function() vim.api.nvim_create_autocmd(require "vim_event".file_type, { pattern = { + "asm", "gitcommit", + "markdown", "nix", "python", "rust", -- 2.51.2 From 2a6ebea48c3893d77a79b3dff47ca5de1bf40eb3 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 11 Jan 2026 23:13:31 +0900 Subject: [PATCH 579/589] Update plugins --- home-manager/nvim/lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 15e1221..fdade41 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,11 +8,11 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "8c6ca9f998aeef89f3543343070f8562bf911fb4" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "bfb31ca124bd1a2e032faea09844c8609154bdb5" }, - "codecompanion.nvim": { "branch": "main", "commit": "bfc0cd91db525f9652f91074d2b524dd3ede0c3f" }, + "codecompanion.nvim": { "branch": "main", "commit": "181e93c3f6a65ead4106f1b5a71194103accb3d3" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "c13f6f5147b80298301eb409991f28a991736cc3" }, + "copilot.lua": { "branch": "master", "commit": "5ace9ecd0db9a7a6c14064e4ce4ede5b800325f3" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, - "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, + "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, @@ -28,7 +28,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, - "nvim-treesitter": { "branch": "main", "commit": "2ba5ec184609a96b513bf4c53a20512d64e27f39" }, + "nvim-treesitter": { "branch": "main", "commit": "5a7e5638e7d220575b1c22c8a2e099b52231886e" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, -- 2.51.2 From 2c2c6e6ee00c8b8961f9b3214b59ef61a5fa4a43 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 11 Jan 2026 23:19:05 +0900 Subject: [PATCH 580/589] Enable multi window support for treesitter-context --- home-manager/nvim/lua/plugins/treesitter-context.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lua/plugins/treesitter-context.lua b/home-manager/nvim/lua/plugins/treesitter-context.lua index 07cc62d..281e2df 100644 --- a/home-manager/nvim/lua/plugins/treesitter-context.lua +++ b/home-manager/nvim/lua/plugins/treesitter-context.lua @@ -2,7 +2,8 @@ return { "nvim-treesitter/nvim-treesitter-context", event = require "vim_event".buf_read_pre, - dependencies = { - require "plugins.treesitter", + ---@type TSContext.UserConfig + opts = { + multiwindow = true, }, } -- 2.51.2 From 77317162904330520ea31055f0c9ceba78cd50e9 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 12 Jan 2026 21:50:26 +0900 Subject: [PATCH 581/589] Use `TMPDIR` to store images to pass to CodeCompanion --- home-manager/nvim/lua/plugins/img-clip.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/lua/plugins/img-clip.lua b/home-manager/nvim/lua/plugins/img-clip.lua index 86ea360..5251071 100644 --- a/home-manager/nvim/lua/plugins/img-clip.lua +++ b/home-manager/nvim/lua/plugins/img-clip.lua @@ -7,6 +7,7 @@ return { opts = { filetypes = { codecompanion = { + dir_path = os.getenv "TMPDIR" .. "/img-clip.nvim/", prompt_for_file_name = false, template = "[Image]($FILE_PATH)", use_absolute_path = true, -- 2.51.2 From d9e3c3fd11b5f60c0b35d4c66c3d18077b67753f Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Fri, 16 Jan 2026 22:52:40 +0900 Subject: [PATCH 582/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- home-manager/nvim/lua/plugins/cmp.lua | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index fdade41..daee734 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -8,17 +8,17 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "codecompanion-history.nvim": { "branch": "main", "commit": "8c6ca9f998aeef89f3543343070f8562bf911fb4" }, "codecompanion-spinner.nvim": { "branch": "main", "commit": "bfb31ca124bd1a2e032faea09844c8609154bdb5" }, - "codecompanion.nvim": { "branch": "main", "commit": "181e93c3f6a65ead4106f1b5a71194103accb3d3" }, + "codecompanion.nvim": { "branch": "main", "commit": "c609f04870d32bf59720ea8e62315235a57de697" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "5ace9ecd0db9a7a6c14064e4ce4ede5b800325f3" }, + "copilot.lua": { "branch": "master", "commit": "0ab400d547814b04b39a069208ff7b40ab22dfb5" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, - "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, + "lspkind.nvim": { "branch": "master", "commit": "53374a2dbcb959f1d0d5d3cf6c47c4b029151c6e" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mcphub.nvim": { "branch": "main", "commit": "5193329d510a68f1f5bf189960642c925c177a3a" }, + "mcphub.nvim": { "branch": "main", "commit": "415d9d0ea1db12eafc77c871f1ee07936f3b6e03" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, "neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, @@ -28,7 +28,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, - "nvim-treesitter": { "branch": "main", "commit": "5a7e5638e7d220575b1c22c8a2e099b52231886e" }, + "nvim-treesitter": { "branch": "main", "commit": "15b3416cc1f557c4932468e512a0bd45871167bc" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, diff --git a/home-manager/nvim/lua/plugins/cmp.lua b/home-manager/nvim/lua/plugins/cmp.lua index 6b44a39..075234e 100644 --- a/home-manager/nvim/lua/plugins/cmp.lua +++ b/home-manager/nvim/lua/plugins/cmp.lua @@ -14,9 +14,7 @@ local cmp = { local bordered_window = cmp.config.window.bordered() cmp.setup { - formatting = { format = require "lspkind".cmp_format({ - mode = 'text' -- Do not show icons as nvim-cmp already does - }) }, + formatting = { format = require "lspkind".cmp_format() }, mapping = { [""] = cmp.mapping(function(fallback) if cmp.visible() then -- 2.51.2 From 3201baccd9074bebabe230f83acf94f971dc9bfe Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sat, 17 Jan 2026 22:49:53 +0900 Subject: [PATCH 583/589] Update plugins --- home-manager/nvim/lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index daee734..fe409de 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -28,11 +28,11 @@ "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, - "nvim-treesitter": { "branch": "main", "commit": "15b3416cc1f557c4932468e512a0bd45871167bc" }, + "nvim-treesitter": { "branch": "main", "commit": "19261d56ed222ed93c6310943af0954d54c618fa" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "4a3a4fc5a9d3a372c91041f5b846f33b8d6b31fa" }, + "octo.nvim": { "branch": "master", "commit": "e1ec5cc2eb0bcfc64e312c6ab93764ffb0c43c3b" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "render-markdown.nvim": { "branch": "main", "commit": "82aa306873db26c91f1c175bd902514a627a5d95" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, -- 2.51.2 From b83ecbd81a53de8e6f3bad511e5c306cff007f4b Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 25 Jan 2026 02:22:29 +0900 Subject: [PATCH 584/589] Update plugins --- home-manager/nvim/lazy-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index fe409de..254bae4 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -6,33 +6,33 @@ "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "codecompanion-history.nvim": { "branch": "main", "commit": "8c6ca9f998aeef89f3543343070f8562bf911fb4" }, - "codecompanion-spinner.nvim": { "branch": "main", "commit": "bfb31ca124bd1a2e032faea09844c8609154bdb5" }, - "codecompanion.nvim": { "branch": "main", "commit": "c609f04870d32bf59720ea8e62315235a57de697" }, + "codecompanion-history.nvim": { "branch": "main", "commit": "bc1b4fe06eaaf0aa2399be742e843c22f7f1652a" }, + "codecompanion-spinner.nvim": { "branch": "main", "commit": "7797a81141e5de62eecebf2af561698ed58900dc" }, + "codecompanion.nvim": { "branch": "main", "commit": "26fa57cd0ac019c9bae539e7530f7c9401cbee55" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "0ab400d547814b04b39a069208ff7b40ab22dfb5" }, + "copilot.lua": { "branch": "master", "commit": "2d7511494245129aa6c2176f9c71cc2bc1360ed9" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, - "lspkind.nvim": { "branch": "master", "commit": "53374a2dbcb959f1d0d5d3cf6c47c4b029151c6e" }, + "lspkind.nvim": { "branch": "master", "commit": "dbac5149fb5fb1b642266ff268b1e0f4ebac9293" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mcphub.nvim": { "branch": "main", "commit": "415d9d0ea1db12eafc77c871f1ee07936f3b6e03" }, + "mcphub.nvim": { "branch": "main", "commit": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, - "neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" }, + "neogit": { "branch": "master", "commit": "73870229977fdd8747025820e15e98cfde787b9c" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "85bbfad83f804f11688d1ab9486b459e699292d6" }, + "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "b9c795d3973e8eec22706af14959bc60c579e771" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, - "nvim-treesitter": { "branch": "main", "commit": "19261d56ed222ed93c6310943af0954d54c618fa" }, + "nvim-treesitter": { "branch": "main", "commit": "275b9fe801d56d5fea6d34f5bfea8bb24887b805" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, - "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, + "nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "octo.nvim": { "branch": "master", "commit": "e1ec5cc2eb0bcfc64e312c6ab93764ffb0c43c3b" }, + "octo.nvim": { "branch": "master", "commit": "5ae580df72589f25b775ff2bdacfd7f7be8d63bd" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "render-markdown.nvim": { "branch": "main", "commit": "82aa306873db26c91f1c175bd902514a627a5d95" }, "schemastore.nvim": { "branch": "main", "commit": "ce624332e6ba5a9a0c8f311a114ac179c5e72f62" }, -- 2.51.2 From 7d307c58531899390a217d70bf81246c5128c84a Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Sun, 25 Jan 2026 02:24:08 +0900 Subject: [PATCH 585/589] Enable tinymist --- home-manager/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/nvim/init.lua b/home-manager/nvim/init.lua index 02fe032..ab9ad18 100644 --- a/home-manager/nvim/init.lua +++ b/home-manager/nvim/init.lua @@ -101,6 +101,7 @@ vim.lsp.enable { "nixd", "pylsp", "rust_analyzer", + "tinymist", "ts_ls", "wasm_language_tools", } -- 2.51.2 From a2d38ee6673f8717cfd2d4f9e29c4ef4713fbafd Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 9 Feb 2026 09:32:09 +0900 Subject: [PATCH 586/589] Update plugins --- home-manager/nvim/lazy-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 254bae4..7746ad8 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -10,13 +10,13 @@ "codecompanion-spinner.nvim": { "branch": "main", "commit": "7797a81141e5de62eecebf2af561698ed58900dc" }, "codecompanion.nvim": { "branch": "main", "commit": "26fa57cd0ac019c9bae539e7530f7c9401cbee55" }, "copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" }, - "copilot.lua": { "branch": "master", "commit": "2d7511494245129aa6c2176f9c71cc2bc1360ed9" }, + "copilot.lua": { "branch": "master", "commit": "3faffefbd6ddeb52578535ec6b730e0b72d7fd1a" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, - "lspkind.nvim": { "branch": "master", "commit": "dbac5149fb5fb1b642266ff268b1e0f4ebac9293" }, + "lspkind.nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "mcphub.nvim": { "branch": "main", "commit": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, @@ -26,11 +26,11 @@ "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "b9c795d3973e8eec22706af14959bc60c579e771" }, "nvim-lspconfig": { "branch": "master", "commit": "5bfcc89fd155b4ffc02d18ab3b7d19c2d4e246a7" }, - "nvim-scrollview": { "branch": "main", "commit": "316c37c96e6ab7d15e18f878366d0497179e8891" }, + "nvim-scrollview": { "branch": "main", "commit": "ff8c8b76170f0062aa00f2609b48235e9cc3d131" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, - "nvim-treesitter": { "branch": "main", "commit": "275b9fe801d56d5fea6d34f5bfea8bb24887b805" }, + "nvim-treesitter": { "branch": "main", "commit": "45a07f869b0cffba342276f2c77ba7c116d35db8" }, "nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" }, - "nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "octo.nvim": { "branch": "master", "commit": "5ae580df72589f25b775ff2bdacfd7f7be8d63bd" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, -- 2.51.2 From 44d8bba4f745d9720397dec71d21bbcbba1c0438 Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 9 Feb 2026 09:34:04 +0900 Subject: [PATCH 587/589] Remove mcphub --- home-manager/nvim/lazy-lock.json | 1 - home-manager/nvim/lua/plugins/mcphub.lua | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 home-manager/nvim/lua/plugins/mcphub.lua diff --git a/home-manager/nvim/lazy-lock.json b/home-manager/nvim/lazy-lock.json index 7746ad8..0981312 100644 --- a/home-manager/nvim/lazy-lock.json +++ b/home-manager/nvim/lazy-lock.json @@ -18,7 +18,6 @@ "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lspkind.nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mcphub.nvim": { "branch": "main", "commit": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f" }, "neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, "neogit": { "branch": "master", "commit": "73870229977fdd8747025820e15e98cfde787b9c" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, diff --git a/home-manager/nvim/lua/plugins/mcphub.lua b/home-manager/nvim/lua/plugins/mcphub.lua deleted file mode 100644 index 7634904..0000000 --- a/home-manager/nvim/lua/plugins/mcphub.lua +++ /dev/null @@ -1,7 +0,0 @@ ----@type LazyPluginSpec -return { - "ravitemer/mcphub.nvim", - branch = "main", -- For CodeCompanion v18 support - lazy = true, - opts = {}, -} -- 2.51.2 From e6232ad5a2605d316d1bde00dfedeecdd40634af Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 9 Feb 2026 09:34:27 +0900 Subject: [PATCH 588/589] Don't replace punctuations on save --- home-manager/nvim/after/ftplugin/typst.lua | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/home-manager/nvim/after/ftplugin/typst.lua b/home-manager/nvim/after/ftplugin/typst.lua index 7f57a7a..48682be 100644 --- a/home-manager/nvim/after/ftplugin/typst.lua +++ b/home-manager/nvim/after/ftplugin/typst.lua @@ -3,17 +3,3 @@ vim.opt_local.wrap = true require "nvim-autopairs".add_rule( require "nvim-autopairs.rule" ("$", "$", "typst"):with_move(function() return true end) ) - -local util = require "vim_util" - -util.create_autocmd { - event = require "vim_event".buf_write_pre, - config = { - group = util.create_augroup "typst_fmt", - callback = function() - vim.cmd ":silent! %s/。/./g" - vim.cmd ":silent! %s/、/,/g" - end, - pattern = "*.typ", - }, -} -- 2.51.2 From c5965448c1e0c402ff8ed41e17997a2ad6f7cf9e Mon Sep 17 00:00:00 2001 From: Takumi Akimoto <81888693+akimon658@users.noreply.github.com> Date: Mon, 9 Feb 2026 10:35:28 +0900 Subject: [PATCH 589/589] Configure Markdown heading style --- .../nvim/lua/plugins/render-markdown.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/home-manager/nvim/lua/plugins/render-markdown.lua b/home-manager/nvim/lua/plugins/render-markdown.lua index 13218d2..4430159 100644 --- a/home-manager/nvim/lua/plugins/render-markdown.lua +++ b/home-manager/nvim/lua/plugins/render-markdown.lua @@ -2,4 +2,21 @@ return { "MeanderingProgrammer/render-markdown.nvim", ft = { "codecompanion", "markdown" }, + ---@type render.md.UserConfig + opts = { + heading = { + backgrounds = { + "None", + "None", + "None", + "None", + "None", + "None", + }, + icons = { + "# ", "## ", "### ", "#### ", "##### ", "###### ", + }, + sign = false, + }, + }, }