Compare commits

...

12 Commits

Author SHA1 Message Date
d84bc8062e Use prettier instead of prettierd
I keep having issues with prettierd not working and prettier works just
fine.
2025-12-05 13:48:28 +01:00
4e3d0500b9 Fixed pnpm setup 2025-12-03 21:32:20 +01:00
38f4c63336 Extra luals settings 2025-11-22 00:29:11 +01:00
434ff26226 Add eslint 2025-11-22 00:29:11 +01:00
af95197cb1 Update lspconfig 2025-11-22 00:29:10 +01:00
c2772d1874 Add vtsls as manual lsp 2025-11-22 00:29:10 +01:00
dd22699549 Switch default branch to main 2025-11-22 00:29:10 +01:00
b35b35731b zsh: Fix bat command availability check 2025-09-13 19:37:31 +02:00
881f99ef16 nvim: Use fork of which-key to fix border 2025-09-13 02:42:42 +02:00
0117cc612e zsh: Only start sesh-select if both sesh and sesh-select are available 2025-09-13 02:00:53 +02:00
1d3ae136be sesh: Moved sesh-select to be under sesh 2025-09-13 01:59:45 +02:00
362064b206 git: Also install git fixup on git-alten 2025-09-13 01:35:29 +02:00
10 changed files with 43 additions and 19 deletions

1
git-alten/dot-local Symbolic link
View File

@@ -0,0 +1 @@
../git/dot-local

View File

@@ -24,7 +24,7 @@
tool = nvimdiff tool = nvimdiff
[init] [init]
defaultBranch = master defaultBranch = main
[rebase] [rebase]
autosquash = true autosquash = true

View File

@@ -25,7 +25,7 @@
"nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" }, "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
"nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" }, "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, "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-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
@@ -47,5 +47,5 @@
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
"ultimate-autopair.nvim": { "branch": "v0.6", "commit": "74163ac321c7d208a5bb9cdf8964114c7064d6c7" }, "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "74163ac321c7d208a5bb9cdf8964114c7064d6c7" },
"undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" }, "undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } "which-key.nvim": { "branch": "winborder-support", "commit": "ab1a3b0d3005a95507ba6c18b96531d430370885" }
} }

View File

@@ -1,8 +1,23 @@
return { return {
settings = { settings = {
Lua = { Lua = {
workspace = { checkThirdParty = false }, workspace = {
checkThirdParty = false,
library = {
"./definitions",
},
},
telemetry = { enable = false }, telemetry = { enable = false },
type = {
checkTableShape = true,
},
diagnostics = {
neededFileStatus = {
-- ["no-unknown"] = "Opened",
-- ["incomplete-signature-doc"] = "Opened",
-- ["await-in-sync"] = "Opened",
},
},
}, },
}, },
} }

View File

@@ -148,7 +148,10 @@ vim.api.nvim_create_autocmd("LspAttach", {
end, end,
}) })
-- Manually enable rust analyzer, if installed -- Manually enable lsps, if installed
if vim.fn.executable("rust_analyzer") then if vim.fn.executable("rust_analyzer") then
vim.lsp.enable("rust_analyzer") vim.lsp.enable("rust_analyzer")
end end
if vim.fn.executable("vtsls") then
vim.lsp.enable("vtsls")
end

View File

@@ -5,15 +5,15 @@ local formatters_by_ft = {
go = { "goimports" }, go = { "goimports" },
python = { "ruff_organize_imports", "ruff_format" }, python = { "ruff_organize_imports", "ruff_format" },
rust = { "rustfmt" }, rust = { "rustfmt" },
javascript = { "prettierd" }, javascript = { "prettier" },
javascriptreact = { "prettierd" }, javascriptreact = { "prettier" },
typescript = { "prettierd" }, typescript = { "prettier" },
typescriptreact = { "prettierd" }, typescriptreact = { "prettier" },
css = { "prettierd" }, css = { "prettier" },
markdown = { "prettierd" }, markdown = { "prettier" },
yaml = { "prettierd" }, yaml = { "prettier" },
lua = { "stylua" }, lua = { "stylua" },
json = { "prettierd" }, json = { "prettier" },
toml = { "taplo" }, toml = { "taplo" },
-- ["*"] = { "injected" }, -- ["*"] = { "injected" },
["_"] = { "trim_whitespace", "trim_newlines" }, ["_"] = { "trim_whitespace", "trim_newlines" },

View File

@@ -24,8 +24,9 @@ local ensure_installed = {
end, end,
}, },
"ruff", "ruff",
"prettierd", "prettier",
"stylua", "stylua",
"eslint",
} }
--- @module "lazy" --- @module "lazy"

View File

@@ -3,7 +3,9 @@ local window = require("symbols.window")
--- @module "lazy" --- @module "lazy"
--- @type LazySpec --- @type LazySpec
return { return {
"folke/which-key.nvim", -- "folke/which-key.nvim",
"cameronr/which-key.nvim",
branch = "winborder-support",
event = "VeryLazy", event = "VeryLazy",
--- @module "which-key" --- @module "which-key"
--- @type wk.Opts --- @type wk.Opts

View File

@@ -55,7 +55,7 @@ export EDITOR=nvim
alias cl="clear" alias cl="clear"
if (( $+commands[hash] )); then if (( $+commands[bat] )); then
export BAT_THEME="gruvbox-dark" export BAT_THEME="gruvbox-dark"
alias cat=bat alias cat=bat
fi fi
@@ -87,12 +87,14 @@ if (( $+commands[devcontainer] )); then
} }
fi 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 case ":$PATH:" in
*":$PNPM_HOME:"*) ;; *":$PNPM_HOME:"*) ;;
*) export PATH="$PNPM_HOME:$PATH" ;; *) export PATH="$PNPM_HOME:$PATH" ;;
esac esac
else
unset PNPM_HOME
fi fi
export FZF_DEFAULT_OPTS='--tmux' export FZF_DEFAULT_OPTS='--tmux'
@@ -141,7 +143,7 @@ done
ZSH_TMUX_AUTOSTART=true ZSH_TMUX_AUTOSTART=true
if (( $+commands[tmux] )); then 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 [[ -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 sesh-select
else else
tmux new-session tmux new-session