Add gitui

.config/fish/config.fish

@@ -3,17 +3,13 @@ if status is-interactive
     set -g fish_greeting
 
     # Interactive environment variables
-    set -gx EDITOR ~/bin/nvim/bin/nvim
+    set -gx EDITOR ~/.cargo/bin/hx
 
     # Setup
     ## Zoxide
     zoxide init fish | source
     ## Starship
     starship init fish | source
-    ## Atuin
-    set -gx ATUIN_NOBIND true
-    atuin init fish | source
-    bind \cr _atuin_search
 
     # Abbreviations
     ## Replacements
@@ -37,9 +33,6 @@ if status is-interactive
     set -l fedora_image registry.fedoraproject.org/fedora:(rpm -E %fedora)
     abbr -ag fedora "podman run --pull newer -it --rm $fedora_image"
 
-    set -l asciidoctor_image docker.io/asciidoctor/docker-asciidoctor:latest
-    abbr -ag adoc "podman run --pull newer -it --rm -v (pwd):/documents/:Z $asciidoctor_image"
-
     abbr -ag pps "podman ps --format '{{.Names}}'"
 
     # Functions
@@ -68,6 +61,10 @@ if status is-interactive
         lazygit $argv
     end
 
+    function gu -w gitui
+        gitui $argv
+    end
+
     function zola
         flatpak run org.getzola.zola $argv
     end
@@ -93,10 +90,6 @@ if status is-interactive
         ta $argv priority:H
     end
 
-    function v -w task
-        vit $argv
-    end
-
     function vp -w task
         vit project:$argv[1] $argv[2..]
     end

.config/gitui/key_bindings.ron

@@ -0,0 +1,35 @@
+(
+    focus_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
+    focus_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)),
+    focus_above: Some(( code: Char('k'), modifiers: ( bits: 0,),)),
+    focus_below: Some(( code: Char('j'), modifiers: ( bits: 0,),)),
+
+    open_help: Some(( code: F(1), modifiers: ( bits: 0,),)),
+
+    move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)),
+    move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
+    move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)),
+    move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)),
+    popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)),
+    popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)),
+    page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)),
+    page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)),
+    home: Some(( code: Char('g'), modifiers: ( bits: 0,),)),
+    end: Some(( code: Char('G'), modifiers: ( bits: 1,),)),
+    shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)),
+    shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)),
+
+    edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)),
+
+    status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)),
+
+    diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)),
+    diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)),
+
+    stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)),
+    stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)),
+
+    stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
+
+    abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)),
+)

.config/gitui/theme.ron

@@ -0,0 +1,23 @@
+(
+    selected_tab: Reset,
+    command_fg: White,
+    selection_bg: Blue,
+    selection_fg: White,
+    cmdbar_bg: Blue,
+    cmdbar_extra_lines_bg: Blue,
+    disabled_fg: DarkGray,
+    diff_line_add: Green,
+    diff_line_delete: Red,
+    diff_file_added: LightGreen,
+    diff_file_removed: LightRed,
+    diff_file_moved: LightMagenta,
+    diff_file_modified: Yellow,
+    commit_hash: Magenta,
+    commit_time: LightCyan,
+    commit_author: Green,
+    danger_fg: Red,
+    push_gauge_bg: Blue,
+    push_gauge_fg: Reset,
+    tag_fg: LightMagenta,
+    branch_fg: LightYellow,
+)

.config/nushell/config.nu

@@ -1,5 +1,4 @@
 let-env config = {
-  cd_with_abbreviations: false
   show_banner: false
 }
 

.config/zellij/config.kdl

@@ -4,7 +4,7 @@ scroll_buffer_size 100000
 
 copy_on_select true
 
-default_shell "/home/mo/.cargo/bin/nu"
+default_shell "/usr/bin/fish"
 scrollback_editor "/home/mo/bin/nvim/bin/nvim"
 
 keybinds clear-defaults=true {

.config/zellij/layouts/advlabdb.kdl

@@ -10,26 +10,29 @@ layout {
 
     tab name="lazygit" {
         pane {
-            command "nu"
-            args "-e" "lazygit"
+            command "fish"
+            args "-c" "lazygit"
+            close_on_exit true
         }
     }
-    tab name="nvim" focus=true {
+    tab name="hx" focus=true {
         pane {
-            command "nu"
-            args "-e" "nvim"
+            command "fish"
+            args "-c" "hx"
+            close_on_exit true
         }
     }
     tab name="run" {
         pane {
-            command "nu"
-            args "-e" "poetry run ./run.py"
+            command "fish"
+            args "-c" "poetry run ./run.py"
         }
     }
     tab name="tasks" {
         pane {
-            command "nu"
-            args "-e" "nohup xdg-open http://localhost:5000 &> /dev/null; vp advlabdb"
+            command "fish"
+            args "-c" "vp advlabdb"
+            close_on_exit true
         }
     }
 }

.config/zellij/layouts/how_to_linux.kdl

@@ -10,27 +10,24 @@ layout {
 
     tab name="lazygit" {
         pane {
-            command "nu"
-            args "-e" "lazygit"
+            command "fish"
+            args "-c" "lazygit"
+            close_on_exit true
         }
     }
-    tab name="nvim" focus=true {
+    tab name="hx" focus=true {
         pane {
             cwd "src"
-            command "nu"
-            args "-e" "nvim"
+            command "fish"
+            args "-c" "hx"
+            close_on_exit true
         }
     }
     tab name="mdbook" {
         pane {
-            command "nu"
-            args "-e" "mdbook serve"
-        }
-    }
-    tab name="test" {
-        pane {
-            command "nu"
-            args "-e" "sleep 1 && nohup xdg-open http://localhost:3000 &> /dev/null"
+            command "fish"
+            args "-c" "mdbook serve"
+            close_on_exit true
         }
     }
 }

.config/zellij/layouts/pgp.kdl

@@ -10,11 +10,15 @@ layout {
 
     tab name="jupyterlab" focus=true {
         pane {
-            command "nu"
-            args "-e" "./container.nu"
+            command "fish"
+            args "-c" "./container.fish"
+            close_on_exit true
         }
     }
     tab name="shell" {
-        pane
+        pane {
+            command "fish"
+            close_on_exit true
+        }
     }
 }

.config/zellij/layouts/reco.kdl

@@ -1,29 +0,0 @@
-layout {
-    default_tab_template {
-        children
-        pane size=1 borderless=true {
-            plugin location="zellij:compact-bar"
-        }
-    }
-
-    cwd "/home/mo/code/ReCo.jl"
-
-    tab name="lazygit" {
-        pane {
-            command "nu"
-            args "-e" "lazygit"
-        }
-    }
-    tab name="nvim" focus=true {
-        pane {
-            command "nu"
-            args "-e" "nvim"
-        }
-    }
-    tab name="run" {
-        pane {
-            command "nu"
-            args "-e" "julia scripts/update.jl"
-        }
-    }
-}

.config/zellij/layouts/update.kdl

@@ -1,19 +1,23 @@
 layout {
     pane {
-        command "nu"
+        command "fish"
         args "-c" "~/.scripts/update.py rpm-ostree"
+        close_on_exit true
     }
     pane focus=true {
-        command "nu"
+        command "fish"
         args "-c" "~/.scripts/update.py flatpak"
+        close_on_exit true
     }
     pane {
-        command "nu"
+        command "fish"
         args "-c" "~/.scripts/update.py cargo"
+        close_on_exit true
     }
     pane {
         cwd "/home/mo/servers/ansible"
-        command "nu"
+        command "fish"
         args "-c" "ansible-playbook playbooks/update.yml; read -P Enter"
+        close_on_exit true
     }
 }

.julia/environments/v1.8/Project.toml

@@ -1,5 +1,6 @@
 [deps]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
 LanguageServer = "2b0e0bc5-e4fd-59b4-8912-456d1b03d8d7"
 OhMyREPL = "5fb14364-9ced-5910-84b2-373655c76a03"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"