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

content/config/helix/themes/dracula-purple.toml

@@ -20,6 +20,7 @@
 "mustache_statement" = { fg = "green" }
 "string_literal" = { fg = "yellow" }
 "number_literal" = { fg = "purple" }
+"label" = { fg = "red"}
 
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
@@ -44,6 +45,7 @@
 "ui.virtual.ruler" = { bg = "ruler" }
 "ui.virtual.indent-guide" = { fg = "ruler" }
 "ui.virtual" = { fg = "hint" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic"] }
 
 "ui.statusline" = { fg = "foreground", bg = "background_dark" }
 "ui.statusline.inactive" = { fg = "comment", bg = "background_dark" }

content/config/nushell/config.nu.tmpl

@@ -471,3 +471,4 @@ use ci.nu
 
 use ide.nu
 source remoting.nu
+source utils.nu

content/config/nushell/scripts/git.nu

@@ -204,7 +204,7 @@ export def gp [
     --override
     --submodule (-s)         # git submodule
     --init (-i)              # git init
-    --merge (-m)             # git pull (no)--rebase
+    --rebase (-r)             # git pull (no)--rebase
     --autostash (-a)         # git pull --autostash
     --back-to-prev (-b)      # back to branch
 ] {
@@ -216,7 +216,7 @@ export def gp [
         git commit -v -a --no-edit --amend
         git push --force
     } else {
-        let m = if $merge { [] } else { [--rebase] }
+        let m = if $rebase { [--rebase] } else { [] }
         let a = if $autostash {[--autostash]} else {[]}
         let branch = if ($branch | is-empty) { (_git_status).branch } else { $branch }
         let branch_repr = $'(ansi yellow)($branch)(ansi light_gray)'

content/config/nushell/scripts/utils.nu

@@ -0,0 +1,8 @@
+# convert json log entries into an array of nu log entries
+export def `from json-lines` [] {
+  lines | each {|it| try { $it | from json } catch { {msg: $it} }}
+}
+
+export def `follow json-lines` [] {
+    lines | each {|it| try { $it | from json } catch { {msg: $it} } | table --expand | print} | ignore
+}