From 0c4353c19be1b277601615ab6f640199c6197693 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 27 May 2024 13:04:48 -0700
Subject: [PATCH] Setup zellij directly and use external theme

---
 dotfiles/zellij.kdl           |  2 ++
 dotfiles/zellij/config.kdl    | 35 -----------------------------------
 install/terminal-apps.sh      |  1 -
 install/zellij.sh             |  6 ++++++
 themes/zellij/tokyo-night.kdl | 15 +++++++++++++++
 5 files changed, 23 insertions(+), 36 deletions(-)
 create mode 100644 dotfiles/zellij.kdl
 delete mode 100644 dotfiles/zellij/config.kdl
 create mode 100644 install/zellij.sh
 create mode 100644 themes/zellij/tokyo-night.kdl

diff --git a/dotfiles/zellij.kdl b/dotfiles/zellij.kdl
new file mode 100644
index 0000000..5554b70
--- /dev/null
+++ b/dotfiles/zellij.kdl
@@ -0,0 +1,2 @@
+theme "tokyo-night"
+default_layout "compact"
diff --git a/dotfiles/zellij/config.kdl b/dotfiles/zellij/config.kdl
deleted file mode 100644
index 0675b25..0000000
--- a/dotfiles/zellij/config.kdl
+++ /dev/null
@@ -1,35 +0,0 @@
-themes {
-    tokyo-night {
-        fg 169 177 214
-        bg 26 27 38
-        black 56 62 90
-        red 249 51 87
-        green 158 206 106
-        yellow 224 175 104
-        blue 122 162 247
-        magenta 187 154 247
-        cyan 42 195 222
-        white 192 202 245
-        orange 255 158 100
-    }
-}
-
-theme "tokyo-night"
-themes {
-    tokyo-night {
-        fg 169 177 214
-        bg 26 27 38
-        black 56 62 90
-        red 249 51 87
-        green 158 206 106
-        yellow 224 175 104
-        blue 122 162 247
-        magenta 187 154 247
-        cyan 42 195 222
-        white 192 202 245
-        orange 255 158 100
-    }
-}
-
-theme "tokyo-night"
-default_layout "compact"
diff --git a/install/terminal-apps.sh b/install/terminal-apps.sh
index 885a0e2..380debd 100644
--- a/install/terminal-apps.sh
+++ b/install/terminal-apps.sh
@@ -1,2 +1 @@
 sudo apt install -y fzf ripgrep bat eza zoxide btop apache2-utils
-sudo snap install zellij --classic
diff --git a/install/zellij.sh b/install/zellij.sh
new file mode 100644
index 0000000..dd7f416
--- /dev/null
+++ b/install/zellij.sh
@@ -0,0 +1,6 @@
+if ! command -v zellij &>/dev/null; then
+	sudo snap install zellij --classic
+	mkdir -p ~/.config/zellij/
+	cp ~/.local/share/omakub/dotfiles/zellij.kdl ~/.config/zellij/config.kdl
+	ln -s ~/.local/share/omakub/themes/zellij ~/.config/zellij/themes
+fi
diff --git a/themes/zellij/tokyo-night.kdl b/themes/zellij/tokyo-night.kdl
new file mode 100644
index 0000000..87cdc99
--- /dev/null
+++ b/themes/zellij/tokyo-night.kdl
@@ -0,0 +1,15 @@
+themes {
+    tokyo-night {
+        fg 169 177 214
+        bg 26 27 38
+        black 56 62 90
+        red 249 51 87
+        green 158 206 106
+        yellow 224 175 104
+        blue 122 162 247
+        magenta 187 154 247
+        cyan 42 195 222
+        white 192 202 245
+        orange 255 158 100
+    }
+}