Back to fish

.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/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"
+            command "fish"
-            args "-e" "lazygit"
+            args "-c" "lazygit"
+            close_on_exit true
         }
     }
     tab name="hx" focus=true {
         pane {
-            command "nu"
+            command "fish"
-            args "-e" "hx"
+            args "-c" "hx"
+            close_on_exit true
         }
     }
     tab name="run" {
         pane {
-            command "nu"
+            command "fish"
-            args "-e" "poetry run ./run.py"
+            args "-c" "poetry run ./run.py"
         }
     }
     tab name="tasks" {
         pane {
-            command "nu"
+            command "fish"
-            args "-e" "vp advlabdb"
+            args "-c" "vp advlabdb"
+            close_on_exit true
         }
     }
 }

.config/zellij/layouts/how_to_linux.kdl

@@ -10,21 +10,24 @@ layout {
 
     tab name="lazygit" {
         pane {
-            command "nu"
+            command "fish"
-            args "-e" "lazygit"
+            args "-c" "lazygit"
+            close_on_exit true
         }
     }
     tab name="hx" focus=true {
         pane {
             cwd "src"
-            command "nu"
+            command "fish"
-            args "-e" "hx"
+            args "-c" "hx"
+            close_on_exit true
         }
     }
     tab name="mdbook" {
         pane {
-            command "nu"
+            command "fish"
-            args "-e" "mdbook serve"
+            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"
+            command "fish"
-            args "-e" "./container.nu"
+            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="hx" focus=true {
-        pane {
-            command "nu"
-            args "-e" "hx"
-        }
-    }
-    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
     }
 }