From abf2a17474ec53e45687cde630e11613f695b20b Mon Sep 17 00:00:00 2001 From: qwjyh Date: Tue, 9 Apr 2024 08:47:08 +0900 Subject: [PATCH 1/5] nvim: new: add tree-sitter injection query for julia(md_str) --- bin/install.ps1 | 2 ++ bin/install.sh | 3 +++ bin/neovim/update_julials.jl | 5 ++++- dotfiles/neovim/after/queries/julia/injections.scm | 7 +++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 dotfiles/neovim/after/queries/julia/injections.scm diff --git a/bin/install.ps1 b/bin/install.ps1 index 99e8f8e..bcc5fce 100644 --- a/bin/install.ps1 +++ b/bin/install.ps1 @@ -62,6 +62,8 @@ mkdir $env:LOCALAPPDATA\nvim\after\queries\satysfi Invoke-WebRequest -Uri "https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/highlights.scm" -OutFile $env:LOCALAPPDATA\nvim\after\queries\satysfi\highlights.scm Invoke-WebRequest -Uri "https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/indents.scm" -OutFile $env:LOCALAPPDATA\nvim\after\queries\satysfi\indents.scm Invoke-WebRequest -Uri "https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/matchup.scm" -OutFile $env:LOCALAPPDATA\nvim\after\queries\satysfi\matchup.scm +mkdir $env:LOCALAPPDATA\nvim\after\queries\julia +New-Item -ItemType SymbolicLink -Path $env:LOCALAPPDATA\nvim\after\queries\julia\injections.scm -Target (Resolve-Path .\dotfiles\neovim\after\queries\julia\injections.scm) # pwsh New-Item -ItemType SymbolicLink -Path $PROFILE -Target (Resolve-Path .\dotfiles\pwsh\powershell_profile.ps1) -Force New-Item -ItemType SymbolicLink -Path ~\.config\powershell\chezmoi_completion.ps1 -Target (Resolve-Path .\dotfiles\pwsh\chezmoi_completion.ps1) -Force diff --git a/bin/install.sh b/bin/install.sh index 357d8a0..09fca0c 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -25,6 +25,7 @@ ln -sf $(pwd)/dotfiles/neovim/init.lua ~/.config/nvim/init.lua mkdir -p ~/.config/nvim/lua ln -sf $(pwd)/dotfiles/neovim/lua/lualine_setup.lua ~/.config/nvim/lua/lualine_setup.lua ln -sf $(pwd)/dotfiles/neovim/lua/term_powershell.lua ~/.config/nvim/lua/term_powershell.lua +ln -sf $(pwd)/dotfiles/neovim/lua/pluto_nvim.lua ~/.config/nvim/lua/pluto_nvim.lua mkdir -p ~/.config/nvim/lua/lspconfig/server_configurations ln -sf $(pwd)/dotfiles/neovim/lua/lspconfig/server_configurations/satysfi_ls.lua ~/.config/nvim/lua/lspconfig/server_configurations/satysfi_ls.lua mkdir -p ~/.config/nvim/after/ftplugin @@ -34,6 +35,8 @@ mkdir -p ~/.config/nvim/after/queries/satysfi curl -o ~/.config/nvim/after/queries/satysfi/highlights.scm https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/highlights.scm curl -o ~/.config/nvim/after/queries/satysfi/indents.scm https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/indents.scm curl -o ~/.config/nvim/after/queries/satysfi/matchup.scm https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/matchup.scm +mkdir -p ~/.config/nvim/after/queries/julia +ln -sf $(pwd)/dotfiles/neovim/after/queries/julia/injections.scm ~/.config/nvim/after/queries/julia/injections.scm mkdir -p ~/.config/nvim/luasnippets ln -sf $(pwd)/dotfiles/neovim/luasnippets/all.lua ~/.config/nvim/luasnippets/all.lua mkdir -p ~/.config/nvim/luasnippets/satysfi diff --git a/bin/neovim/update_julials.jl b/bin/neovim/update_julials.jl index ffb3e1f..935848c 100644 --- a/bin/neovim/update_julials.jl +++ b/bin/neovim/update_julials.jl @@ -3,7 +3,10 @@ project_path = joinpath(homedir(), ".julia", "environments", "nvim-lspconfig") cd(project_path) @info "now at " pwd() run(`julia --project=. -e 'using Pkg; Pkg.update()'`) -read("precompile_exec_head.jl", String) * read("tracecompile.jl", String) |> (b -> write("precompile_exec.jl", b)) +compile_traces = Iterators.filter(eachline("tracecompile.jl")) do line + !startswith(line, '#') && !occursin(r"\#\d+\#\d+", line) +end |> join +read("precompile_exec_head.jl", String) * compile_traces |> (b -> write("precompile_exec.jl", b)) @info "compiling sysimage..." run(`julia --project=. -e 'using PackageCompiler; create_sysimage(["LanguageServer"], sysimage_path = "sys-ls.so", precompile_execution_file = ["precompile_exec.jl"])'`) @info "post precompile" diff --git a/dotfiles/neovim/after/queries/julia/injections.scm b/dotfiles/neovim/after/queries/julia/injections.scm new file mode 100644 index 0000000..60d3f24 --- /dev/null +++ b/dotfiles/neovim/after/queries/julia/injections.scm @@ -0,0 +1,7 @@ +;; extends + +((prefixed_string_literal + prefix: (identifier) @_prefix) @injection.content + (#eq? @_prefix "md") + (#set! injection.language "markdown") + (#offset! @injection.content 0 2 0 -1)) From 00942d09b0b1c6a2bde121ad10b094781820beaa Mon Sep 17 00:00:00 2001 From: qwjyh Date: Tue, 9 Apr 2024 08:48:21 +0900 Subject: [PATCH 2/5] nvim: add: jsonls --- dotfiles/neovim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index 064f243..2b1b6b7 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -626,7 +626,7 @@ lspconfig.rust_analyzer.setup { } local lss = { "pyright", "texlab", "ccls", "clangd", "tsserver", --[["tailwindcss"]] "hls", "cmake", - "csharp_ls", "html", "r_language_server", "ruff_lsp", "cssls" } + "csharp_ls", "html", "r_language_server", "ruff_lsp", "cssls", "jsonls" } for _, ls in pairs(lss) do lspconfig[ls].setup { on_attach = on_attach, From cead8a4f4e1522c3d2ee75586318d1a99c508c26 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Tue, 9 Apr 2024 17:31:58 +0900 Subject: [PATCH 3/5] add: nvim: sqls --- dotfiles/neovim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index 2b1b6b7..8308575 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -626,7 +626,7 @@ lspconfig.rust_analyzer.setup { } local lss = { "pyright", "texlab", "ccls", "clangd", "tsserver", --[["tailwindcss"]] "hls", "cmake", - "csharp_ls", "html", "r_language_server", "ruff_lsp", "cssls", "jsonls" } + "csharp_ls", "html", "r_language_server", "ruff_lsp", "cssls", "jsonls", "sqls" } for _, ls in pairs(lss) do lspconfig[ls].setup { on_attach = on_attach, From 0340b930ea3c7e8963a70aa24c17ddde602e60ec Mon Sep 17 00:00:00 2001 From: qwjyh Date: Mon, 15 Apr 2024 18:00:06 +0900 Subject: [PATCH 4/5] update: nvim: remove auto appended setup script by PDM --- dotfiles/pwsh/powershell_profile.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dotfiles/pwsh/powershell_profile.ps1 b/dotfiles/pwsh/powershell_profile.ps1 index d7e9a0f..b9e0ae5 100644 --- a/dotfiles/pwsh/powershell_profile.ps1 +++ b/dotfiles/pwsh/powershell_profile.ps1 @@ -231,7 +231,3 @@ Import-Module WSLTabCompletion Get-ChildItem ~\.config\powershell\completions\ | % { . $_ } -# Automatically appended by pdm scoop package -Get-ChildItem "$PROFILE\..\Completions\" | ForEach-Object { - . $_.FullName -} From 6490787142c3b9b21f3ab0111058bd67399c3ca0 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Wed, 1 May 2024 18:32:06 +0900 Subject: [PATCH 5/5] nvim: add support for powershell_es on linux --- dotfiles/neovim/init.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index 8308575..d37aed4 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -597,8 +597,10 @@ lspconfig.bashls.setup { capabilities = capabilities, } -- pwsh +local win_pwsh_es_path = '~/scoop/apps/powershell-editorservice/current' +local arch_pwsh_es_path = "/opt/powershell-editor-services/" lspconfig.powershell_es.setup { - bundle_path = '~/scoop/apps/powershell-editorservice/current', + bundle_path = vim.fn.has('win32') == 1 and win_pwsh_es_path or arch_pwsh_es_path, capabilities = capabilities, } -- ccls