qwjyh/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: qwjyh:2f81ec6035cd966bbc57a36cc0b8d629eaacf5db
Branches Tags
qwjyh:main
qwjyh:lfrc
qwjyh:pluto_nvim
..
compare: qwjyh:8be02e755472bf38f96356537753f750af359469
Branches Tags
qwjyh:main
qwjyh:lfrc
qwjyh:pluto_nvim

No commits in common. "2f81ec6035cd966bbc57a36cc0b8d629eaacf5db" and "8be02e755472bf38f96356537753f750af359469" have entirely different histories.
2f81ec6035 ... 8be02e7554

6 changed files with 29 additions and 32 deletions
Show stats Expand all files Collapse all files

43
bin/install.sh
View file

@ -10,49 +10,46 @@ set -eu
# exit 1 # exit 1
# fi # fi
# TODO: check git in path # TODO: check git in path
cd "$(git rev-parse --show-toplevel)" cd $(git rev-parse --show-toplevel)
# ========================================================= # =========================================================
# links # links
# ========================================================= # =========================================================
mkdir -p ~/.config/fish mkdir -p ~/.config/fish
ln -sf "$(pwd)/dotfiles/fish/config.fish" ~/.config/fish/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/starship/starship.toml ~/.config/starship.toml
ln -sf "$(pwd)/dotfiles/tmux.conf" ~/.tmux.conf ln -sf $(pwd)/dotfiles/tmux.conf ~/.tmux.conf
# ln -s $(pwd)/dotfiles/neovim ~/.config/nvim
mkdir -p ~/.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 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/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/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/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/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/local_settings.lua ~/.config/nvim/lua/local_settings.lua
mkdir -p ~/.config/nvim/lua/lspconfig/server_configurations 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 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/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/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/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 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/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/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 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 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 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 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 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 curl -o ~/.julia/config/catppuccin.jl https://raw.githubusercontent.com/catppuccin/ohmyrepl/refs/heads/main/catppuccin.jl
mkdir -p ~/.config/lf 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)"

10
bin/neovim/add_dependencies.jl
View file

@ -11,12 +11,12 @@ Pkg.add("PackageCompiler")
# add extra dependencies # add extra dependencies
# these packages are manually collected # these packages are manually collected
pkg_extra = ["Logging", "Sockets", "DataStructures", "Tar", "ArgTools", "Dates", "Downloads", "TOML", "JSONRPC", "SymbolServer", "CSTParser", "StaticLint", "JSON"] pkg_extra = ["Logging", "Sockets", "DataStructures", "Tar", "ArgTools", "Dates", "Downloads", "TOML", "JSONRPC", "SymbolServer"]
Pkg.add(pkg_extra) Pkg.add(pkg_extra)
@info "added dependencies" @info "added dependencies"
# Extra package to be executed in precompiled code # Extra package to be executed in precompiled code
pkg_precompiled = ["Pkg"] pkg_precompiled = []
# save pkgs to be used for precompile functions with traced script # save pkgs to be used for precompile functions with traced script
out_path = joinpath(Pkg.project().path |> dirname, "precompile_exec_head.jl") out_path = joinpath(Pkg.project().path |> dirname, "precompile_exec_head.jl")
@ -24,8 +24,10 @@ out_path = joinpath(Pkg.project().path |> dirname, "precompile_exec_head.jl")
open(out_path, "w") do io open(out_path, "w") do io
println(io, "using LanguageServer") println(io, "using LanguageServer")
println(io, "using " * join(pkg_extra, ", ")) println(io, "using " * join(pkg_extra, ", "))
println(io, "using " * join(pkg_precompiled, ", ")) # println(io, "using " * join(pkg_precompiled, ", "))
println(io, "import FileWatching") if Sys.iswindows()
println(io, "import FileWatching")
end
end end
@info "finished writing precompile head file" @info "finished writing precompile head file"

2
bin/neovim/update_julials.jl
View file

@ -12,7 +12,7 @@ cd(project_path) do
end |> join end |> join
read("precompile_exec_head.jl", String) * compile_traces |> (b -> write("precompile_exec.jl", b)) read("precompile_exec_head.jl", String) * compile_traces |> (b -> write("precompile_exec.jl", b))
@info "compiling sysimage..." @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" @info "post precompile"
run(`julia --project=. -J sys-ls.so -e 'using Pkg; Pkg.precompile()'`) run(`julia --project=. -J sys-ls.so -e 'using Pkg; Pkg.precompile()'`)
end end

2
dotfiles/neovim/after/ftplugin/org.lua
View file

@ -1,2 +0,0 @@
vim.o.tabstop = 2
vim.o.shiftwidth = 2

2
dotfiles/neovim/init.lua
View file

@ -734,7 +734,7 @@ lspconfig.rust_analyzer.setup {
local lss = { "pyright", "texlab", --[[ "ccls", ]] "clangd", "ts_ls", --[["tailwindcss"]] "hls", "cmake", 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", "csharp_ls", "html", "r_language_server", "cssls", "jsonls", "sqls", "vhdl_ls", "ruff", "lemminx", "nixd", "nil_ls",
"verible", "svls", "yamlls" } "verible", "svls" }
for _, ls in pairs(lss) do for _, ls in pairs(lss) do
lspconfig[ls].setup { lspconfig[ls].setup {
on_attach = on_attach, on_attach = on_attach,

2
julia-sysimages

@ -1 +1 @@
Subproject commit 4661893b2a71e30ee13197ff4fa6291d85d1a012 Subproject commit 98581abe7cb2baecd63e95c337da08778fec60ae