switched back to tmux over zellij

heywoodlh · Nov 18, 2024 · 4abac47 · 4abac47
1 parent 93fc16c
commit 4abac47
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 84 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/base.nix b/home/base.nix
@@ -3,7 +3,6 @@
 let
   system = pkgs.system;
   homeDir = config.home.homeDirectory;
-  myZellij = myFlakes.packages.${system}.zellij;
   myFish = myFlakes.packages.${system}.fish;
   myVM = myFlakes.packages.${system}.nixos-vm;
   myVim = myFlakes.packages.${system}.vim;
@@ -222,7 +221,7 @@ in {
     zip
     myVim
     myGit
-    myZellij # For non-nix use-cases
+    myFlakes.packages.${system}.tmux
     myFish # For non-nix use-cases
     #myVM
     todomanWrapper

diff --git a/home/darwin.nix b/home/darwin.nix
@@ -3,7 +3,7 @@
 let
   system = pkgs.system;
   homeDir = config.home.homeDirectory;
-  myZellij = myFlakes.packages.${system}.zellij;
+  myTmux = myFlakes.packages.${system}.tmux;
 in {
   imports = [
     ./base.nix
@@ -56,10 +56,10 @@ in {
   };
 
   home.file.".config/iterm2/iterm2-profiles.json" = {
-    text = import ./iterm/iterm2-profiles.nix { inherit myZellij; };
+    text = import ./iterm/iterm2-profiles.nix { inherit myTmux; };
   };
   home.file.".config/iterm2/com.googlecode.iterm2.plist" = {
-    text = import ./iterm/com.googlecode.iterm2.plist.nix { inherit myZellij; };
+    text = import ./iterm/com.googlecode.iterm2.plist.nix { inherit myTmux; };
   };
   home.file.".config/iterm2/README.md" = {
     source = ./iterm/README.md;

diff --git a/home/iterm/README.md b/home/iterm/README.md
@@ -22,7 +22,7 @@ chmod +w *.plist *.json
    `~/.config/iterm2/iterm2-profiles.json` to `com.googlecode.iterm2.plist.nix`
    and `iterm2-profiles.json.nix` in `home/iterm2`
 
-6. Replace `zellij` executables in nix files with `${myZellij}/bin/zellij`
+6. Replace `tmux` executables in nix files with `${myTmux}/bin/tmux`
 
 7. Remove writable config files:
 

diff --git a/home/iterm/com.googlecode.iterm2.plist.nix b/home/iterm/com.googlecode.iterm2.plist.nix
@@ -1,4 +1,4 @@
-{ myZellij, }:
+{ myTmux, }:
 
 ''
 <?xml version="1.0" encoding="UTF-8"?>
@@ -427,7 +427,7 @@ Paste</string>
 			<key>Columns</key>
 			<integer>80</integer>
 			<key>Command</key>
-			<string>${myZellij}/bin/zellij</string>
+			<string>${myTmux}/bin/tmux</string>
 			<key>Cursor Color</key>
 			<dict>
 				<key>Alpha Component</key>
@@ -1218,7 +1218,7 @@ Paste</string>
 			<key>Columns</key>
 			<integer>80</integer>
 			<key>Command</key>
-			<string>${myZellij}/bin/zellij</string>
+			<string>${myTmux}/bin/tmux</string>
 			<key>Cursor Color</key>
 			<dict>
 				<key>Alpha Component</key>