Merge branch 'main' of ssh://git.trivernis.net:22321/Trivernis/dotfiles-silo

content/config/helix/config.toml

@@ -1,59 +1,91 @@
 theme = "dracula-purple"
 
 [editor]
-rulers = [120]
-shell = ["nu", "--stdin", "--no-newline", "-c"]
-true-color = true
-cursorline = true
-color-modes = true
-bufferline = "always"
-line-number = "relative"
-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"
+  rulers = [120]
+  shell = ["nu", "--stdin", "--no-newline", "-c"]
+  true-color = true
+  cursorline = true
+  color-modes = true
+  bufferline = "always"
+  line-number = "relative"
+  auto-save = true
 
-[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"]
+  [editor.cursor-shape]
+    insert = "bar"
+    normal = "block"
+    select = "underline"
 
-[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"]
+  [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"
 
-[keys.normal."A-/"]
-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"]
-r = ["goto_line_start", ":insert-output use ide.nu; ide doc-comment rust-style", ":format", "normal_mode", "insert_at_line_end"]
+  [editor.file-picker]
+    hidden = false
 
+  [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",
+    ]

content/config/helix/languages.toml

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

content/config/nushell/scripts/utils.nu

@@ -11,6 +11,36 @@ export def `follow nuon-lines` [] {
     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] {
     if ($in | is-empty) { [] } else { [...$flag $in] }
 }

content/config/zellij/development.kdl.tmpl

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

content/home/.gitconfig.tmpl

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

silo.config.lua

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