Compare commits

...

2 Commits

Author SHA1 Message Date
Julius Riegel 38cc5d0f35
Merge branch 'main' of ssh://git.trivernis.net:22321/Trivernis/dotfiles-silo 3 months ago
Julius Riegel 1ef80a61bb
Update dotfiles 3 months ago

@ -1,59 +1,91 @@
theme = "dracula-purple" theme = "dracula-purple"
[editor] [editor]
rulers = [120] rulers = [120]
shell = ["nu", "--stdin", "--no-newline", "-c"] shell = ["nu", "--stdin", "--no-newline", "-c"]
true-color = true true-color = true
cursorline = true cursorline = true
color-modes = true color-modes = true
bufferline = "always" bufferline = "always"
line-number = "relative" line-number = "relative"
auto-save = true auto-save = true
[editor.cursor-shape]
insert = "bar"
normal = "block"
select = "underline"
[editor.statusline]
left = ["mode", "spinner", "spacer", "file-name"]
center = []
right = ["diagnostics", "selections", "position", "position-percentage", "primary-selection-length", "separator", "file-encoding", "file-line-ending", "file-type", "separator", "spacer", "version-control", "spacer"]
separator = " │"
[editor.lsp]
auto-signature-help = true
display-inlay-hints = true
[editor.indent-guides]
render = true
rainbow = "dim"
[editor.file-picker]
hidden = false
[editor.whitespace.render]
tab = "all"
nbsp = "all"
[keys.normal] [editor.cursor-shape]
esc = ["collapse_selection", "keep_primary_selection"] insert = "bar"
C-j = ["half_page_down", "goto_window_center", "align_view_center"] normal = "block"
C-k = ["half_page_up", "goto_window_center", "align_view_center"] select = "underline"
A-w = [":sh use ide.nu; ide write-here miw"]
A-W = [":sh use ide.nu; ide write-here miW"]
D = [":sh use ide.nu; ide write-here \"2y%d\"2p"]
[keys.select] [editor.statusline]
esc = ["collapse_selection", "keep_primary_selection", "normal_mode"] left = ["mode", "spinner", "spacer", "file-name"]
C-j = ["half_page_down", "goto_window_center"] center = []
C-k = ["half_page_up", "goto_window_center"] right = [
A-w = [":sh use ide.nu; ide write-here miw"] "diagnostics",
A-W = [":sh use ide.nu; ide write-here miW"] "selections",
D = [":sh use ide.nu; ide write-here \"9y%d\"9p"] "position",
"position-percentage",
"primary-selection-length",
"separator",
"file-encoding",
"file-line-ending",
"file-type",
"separator",
"spacer",
"version-control",
"spacer",
]
separator = " │"
[editor.lsp]
auto-signature-help = true
display-inlay-hints = true
[editor.indent-guides]
render = true
rainbow = "dim"
[keys.normal."A-/"] [editor.file-picker]
j = ["goto_line_start", ":insert-output use ide.nu; ide doc-comment java-style", ":format", "normal_mode", "move_visual_line_up", "insert_at_line_end"] hidden = false
r = ["goto_line_start", ":insert-output use ide.nu; ide doc-comment rust-style", ":format", "normal_mode", "insert_at_line_end"]
[editor.whitespace.render]
tab = "all"
nbsp = "all"
[keys.normal]
esc = ["collapse_selection", "keep_primary_selection"]
C-j = ["half_page_down", "goto_window_center", "align_view_center"]
C-k = ["half_page_up", "goto_window_center", "align_view_center"]
A-w = [":sh use ide.nu; ide write-here miw"]
A-W = [":sh use ide.nu; ide write-here miW"]
D = [":sh use ide.nu; ide write-here \"2y%d\"2p"]
# Delete default deletion behaviour to not yank unless used with alt
A-d = "delete_selection"
d = "delete_selection_noyank"
A-c = "change_selection"
c = "change_selection_noyank"
[keys.select]
esc = ["collapse_selection", "keep_primary_selection", "normal_mode"]
C-j = ["half_page_down", "goto_window_center"]
C-k = ["half_page_up", "goto_window_center"]
A-w = [":sh use ide.nu; ide write-here miw"]
A-W = [":sh use ide.nu; ide write-here miW"]
D = [":sh use ide.nu; ide write-here \"9y%d\"9p"]
[keys.normal."A-/"]
j = [
"goto_line_start",
"add_newline_above",
"move_visual_line_up",
":insert-output use ide.nu; ide doc-comment java-style",
":format",
"normal_mode",
"move_visual_line_up",
"insert_at_line_end",
]
r = [
"goto_line_start",
":insert-output use ide.nu; ide doc-comment rust-style",
":format",
"normal_mode",
"insert_at_line_end",
]

@ -1,78 +1,79 @@
[language-server.biome] [language-server.biome]
command = "biome" command = "biome"
args = ["lsp-proxy"] args = ["lsp-proxy"]
[language-server.efm] [language-server.efm]
command = "efm-langserver" command = "efm-langserver"
[language-server.roc_lang_server] [language-server.roc_lang_server]
command = "roc_lang_server" command = "roc_lang_server"
args = [] args = []
[language-server.graphql-language-service] [language-server.graphql-language-service]
command = "graphql-lsp" command = "graphql-lsp"
args = ["server", "-m", "stream"] args = ["server", "-m", "stream"]
[language-server.typescript-language-server.config.preferences] [language-server.typescript-language-server.config.preferences]
disableSuggestions = true disableSuggestions = true
[language-server.nu-lsp] [language-server.nu-lsp]
command = "nu" command = "nu"
args = ["-I", "~/.config/nushell/scripts", "--lsp"] args = ["-I", "~/.config/nushell/scripts", "--lsp"]
[language-server.pug-lsp] [language-server.pug-lsp]
command = "pug-lsp" command = "pug-lsp"
args = [] args = []
[language-server.astro-ls] [language-server.astro-ls]
command = "astro-ls" command = "astro-ls"
args = ["--stdio"] args = ["--stdio"]
[language-server.astro-ls.config] [language-server.astro-ls.config]
typescript = {} typescript = {}
[language-server.vls] [language-server.vls]
command = "vls" command = "vls"
args = [] args = ["--stdio"]
config = { typescript = { tsdk = "node_modules/typescript/lib/" } }
[language-server.pest-lsp] [language-server.pest-lsp]
command = "pest-language-server" command = "pest-language-server"
args = [] args = []
[language-server.svelteserver] [language-server.svelteserver]
command = "svelteserver" command = "svelteserver"
args = ["--stdio"] args = ["--stdio"]
[language-server.svelteserver.config.configuration.typescript] [language-server.svelteserver.config.configuration.typescript]
inlayHints.parameterTypes.enabled = true inlayHints.parameterTypes.enabled = true
inlayHints.variableTypes.enabled = true inlayHints.variableTypes.enabled = true
inlayHints.propertyDeclarationTypes.enabled = true inlayHints.propertyDeclarationTypes.enabled = true
inlayHints.functionLikeReturnTypes.enabled = true inlayHints.functionLikeReturnTypes.enabled = true
inlayHints.enumMemberValues.enabled = true inlayHints.enumMemberValues.enabled = true
inlayHints.parameterNames.enabled = "all" inlayHints.parameterNames.enabled = "all"
[language-server.svelteserver.config.configuration.javascript] [language-server.svelteserver.config.configuration.javascript]
inlayHints.parameterTypes.enabled = true inlayHints.parameterTypes.enabled = true
inlayHints.variableTypes.enabled = true inlayHints.variableTypes.enabled = true
inlayHints.propertyDeclarationTypes.enabled = true inlayHints.propertyDeclarationTypes.enabled = true
inlayHints.functionLikeReturnTypes.enabled = true inlayHints.functionLikeReturnTypes.enabled = true
inlayHints.enumMemberValues.enabled = true inlayHints.enumMemberValues.enabled = true
inlayHints.parameterNames.enabled = "all" inlayHints.parameterNames.enabled = "all"
[language-server.hx-lsp] [language-server.hx-lsp]
command = "hx-lsp" command = "hx-lsp"
args = [] args = []
# languages # languages
[[language]] [[language]]
name = "typescript" name = "typescript"
language-servers = [ language-servers = [
"typescript-language-server", "typescript-language-server",
"biome", "biome",
"graphql-language-service", "graphql-language-service",
@ -80,192 +81,225 @@ language-servers = [
"diagnostics", "diagnostics",
"format", "format",
] }, ] },
"hx-lsp" "hx-lsp",
] ]
auto-format = true auto-format = true
formatter = { command = "biome", args = [ formatter = { command = "biome", args = [
"format", "format",
"--stdin-file-path=file.ts", "--stdin-file-path=file.ts",
] } ] }
indent = { tab-width = 4, unit = " " } indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "javascript" name = "javascript"
language-servers = ["typescript-language-server", "biome", { name = "efm", only-features = ["diagnostics", "format"]}, "hx-lsp"] language-servers = [
auto-format = true "typescript-language-server",
formatter = { command = "biome", args = [ "biome",
{ name = "efm", only-features = [
"diagnostics",
"format",
] },
"hx-lsp",
]
auto-format = true
formatter = { command = "biome", args = [
"format", "format",
"--stdin-file-path=file.js", "--stdin-file-path=file.js",
] } ] }
indent = { tab-width = 4, unit = " " } indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "json" name = "json"
formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.json"] } formatter = { command = "biome", args = [
"format",
"--stdin-file-path=file.json",
] }
[[language]] [[language]]
name = "handlebars" name = "handlebars"
injection-regex = "hbs" injection-regex = "hbs"
roots = ["package.json", "repo.toml", "dir.toml"] roots = ["package.json", "repo.toml", "dir.toml"]
file-types = ["hbs", "tmpl"] file-types = ["hbs", "tmpl"]
grammar = "glimmer" grammar = "glimmer"
language-servers = ["ember"] language-servers = ["ember"]
formatter = { command = "prettier", args = ['--parser', 'glimmer'] } formatter = { command = "prettier", args = ['--parser', 'glimmer'] }
scope = "source.glimmer" scope = "source.glimmer"
[[grammar]] [[grammar]]
name = "glimmer" name = "glimmer"
source = { git = "https://github.com/alexlafroscia/tree-sitter-glimmer", rev = "f9746dc1d0707717fbba84cb5c22a71586af23e1" } source = { git = "https://github.com/alexlafroscia/tree-sitter-glimmer", rev = "f9746dc1d0707717fbba84cb5c22a71586af23e1" }
[[language]] [[language]]
name = "roc" name = "roc"
language-servers = ["roc_lang_server"] language-servers = ["roc_lang_server"]
auto-format = true auto-format = true
indent = { tab-width = 4, unit = " " } indent = { tab-width = 4, unit = " " }
file-types = ["roc"] file-types = ["roc"]
shebangs = ["roc"] shebangs = ["roc"]
scope = "source.roc" scope = "source.roc"
comment-tokens = ["#"] comment-tokens = ["#"]
roots = [] roots = []
formatter = { command = "roc", args = ['format', '--stdin', '--stdout'] } formatter = { command = "roc", args = ['format', '--stdin', '--stdout'] }
grammar = "roc" grammar = "roc"
[[language]] [[language]]
name = "bash" name = "bash"
auto-format = true auto-format = true
formatter = { command = "shfmt", args = ["-s", "-sr", "-"] } formatter = { command = "shfmt", args = ["-s", "-sr", "-"] }
[language.auto-pairs] [language.auto-pairs]
'(' = ')' '(' = ')'
'{' = '}' '{' = '}'
'[' = ']' '[' = ']'
'"' = '"' '"' = '"'
[[grammar]] [[grammar]]
name = "roc" name = "roc"
source = { git = "https://github.com/faldor20/tree-sitter-roc", rev = "381743cd40ee19a9508c6445aacb9085d4bc0cf8" } source = { git = "https://github.com/faldor20/tree-sitter-roc", rev = "381743cd40ee19a9508c6445aacb9085d4bc0cf8" }
[[language]] [[language]]
name = "nu" name = "nu"
scope = "source.nu" scope = "source.nu"
injection-regex = "nu" injection-regex = "nu"
file-types = ["nu", "nuon"] file-types = ["nu", "nuon"]
shebangs = ["nu"] shebangs = ["nu"]
indent = { tab-width = 2, unit = " " } indent = { tab-width = 2, unit = " " }
language-servers = ["nu-lsp"] language-servers = ["nu-lsp"]
[[grammar]] [[grammar]]
name = "nu" name = "nu"
source = { git = "https://github.com/nushell/tree-sitter-nu", rev = "358c4f509eb97f0148bbd25ad36acc729819b9c1" } source = { git = "https://github.com/nushell/tree-sitter-nu", rev = "358c4f509eb97f0148bbd25ad36acc729819b9c1" }
[[language]] [[language]]
name = "markdown" name = "markdown"
# formatter = { command = "comrak", args = ["-t", "commonmark", "--gfm", "--unsafe", "-e", "table"] } # formatter = { command = "comrak", args = ["-t", "commonmark", "--gfm", "--unsafe", "-e", "table"] }
formatter = { command = "prettier", args = ["--stdin-filepath=source.md"] } formatter = { command = "prettier", args = ["--stdin-filepath=source.md"] }
[[language]] [[language]]
name = "kdl" name = "kdl"
auto-format = true auto-format = true
formatter = { command = "kdlfmt" } formatter = { command = "kdlfmt" }
[[language]] [[language]]
name = "pug" name = "toml"
language-servers = ["pug-lsp"] auto-format = true
auto-format = true formatter = { command = "taplo", args = [
indent = { tab-width = 4, unit = " " } "fmt",
file-types = ["pug"] "--option",
scope = "source.pug" "indent_entries=true",
comment-tokens = ["//"] "--option",
roots = [] "indent_tables=true",
grammar = "pug" "-",
] }
[language.auto-pairs]
'(' = ')' [[language]]
'{' = '}' name = "pug"
'[' = ']' language-servers = ["pug-lsp"]
'"' = '"' auto-format = true
indent = { tab-width = 4, unit = " " }
file-types = ["pug"]
scope = "source.pug"
comment-tokens = ["//"]
roots = []
grammar = "pug"
[language.auto-pairs]
'(' = ')'
'{' = '}'
'[' = ']'
'"' = '"'
[[grammar]] [[grammar]]
name = "pug" name = "pug"
source = { git = "https://github.com/zealot128/tree-sitter-pug", rev = "a7ff31a38908df9b9f34828d21d6ca5e12413e18" } source = { git = "https://github.com/zealot128/tree-sitter-pug", rev = "a7ff31a38908df9b9f34828d21d6ca5e12413e18" }
[[language]] [[language]]
name = "svelte" name = "svelte"
auto-format = true auto-format = true
language-servers = [ "svelteserver", "biome" ] language-servers = ["svelteserver", "biome"]
[[language]] [[language]]
name = "astro" name = "astro"
language-servers = [ "astro-ls", "hx-lsp" ] language-servers = ["astro-ls", "hx-lsp"]
[[language]] [[language]]
name = "jora" name = "jora"
injection-regex = "(jr|jora)" injection-regex = "(jr|jora)"
auto-format = true auto-format = true
indent = { tab-width = 4, unit = " " } indent = { tab-width = 4, unit = " " }
file-types = ["jora"] file-types = ["jora"]
scope = "source.jora" scope = "source.jora"
comment-tokens = ["//"] comment-tokens = ["//"]
roots = [] roots = []
language-servers = [ "hx-lsp" ] language-servers = ["hx-lsp"]
grammar = "jora" grammar = "jora"
# [[grammar]] # [[grammar]]
# name = "jora" # name = "jora"
# source = { git = "git@gitlab.unitb.com:jri/tree-sitter-jora.git", rev = "3c65fd8a368818a2300ac4dee8f4801db9dd28e1" } # source = { git = "git@gitlab.unitb.com:jri/tree-sitter-jora.git", rev = "3c65fd8a368818a2300ac4dee8f4801db9dd28e1" }
[[language]] [[language]]
name = "vue" name = "vue"
auto-format = true auto-format = true
formatter = { command = "biome", args = [ language-servers = ["vls", "biome"]
formatter = { command = "biome", args = [
"format", "format",
"--stdin-file-path=file.vue", "--stdin-file-path=file.vue",
] } ] }
language-servers = ["vls"]
[[language]] [[language]]
name = "env" name = "env"
file-types = [ file-types = [
{ glob = ".env" }, { glob = ".env" },
{ glob = ".env.*" }, { glob = ".env.*" },
{ glob = ".envrc" }, { glob = ".envrc" },
{ glob = ".envrc.*" }, { glob = ".envrc.*" },
{ glob = "*.env" }, { glob = "*.env" },
] ]
[[language]]
name = "scheme"
formatter = { command = "schemat" }
[[language]]
name = "svelte"
auto-format = true
[[language]] [[language]]
name = "pest" name = "pest"
language-servers = ["pest-lsp"] language-servers = ["pest-lsp"]
auto-format = true auto-format = true
indent = { tab-width = 2, unit = " " } indent = { tab-width = 2, unit = " " }
file-types = ["pest"] file-types = ["pest"]
shebangs = ["pest"] shebangs = ["pest"]
scope = "source.pest" scope = "source.pest"
comment-tokens = ["//"] comment-tokens = ["//"]
grammar = "pest" grammar = "pest"
[language.auto-pairs] [language.auto-pairs]
'(' = ')' '(' = ')'
'{' = '}' '{' = '}'
'[' = ']' '[' = ']'
'"' = '"' '"' = '"'
[[grammar]] [[grammar]]
name = "pest" name = "pest"
source = { git = "https://github.com/pest-parser/tree-sitter-pest", rev = "a8a98a824452b1ec4da7f508386a187a2f234b85" } source = { git = "https://github.com/pest-parser/tree-sitter-pest", rev = "a8a98a824452b1ec4da7f508386a187a2f234b85" }

@ -11,6 +11,36 @@ export def `follow nuon-lines` [] {
lines | each {|it| try { $it | from nuon } catch { {msg: $it} } | table --expand | print} | ignore lines | each {|it| try { $it | from nuon } catch { {msg: $it} } | table --expand | print} | ignore
} }
export def `diff-all` [...files] {
if ($files | length) < 2 {
error make { msg: "you have to provide at least two files"}
}
let diffs = $files | window 2
mut index = 0
loop {
difft --context 100 ...($diffs | get $index)
match (input -n 1) {
"n" => {
$index = $index + 1
},
"p" => {
$index = $index - 1
},
"q" => {
break
}
}
if $index > ($diffs | length) - 1 {
$index -= 1;
} else if $index < 0 {
$index = 0
}
}
}
def --wrapped with-flag [...flag] { def --wrapped with-flag [...flag] {
if ($in | is-empty) { [] } else { [...$flag $in] } if ($in | is-empty) { [] } else { [...$flag $in] }
} }

@ -70,6 +70,8 @@ keybinds {
unbind "Alt u" unbind "Alt u"
unbind "Alt I" unbind "Alt I"
unbind "Alt a" unbind "Alt a"
unbind "Alt -"
unbind "Alt +"
bind "Ctrl f" { bind "Ctrl f" {
ToggleFocusFullscreen ToggleFocusFullscreen

@ -55,6 +55,7 @@
[user] [user]
email = julius.riegel@unitb.de email = julius.riegel@unitb.de
name = Julius Riegel name = Julius Riegel
signingkey = A8882DF407A6402EEF4F4D18F26D704A1D3394EB
[credential] [credential]
helper = store helper = store
[filter "lfs"] [filter "lfs"]
@ -62,6 +63,10 @@
required = true required = true
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
[commit]
gpgSign = true
[tag]
forceSignAnnotated = true
[alias] [alias]
c = commit -s c = commit -s
commit = commit -s commit = commit -s

@ -114,6 +114,7 @@ config.modules = {
}, },
vue = mod { vue = mod {
'nodePackages.vls', 'nodePackages.vls',
'nodePackages.vue-language-server'
}, },
deno = mod { deno = mod {
'deno' 'deno'

Loading…
Cancel
Save