Move Zellij config to kdl

.config/fish/config.fish

@@ -31,14 +31,14 @@ if status is-interactive
 
     ## Podman
     set -l sagemath_image docker.io/sagemath/sagemath:latest
-    abbr -ag sage "podman pull $sagemath_image; podman run -it --rm $sagemath_image"
-    abbr -ag sage-jupyter "podman pull $sagemath_image; podman run -it --rm -p8888:8888 $sagemath_image sage-jupyter"
+    abbr -ag sage "podman run --pull newer -it --rm $sagemath_image"
+    abbr -ag sage-jupyter "podman run --pull newer -it --rm -p8888:8888 $sagemath_image sage-jupyter"
 
     set -l fedora_image registry.fedoraproject.org/fedora:(rpm -E %fedora)
-    abbr -ag fedora "podman pull $fedora_image; podman run -it --rm $fedora_image"
+    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 pull $asciidoctor_image; podman run -it --rm -v (pwd):/documents/:Z $asciidoctor_image"
+    abbr -ag adoc "podman run --pull newer -it --rm -v (pwd):/documents/:Z $asciidoctor_image"
 
     abbr -ag pps "podman ps --format '{{.Names}}'"
 

.config/nvim/lua/options.lua

@@ -41,6 +41,8 @@ o.linebreak = true
 
 o.laststatus = 3
 
+o.cmdheight = 0
+
 o.pumblend = 10
 
 --
@@ -53,6 +55,7 @@ o.shortmess = o.shortmess .. "S"
 vim.filetype.add({
 	pattern = {
 		[".+.jinja.html"] = "htmldjango",
-		[".+.html.tera"] = "htmldjango",
+		[".+.tera"] = "htmldjango",
+		[".+.tera.html"] = "htmldjango",
 	},
 })

.config/zellij/config.kdl

@@ -0,0 +1,72 @@
+pane_frames false
+default_layout "compact"
+
+scroll_buffer_size 100000
+
+copy_on_select true
+
+default_shell "/usr/bin/fish"
+scrollback_editor "/home/mo/bin/nvim/bin/nvim"
+
+keybinds clear-defaults=true {
+    normal {
+        bind "Alt L" { SwitchToMode "locked"; }
+        bind "Alt p" { SwitchToMode "pane"; }
+        bind "Alt r" { SwitchToMode "resize"; }
+        bind "Alt b" { SwitchToMode "tab"; }
+        bind "Alt s" { SwitchToMode "scroll"; }
+        bind "Alt m" { SwitchToMode "move"; }
+        bind "Alt n" { NewPane; }
+        bind "Alt k" { FocusNextPane; }
+        bind "Alt j" { FocusPreviousPane; }
+        bind "Alt +" { Resize "Increase"; }
+        bind "Alt -" { Resize "Decrease"; }
+        bind "Alt t" { NewTab; }
+        bind "Alt o" { GoToNextTab; }
+        bind "Alt i" { GoToPreviousTab; }
+        bind "Alt D" { Detach; }
+    }
+    locked {
+        bind "Alt L" { SwitchToMode "normal"; }
+    }
+    pane {
+        bind "q" "Esc" { SwitchToMode "normal"; }
+        bind "h" { MoveFocus "Left"; }
+        bind "l" { MoveFocus "Right"; }
+        bind "j" { MoveFocus "Down"; }
+        bind "k" { MoveFocus "Up"; }
+        bind "d" { NewPane "Down"; SwitchToMode "normal"; }
+        bind "r" { NewPane "Right"; SwitchToMode "normal"; }
+        bind "x" { CloseFocus; SwitchToMode "normal"; }
+        bind "f" { ToggleFocusFullscreen; SwitchToMode "normal"; }
+        bind "w" { ToggleFloatingPanes; SwitchToMode "normal"; }
+        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "normal"; }
+    }
+    tab {
+        bind "q" "Esc" { SwitchToMode "normal"; }
+        bind "x" { CloseTab; SwitchToMode "normal"; }
+        bind "s" { ToggleActiveSyncTab; SwitchToMode "normal"; }
+    }
+    resize {
+        bind "q" "Esc" { SwitchToMode "normal"; }
+        bind "h" { Resize "Left"; }
+        bind "j" { Resize "Down"; }
+        bind "k" { Resize "Up"; }
+        bind "l" { Resize "Right"; }
+    }
+    move {
+        bind "q" "Esc" { SwitchToMode "normal"; }
+        bind "h" { MovePane "Left"; }
+        bind "j" { MovePane "Down"; }
+        bind "k" { MovePane "Up"; }
+        bind "l" { MovePane "Right"; }
+    }
+    scroll {
+        bind "q" "Esc" { SwitchToMode "normal"; }
+        bind "e" { EditScrollback; SwitchToMode "normal"; }
+        bind "j" { ScrollDown; }
+        bind "k" { ScrollUp; }
+        bind "l" { PageScrollDown; }
+        bind "h" { PageScrollUp; }
+    }
+}

.config/zellij/config.yaml

@@ -1,112 +0,0 @@
----
-default_shell: /usr/bin/fish
-
-default_layout: compact
-
-pane_frames: false
-
-scroll_buffer_size: 100000
-
-scrollback_editor: /home/mo/bin/nvim/bin/nvim
-
-keybinds:
-    unbind: true
-    normal:
-        - action: [SwitchToMode: Locked]
-          key: [Alt: "L"]
-        - action: [SwitchToMode: Pane]
-          key: [Alt: "p"]
-        - action: [SwitchToMode: Resize]
-          key: [Alt: "r"]
-        - action: [SwitchToMode: Tab]
-          key: [Alt: "b"]
-        - action: [SwitchToMode: Scroll]
-          key: [Alt: "s"]
-        - action: [SwitchToMode: Move]
-          key: [Alt: "m"]
-        - action: [NewPane: ,]
-          key: [Alt: "n"]
-        - action: [FocusNextPane]
-          key: [Alt: "k"]
-        - action: [FocusPreviousPane]
-          key: [Alt: "j"]
-        - action: [Resize: Increase]
-          key: [Alt: "+"]
-        - action: [Resize: Decrease]
-          key: [Alt: "-"]
-        - action: [NewTab: ,]
-          key: [Alt: "t"]
-        - action: [GoToNextTab]
-          key: [Alt: "o"]
-        - action: [GoToPreviousTab]
-          key: [Alt: "i"]
-        - action: [Detach]
-          key: [Alt: "D"]
-    locked:
-        - action: [SwitchToMode: Normal]
-          key: [Alt: "L"]
-    resize:
-        - action: [SwitchToMode: Normal]
-          key: [Char: "q", Esc]
-        - action: [Resize: Left]
-          key: [Char: "h"]
-        - action: [Resize: Down]
-          key: [Char: "j"]
-        - action: [Resize: Up]
-          key: [Char: "k"]
-        - action: [Resize: Right]
-          key: [Char: "l"]
-    pane:
-        - action: [SwitchToMode: Normal]
-          key: [Char: "q", Esc]
-        - action: [MoveFocus: Left]
-          key: [Char: "h"]
-        - action: [MoveFocus: Right]
-          key: [Char: "l"]
-        - action: [MoveFocus: Down]
-          key: [Char: "j"]
-        - action: [MoveFocus: Up]
-          key: [Char: "k"]
-        - action: [NewPane: Down, SwitchToMode: Normal]
-          key: [Char: "d"]
-        - action: [NewPane: Right, SwitchToMode: Normal]
-          key: [Char: "r"]
-        - action: [CloseFocus, SwitchToMode: Normal]
-          key: [Char: "x"]
-        - action: [ToggleFocusFullscreen, SwitchToMode: Normal]
-          key: [Char: "f"]
-        - action: [ToggleFloatingPanes, SwitchToMode: Normal]
-          key: [Char: "w"]
-        - action: [TogglePaneEmbedOrFloating, SwitchToMode: Normal]
-          key: [Char: "e"]
-    move:
-        - action: [SwitchToMode: Normal]
-          key: [Char: "q", Esc]
-        - action: [MovePane: Left]
-          key: [Char: "h"]
-        - action: [MovePane: Down]
-          key: [Char: "j"]
-        - action: [MovePane: Up]
-          key: [Char: "k"]
-        - action: [MovePane: Right]
-          key: [Char: "l"]
-    tab:
-        - action: [SwitchToMode: Normal]
-          key: [Char: "q", Esc]
-        - action: [CloseTab, SwitchToMode: Normal]
-          key: [Char: "x"]
-        - action: [ToggleActiveSyncTab, SwitchToMode: Normal]
-          key: [Char: "s"]
-    scroll:
-        - action: [SwitchToMode: Normal]
-          key: [Char: "q", Esc]
-        - action: [EditScrollback, SwitchToMode: Normal]
-          key: [Char: "e"]
-        - action: [ScrollDown]
-          key: [Char: "j"]
-        - action: [ScrollUp]
-          key: [Char: "k"]
-        - action: [PageScrollDown]
-          key: [Char: "l"]
-        - action: [PageScrollUp]
-          key: [Char: "h"]

.config/zellij/layouts/advlabdb.kdl

@@ -0,0 +1,35 @@
+layout {
+    default_tab_template {
+        children
+        pane size=1 borderless=true {
+            plugin location="zellij:compact-bar"
+        }
+    }
+
+    cwd "/home/mo/code/advlabdb"
+
+    tab name="lazygit" {
+        pane {
+            command "fish"
+            args "-C" "lazygit"
+        }
+    }
+    tab name="nvim" focus=true {
+        pane {
+            command "fish"
+            args "-C" "nvim"
+        }
+    }
+    tab name="run" {
+        pane {
+            command "fish"
+            args "-C" "poetry run ./run.py"
+        }
+    }
+    tab name="tasks" {
+        pane {
+            command "fish"
+            args "-C" "nohup xdg-open http://localhost:5000 &> /dev/null; vp advlabdb"
+        }
+    }
+}

.config/zellij/layouts/advlabdb.yml

@@ -1,63 +0,0 @@
----
-template:
-  direction: Horizontal
-  parts:
-    - direction: Vertical
-      borderless: true
-      split_size:
-        Fixed: 1
-      run:
-        plugin:
-          location: "zellij:tab-bar"
-    - direction: Vertical
-      body: true
-    - direction: Vertical
-      borderless: true
-      split_size:
-        Fixed: 2
-      run:
-        plugin:
-          location: "zellij:status-bar"
-
-tabs:
-  - direction: Vertical
-    name: "lazygit"
-    parts:
-      - direction: Vertical
-        run:
-          command: { cmd: fish, args: ["-C", "cd ~/code/advlabdb && lazygit"] }
-  - direction: Vertical
-    name: "nvim"
-    focus: true
-    parts:
-      - direction: Vertical
-        run:
-          command: { cmd: fish, args: ["-C", "cd ~/code/advlabdb && nvim"] }
-  - direction: Vertical
-    name: "run"
-    parts:
-      - direction: Vertical
-        run:
-          command:
-            {
-              cmd: fish,
-              args:
-                [
-                  "-C",
-                  "cd ~/code/advlabdb && poetry run ./run.py; poetry shell",
-                ],
-            }
-  - direction: Vertical
-    name: "tasks"
-    parts:
-      - direction: Vertical
-        run:
-          command:
-            {
-              cmd: fish,
-              args:
-                [
-                  "-C",
-                  "nohup xdg-open http://localhost:5000 &> /dev/null; vp advlabdb",
-                ],
-            }

.config/zellij/layouts/how_to_linux.kdl

@@ -0,0 +1,36 @@
+layout {
+    default_tab_template {
+        children
+        pane size=1 borderless=true {
+            plugin location="zellij:compact-bar"
+        }
+    }
+
+    cwd "/home/mo/code/hosted/how_to_linux"
+
+    tab name="lazygit" {
+        pane {
+            command "fish"
+            args "-C" "lazygit"
+        }
+    }
+    tab name="nvim" focus=true {
+        pane {
+            cwd "src"
+            command "fish"
+            args "-C" "nvim"
+        }
+    }
+    tab name="mdbook" {
+        pane {
+            command "fish"
+            args "-C" "mdbook serve"
+        }
+    }
+    tab name="test" {
+        pane {
+            command "fish"
+            args "-C" "sleep 1 && nohup xdg-open http://localhost:3000 &> /dev/null"
+        }
+    }
+}

.config/zellij/layouts/how_to_linux.yml

@@ -1,63 +0,0 @@
----
-template:
-  direction: Horizontal
-  parts:
-    - direction: Vertical
-      borderless: true
-      split_size:
-        Fixed: 1
-      run:
-        plugin:
-          location: "zellij:tab-bar"
-    - direction: Vertical
-      body: true
-    - direction: Vertical
-      borderless: true
-      split_size:
-        Fixed: 2
-      run:
-        plugin:
-          location: "zellij:status-bar"
-
-tabs:
-  - direction: Vertical
-    name: "lazygit"
-    parts:
-      - direction: Vertical
-        run:
-          command:
-            {
-              cmd: fish,
-              args: ["-C", "cd ~/code/hosted/how_to_linux && lazygit"],
-            }
-  - direction: Vertical
-    name: "nvim"
-    focus: true
-    parts:
-      - direction: Vertical
-        run:
-          command:
-            {
-              cmd: fish,
-              args: ["-C", "cd ~/code/hosted/how_to_linux/src && nvim"],
-            }
-  - direction: Vertical
-    name: "mdbook"
-    parts:
-      - direction: Vertical
-        run:
-          command:
-            {
-              cmd: fish,
-              args: ["-C", "cd ~/code/hosted/how_to_linux && mdbook serve"],
-            }
-  - direction: Vertical
-    name: "test"
-    parts:
-      - direction: Vertical
-        run:
-          command:
-            {
-              cmd: fish,
-              args: ["-C", "nohup xdg-open http://localhost:3000 &> /dev/null"],
-            }

.config/zellij/layouts/pgp.kdl

@@ -0,0 +1,20 @@
+layout {
+    default_tab_template {
+        children
+        pane size=1 borderless=true {
+            plugin location="zellij:compact-bar"
+        }
+    }
+
+    cwd "/home/mo/Downloads/pgp"
+
+    tab name="jupyterlab" focus=true {
+        pane {
+            command "fish"
+            args "-C" "./container.fish"
+        }
+    }
+    tab name="shell" {
+        pane
+    }
+}

.config/zellij/layouts/pgp.yml

@@ -1,39 +0,0 @@
----
-template:
-  direction: Horizontal
-  parts:
-    - direction: Vertical
-      borderless: true
-      split_size:
-        Fixed: 1
-      run:
-        plugin:
-          location: "zellij:tab-bar"
-    - direction: Vertical
-      body: true
-    - direction: Vertical
-      borderless: true
-      split_size:
-        Fixed: 2
-      run:
-        plugin:
-          location: "zellij:status-bar"
-
-tabs:
-  - direction: Vertical
-    name: "jupyterlab"
-    focus: true
-    parts:
-      - direction: Vertical
-        run:
-          command:
-            {
-              cmd: fish,
-              args: ["-C", "cd ~/Downloads/pgp && ./container.fish"],
-            }
-  - direction: Vertical
-    name: "shell"
-    parts:
-      - direction: Vertical
-        run:
-          command: { cmd: fish, args: ["-C", "cd ~/Downloads/pgp"] }

.config/zellij/layouts/reco.kdl

@@ -0,0 +1,29 @@
+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 "fish"
+            args "-C" "lazygit"
+        }
+    }
+    tab name="nvim" focus=true {
+        pane {
+            command "fish"
+            args "-C" "nvim"
+        }
+    }
+    tab name="run" {
+        pane {
+            command "fish"
+            args "-C" "julia scripts/update.jl"
+        }
+    }
+}

.config/zellij/layouts/reco.yml

@@ -1,45 +0,0 @@
----
-template:
-  direction: Horizontal
-  parts:
-    - direction: Vertical
-      borderless: true
-      split_size:
-        Fixed: 1
-      run:
-        plugin:
-          location: "zellij:tab-bar"
-    - direction: Vertical
-      body: true
-    - direction: Vertical
-      borderless: true
-      split_size:
-        Fixed: 2
-      run:
-        plugin:
-          location: "zellij:status-bar"
-
-tabs:
-  - direction: Vertical
-    name: "lazygit"
-    parts:
-      - direction: Vertical
-        run:
-          command: { cmd: fish, args: ["-C", "cd ~/code/ReCo.jl && lazygit"] }
-  - direction: Vertical
-    name: "nvim"
-    focus: true
-    parts:
-      - direction: Vertical
-        run:
-          command: { cmd: fish, args: ["-C", "cd ~/code/ReCo.jl && nvim"] }
-  - direction: Vertical
-    name: "run"
-    parts:
-      - direction: Vertical
-        run:
-          command:
-            {
-              cmd: fish,
-              args: ["-C", "cd ~/code/ReCo.jl && julia scripts/update.jl"],
-            }

.config/zellij/layouts/update.kdl

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

.config/zellij/layouts/update.yml

@@ -1,30 +0,0 @@
----
-session:
-  name: "update"
-  attach: true
-
-tabs:
-  - direction: Horizontal
-    parts:
-      - direction: Horizontal
-        run:
-          command:
-            { cmd: fish, args: ["-c", "~/.scripts/update.py rpm-ostree"] }
-      - direction: Horizontal
-        focus: true
-        run:
-          command: { cmd: fish, args: ["-c", "~/.scripts/update.py flatpak"] }
-      - direction: Horizontal
-        run:
-          command: { cmd: fish, args: ["-c", "~/.scripts/update.py cargo"] }
-      - direction: Horizontal
-        run:
-          command:
-            {
-              cmd: fish,
-              args:
-                [
-                  "-c",
-                  "cd ~/servers/ansible && ansible-playbook playbooks/update.yml; read -P Enter",
-                ],
-            }