From 383d7e510270677f08da143e80afbdbc28ca59e3 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Wed, 16 Apr 2025 19:40:15 +0900 Subject: [PATCH 1/5] new(nvim): add config for org --- dotfiles/neovim/after/ftplugin/org.lua | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 dotfiles/neovim/after/ftplugin/org.lua diff --git a/dotfiles/neovim/after/ftplugin/org.lua b/dotfiles/neovim/after/ftplugin/org.lua new file mode 100644 index 0000000..530b84c --- /dev/null +++ b/dotfiles/neovim/after/ftplugin/org.lua @@ -0,0 +1,2 @@ +vim.o.tabstop = 2 +vim.o.shiftwidth = 2 From 820240c0ef4c5122ff3ebdfb5cf35aba92cdc166 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Wed, 16 Apr 2025 19:41:28 +0900 Subject: [PATCH 2/5] update(install.sh): org ftplugin & jetls install & fix shellcheck --- bin/install.sh | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/bin/install.sh b/bin/install.sh index 90148a5..964fe27 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -10,46 +10,49 @@ set -eu # exit 1 # fi # TODO: check git in path -cd $(git rev-parse --show-toplevel) +cd "$(git rev-parse --show-toplevel)" # ========================================================= # links # ========================================================= mkdir -p ~/.config/fish -ln -sf $(pwd)/dotfiles/fish/config.fish ~/.config/fish/config.fish -ln -sf $(pwd)/dotfiles/starship/starship.toml ~/.config/starship.toml -ln -sf $(pwd)/dotfiles/tmux.conf ~/.tmux.conf +ln -sf "$(pwd)/dotfiles/fish/config.fish" ~/.config/fish/config.fish +ln -sf "$(pwd)/dotfiles/starship/starship.toml" ~/.config/starship.toml +ln -sf "$(pwd)/dotfiles/tmux.conf" ~/.tmux.conf +# ln -s $(pwd)/dotfiles/neovim ~/.config/nvim mkdir -p ~/.config/nvim -ln -sf $(pwd)/dotfiles/neovim/init.lua ~/.config/nvim/init.lua +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/lsp_config.lua ~/.config/nvim/lua/lsp_config.lua -ln -sf $(pwd)/dotfiles/neovim/lua/pluto_nvim.lua ~/.config/nvim/lua/pluto_nvim.lua -ln -sf $(pwd)/dotfiles/neovim/lua/local_settings.lua ~/.config/nvim/lua/local_settings.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/lsp_config.lua" ~/.config/nvim/lua/lsp_config.lua +ln -sf "$(pwd)/dotfiles/neovim/lua/pluto_nvim.lua" ~/.config/nvim/lua/pluto_nvim.lua +ln -sf "$(pwd)/dotfiles/neovim/lua/local_settings.lua" ~/.config/nvim/lua/local_settings.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 +ln -sf "$(pwd)/dotfiles/neovim/lua/lspconfig/server_configurations/satysfi_ls.lua" ~/.config/nvim/lua/lspconfig/server_configurations/satysfi_ls.lua +ln -sf "$(pwd)/dotfiles/neovim/lua/lspconfig/server_configurations/jetls.lua" ~/.config/nvim/lua/lspconfig/server_configurations/jetls.lua mkdir -p ~/.config/nvim/after/ftplugin -ln -sf $(pwd)/dotfiles/neovim/after/ftplugin/satysfi.lua ~/.config/nvim/after/ftplugin/satysfi.lua -ln -sf $(pwd)/dotfiles/neovim/after/ftplugin/tex.lua ~/.config/nvim/after/ftplugin/tex.lua -ln -sf $(pwd)/dotfiles/neovim/after/ftplugin/typst.lua ~/.config/nvim/after/ftplugin/typst.lua +ln -sf "$(pwd)/dotfiles/neovim/after/ftplugin/satysfi.lua" ~/.config/nvim/after/ftplugin/satysfi.lua +ln -sf "$(pwd)/dotfiles/neovim/after/ftplugin/tex.lua" ~/.config/nvim/after/ftplugin/tex.lua +ln -sf "$(pwd)/dotfiles/neovim/after/ftplugin/typst.lua" ~/.config/nvim/after/ftplugin/typst.lua +ln -sf "$(pwd)/dotfiles/neovim/after/ftplugin/org.lua" ~/.config/nvim/after/ftplugin/org.lua 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 +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 +ln -sf "$(pwd)/dotfiles/neovim/luasnippets/all.lua" ~/.config/nvim/luasnippets/all.lua mkdir -p ~/.config/nvim/luasnippets/satysfi -ln -sf $(pwd)/dotfiles/neovim/luasnippets/satysfi/math.lua ~/.config/nvim/luasnippets/satysfi/math.lua +ln -sf "$(pwd)/dotfiles/neovim/luasnippets/satysfi/math.lua" ~/.config/nvim/luasnippets/satysfi/math.lua mkdir -p ~/.julia/config -ln -sf $(pwd)/dotfiles/startup_linux.jl ~/.julia/config/startup.jl +ln -sf "$(pwd)/dotfiles/startup_linux.jl" ~/.julia/config/startup.jl curl -o ~/.julia/config/catppuccin.jl https://raw.githubusercontent.com/catppuccin/ohmyrepl/refs/heads/main/catppuccin.jl mkdir -p ~/.config/lf -ln -sf $(pwd)/dotfiles/lf/lfrc ~/.config/lf/lfrc +ln -sf "$(pwd)/dotfiles/lf/lfrc" ~/.config/lf/lfrc -ln -sf $(pwd)/dotfiles/bat/config "$(bat --config-file)" +ln -sf "$(pwd)/dotfiles/bat/config" "$(bat --config-file)" From 08e7a388d8590a4cd24d80adc4442a00125e3ebe Mon Sep 17 00:00:00 2001 From: qwjyh Date: Tue, 22 Apr 2025 16:57:22 +0900 Subject: [PATCH 3/5] update(nvim): add yamlls --- 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 71e2517..ff1e361 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -734,7 +734,7 @@ lspconfig.rust_analyzer.setup { local lss = { "pyright", "texlab", --[[ "ccls", ]] "clangd", "ts_ls", --[["tailwindcss"]] "hls", "cmake", "csharp_ls", "html", "r_language_server", "cssls", "jsonls", "sqls", "vhdl_ls", "ruff", "lemminx", "nixd", "nil_ls", - "verible", "svls" } + "verible", "svls", "yamlls" } for _, ls in pairs(lss) do lspconfig[ls].setup { on_attach = on_attach, From 9a137c8bd248506b94a3236871d956725d0fc218 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Tue, 29 Apr 2025 16:27:55 +0900 Subject: [PATCH 4/5] update julia-sysimages --- julia-sysimages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/julia-sysimages b/julia-sysimages index 98581ab..4661893 160000 --- a/julia-sysimages +++ b/julia-sysimages @@ -1 +1 @@ -Subproject commit 98581abe7cb2baecd63e95c337da08778fec60ae +Subproject commit 4661893b2a71e30ee13197ff4fa6291d85d1a012 From 2f81ec6035cd966bbc57a36cc0b8d629eaacf5db Mon Sep 17 00:00:00 2001 From: qwjyh Date: Tue, 29 Apr 2025 16:28:34 +0900 Subject: [PATCH 5/5] fix: sysimage for julials --- bin/neovim/add_dependencies.jl | 10 ++++------ bin/neovim/update_julials.jl | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bin/neovim/add_dependencies.jl b/bin/neovim/add_dependencies.jl index 46c7d44..b3e39fa 100644 --- a/bin/neovim/add_dependencies.jl +++ b/bin/neovim/add_dependencies.jl @@ -11,12 +11,12 @@ Pkg.add("PackageCompiler") # add extra dependencies # these packages are manually collected -pkg_extra = ["Logging", "Sockets", "DataStructures", "Tar", "ArgTools", "Dates", "Downloads", "TOML", "JSONRPC", "SymbolServer"] +pkg_extra = ["Logging", "Sockets", "DataStructures", "Tar", "ArgTools", "Dates", "Downloads", "TOML", "JSONRPC", "SymbolServer", "CSTParser", "StaticLint", "JSON"] Pkg.add(pkg_extra) @info "added dependencies" # Extra package to be executed in precompiled code -pkg_precompiled = [] +pkg_precompiled = ["Pkg"] # save pkgs to be used for precompile functions with traced script out_path = joinpath(Pkg.project().path |> dirname, "precompile_exec_head.jl") @@ -24,10 +24,8 @@ out_path = joinpath(Pkg.project().path |> dirname, "precompile_exec_head.jl") open(out_path, "w") do io println(io, "using LanguageServer") println(io, "using " * join(pkg_extra, ", ")) - # println(io, "using " * join(pkg_precompiled, ", ")) - if Sys.iswindows() - println(io, "import FileWatching") - end + println(io, "using " * join(pkg_precompiled, ", ")) + println(io, "import FileWatching") end @info "finished writing precompile head file" diff --git a/bin/neovim/update_julials.jl b/bin/neovim/update_julials.jl index 082a2b9..77c157e 100644 --- a/bin/neovim/update_julials.jl +++ b/bin/neovim/update_julials.jl @@ -12,7 +12,7 @@ cd(project_path) do end |> join read("precompile_exec_head.jl", String) * compile_traces |> (b -> write("precompile_exec.jl", b)) @info "compiling sysimage..." - create_sysimage(["LanguageServer"], sysimage_path = "sys-ls.so", precompile_execution_file = ["precompile_exec.jl"])' + create_sysimage(["LanguageServer"], sysimage_path = "sys-ls.so", precompile_execution_file = ["precompile_exec.jl"]) @info "post precompile" run(`julia --project=. -J sys-ls.so -e 'using Pkg; Pkg.precompile()'`) end