Compare commits
7 Commits
b35b35731b
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| d84bc8062e | |||
| 4e3d0500b9 | |||
|
38f4c63336
|
|||
|
434ff26226
|
|||
|
af95197cb1
|
|||
|
c2772d1874
|
|||
|
dd22699549
|
@@ -24,7 +24,7 @@
|
||||
tool = nvimdiff
|
||||
|
||||
[init]
|
||||
defaultBranch = master
|
||||
defaultBranch = main
|
||||
|
||||
[rebase]
|
||||
autosquash = true
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
|
||||
"nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
|
||||
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "d89f4891f0720cd2598e4bdd60010d8784b2ac8a" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
|
||||
"nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
|
||||
|
||||
@@ -1,8 +1,23 @@
|
||||
return {
|
||||
settings = {
|
||||
Lua = {
|
||||
workspace = { checkThirdParty = false },
|
||||
workspace = {
|
||||
checkThirdParty = false,
|
||||
library = {
|
||||
"./definitions",
|
||||
},
|
||||
},
|
||||
telemetry = { enable = false },
|
||||
type = {
|
||||
checkTableShape = true,
|
||||
},
|
||||
diagnostics = {
|
||||
neededFileStatus = {
|
||||
-- ["no-unknown"] = "Opened",
|
||||
-- ["incomplete-signature-doc"] = "Opened",
|
||||
-- ["await-in-sync"] = "Opened",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -148,7 +148,10 @@ vim.api.nvim_create_autocmd("LspAttach", {
|
||||
end,
|
||||
})
|
||||
|
||||
-- Manually enable rust analyzer, if installed
|
||||
-- Manually enable lsps, if installed
|
||||
if vim.fn.executable("rust_analyzer") then
|
||||
vim.lsp.enable("rust_analyzer")
|
||||
end
|
||||
if vim.fn.executable("vtsls") then
|
||||
vim.lsp.enable("vtsls")
|
||||
end
|
||||
|
||||
@@ -5,15 +5,15 @@ local formatters_by_ft = {
|
||||
go = { "goimports" },
|
||||
python = { "ruff_organize_imports", "ruff_format" },
|
||||
rust = { "rustfmt" },
|
||||
javascript = { "prettierd" },
|
||||
javascriptreact = { "prettierd" },
|
||||
typescript = { "prettierd" },
|
||||
typescriptreact = { "prettierd" },
|
||||
css = { "prettierd" },
|
||||
markdown = { "prettierd" },
|
||||
yaml = { "prettierd" },
|
||||
javascript = { "prettier" },
|
||||
javascriptreact = { "prettier" },
|
||||
typescript = { "prettier" },
|
||||
typescriptreact = { "prettier" },
|
||||
css = { "prettier" },
|
||||
markdown = { "prettier" },
|
||||
yaml = { "prettier" },
|
||||
lua = { "stylua" },
|
||||
json = { "prettierd" },
|
||||
json = { "prettier" },
|
||||
toml = { "taplo" },
|
||||
-- ["*"] = { "injected" },
|
||||
["_"] = { "trim_whitespace", "trim_newlines" },
|
||||
|
||||
@@ -24,8 +24,9 @@ local ensure_installed = {
|
||||
end,
|
||||
},
|
||||
"ruff",
|
||||
"prettierd",
|
||||
"prettier",
|
||||
"stylua",
|
||||
"eslint",
|
||||
}
|
||||
|
||||
--- @module "lazy"
|
||||
|
||||
@@ -87,12 +87,14 @@ if (( $+commands[devcontainer] )); then
|
||||
}
|
||||
fi
|
||||
|
||||
if (( $+commands[pnpm] )); then
|
||||
export PNPM_HOME="/home/tim/.local/share/pnpm"
|
||||
export PNPM_HOME="/home/tim/.local/share/pnpm"
|
||||
if [ -d "$PNPM_HOME" ]; then
|
||||
case ":$PATH:" in
|
||||
*":$PNPM_HOME:"*) ;;
|
||||
*) export PATH="$PNPM_HOME:$PATH" ;;
|
||||
esac
|
||||
else
|
||||
unset PNPM_HOME
|
||||
fi
|
||||
|
||||
export FZF_DEFAULT_OPTS='--tmux'
|
||||
|
||||
Reference in New Issue
Block a user