Compare commits
13 Commits
9108f57780
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| d84bc8062e | |||
| 4e3d0500b9 | |||
|
38f4c63336
|
|||
|
434ff26226
|
|||
|
af95197cb1
|
|||
|
c2772d1874
|
|||
|
dd22699549
|
|||
|
b35b35731b
|
|||
|
881f99ef16
|
|||
|
0117cc612e
|
|||
|
1d3ae136be
|
|||
|
362064b206
|
|||
|
c84b6b6584
|
1
git-alten/dot-local
Symbolic link
1
git-alten/dot-local
Symbolic link
@@ -0,0 +1 @@
|
||||
../git/dot-local
|
||||
@@ -24,7 +24,7 @@
|
||||
tool = nvimdiff
|
||||
|
||||
[init]
|
||||
defaultBranch = master
|
||||
defaultBranch = main
|
||||
|
||||
[rebase]
|
||||
autosquash = true
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" },
|
||||
"conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
|
||||
"crates.nvim": { "branch": "main", "commit": "afcd1cc3eeceb5783676fc8464389b9216a29d05" },
|
||||
"eyeliner.nvim": { "branch": "main", "commit": "8f197eb30cecdf4c2cc9988a5eecc6bc34c0c7d6" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
@@ -24,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" },
|
||||
@@ -46,5 +47,5 @@
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
"ultimate-autopair.nvim": { "branch": "v0.6", "commit": "74163ac321c7d208a5bb9cdf8964114c7064d6c7" },
|
||||
"undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
"which-key.nvim": { "branch": "winborder-support", "commit": "ab1a3b0d3005a95507ba6c18b96531d430370885" }
|
||||
}
|
||||
|
||||
@@ -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" },
|
||||
|
||||
21
nvim/dot-config/nvim/lua/plugins/crates.lua
Normal file
21
nvim/dot-config/nvim/lua/plugins/crates.lua
Normal file
@@ -0,0 +1,21 @@
|
||||
-- https://github.com/Saecki/crates.nvim
|
||||
--- @module "lazy"
|
||||
--- @type LazySpec
|
||||
return {
|
||||
"Saecki/crates.nvim",
|
||||
event = { "BufRead Cargo.toml" },
|
||||
tag = "stable",
|
||||
--- @type crates.UserConfig
|
||||
opts = {
|
||||
popup = {
|
||||
hide_on_select = true,
|
||||
border = require("symbols.window").border,
|
||||
},
|
||||
lsp = {
|
||||
enabled = true,
|
||||
actions = true,
|
||||
completion = true,
|
||||
hover = true,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -24,8 +24,9 @@ local ensure_installed = {
|
||||
end,
|
||||
},
|
||||
"ruff",
|
||||
"prettierd",
|
||||
"prettier",
|
||||
"stylua",
|
||||
"eslint",
|
||||
}
|
||||
|
||||
--- @module "lazy"
|
||||
|
||||
@@ -3,7 +3,9 @@ local window = require("symbols.window")
|
||||
--- @module "lazy"
|
||||
--- @type LazySpec
|
||||
return {
|
||||
"folke/which-key.nvim",
|
||||
-- "folke/which-key.nvim",
|
||||
"cameronr/which-key.nvim",
|
||||
branch = "winborder-support",
|
||||
event = "VeryLazy",
|
||||
--- @module "which-key"
|
||||
--- @type wk.Opts
|
||||
|
||||
@@ -55,7 +55,7 @@ export EDITOR=nvim
|
||||
|
||||
alias cl="clear"
|
||||
|
||||
if (( $+commands[hash] )); then
|
||||
if (( $+commands[bat] )); then
|
||||
export BAT_THEME="gruvbox-dark"
|
||||
alias cat=bat
|
||||
fi
|
||||
@@ -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'
|
||||
@@ -141,7 +143,7 @@ done
|
||||
ZSH_TMUX_AUTOSTART=true
|
||||
if (( $+commands[tmux] )); then
|
||||
if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && -z "$INSIDE_EMACS" && -z "$EMACS" && -z "$VIM" && -z "$INTELLIJ_ENVIRONMENT_READER" && -z "$ZED_TERM" ]]; then
|
||||
if (( $+commands[sesh] )); then
|
||||
if (( $+commands[sesh] )) && (( $+commands[sesh-select] )); then
|
||||
sesh-select
|
||||
else
|
||||
tmux new-session
|
||||
|
||||
Reference in New Issue
Block a user