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

content/config/helix/config.toml

@@ -18,7 +18,21 @@ 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"]
+    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]
@@ -43,6 +57,11 @@ 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"]
@@ -53,7 +72,20 @@ 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", ":insert-output use ide.nu; ide doc-comment java-style", ":format", "normal_mode", "move_visual_line_up", "insert_at_line_end"]
+    j = [
-r = ["goto_line_start", ":insert-output use ide.nu; ide doc-comment rust-style", ":format", "normal_mode", "insert_at_line_end"]
+      "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

@@ -36,7 +36,8 @@ typescript = {}
 
 [language-server.vls]
   command = "vls"
-args = []
+  args = ["--stdio"]
+  config = { typescript = { tsdk = "node_modules/typescript/lib/" } }
 
 
 [language-server.pest-lsp]
@@ -80,7 +81,7 @@ language-servers = [
       "diagnostics",
       "format",
     ] },
-"hx-lsp"
+    "hx-lsp",
   ]
   auto-format = true
   formatter = { command = "biome", args = [
@@ -93,7 +94,15 @@ indent = { tab-width = 4, unit = "    " }
 [[language]]
   name = "javascript"
 
-language-servers = ["typescript-language-server", "biome", { name = "efm", only-features = ["diagnostics", "format"]}, "hx-lsp"]
+  language-servers = [
+    "typescript-language-server",
+    "biome",
+    { name = "efm", only-features = [
+      "diagnostics",
+      "format",
+    ] },
+    "hx-lsp",
+  ]
   auto-format = true
   formatter = { command = "biome", args = [
     "format",
@@ -104,7 +113,10 @@ indent = { tab-width = 4, unit = "    " }
 
 [[language]]
   name = "json"
-formatter = { command = "biome" , args = ["format", "--stdin-file-path=file.json"]  }
+  formatter = { command = "biome", args = [
+    "format",
+    "--stdin-file-path=file.json",
+  ] }
 
 [[language]]
   name = "handlebars"
@@ -176,6 +188,19 @@ auto-format = true
   formatter = { command = "kdlfmt" }
 
 
+[[language]]
+  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"]
@@ -230,11 +255,11 @@ grammar = "jora"
 [[language]]
   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"
@@ -246,6 +271,15 @@ file-types = [
     { glob = "*.env" },
   ]
 
+[[language]]
+  name = "scheme"
+  formatter = { command = "schemat" }
+
+
+[[language]]
+  name = "svelte"
+  auto-format = true
+
 
 [[language]]
   name = "pest"

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'