From f38cd3f10bdf6542b7f1f4ead494fd02c773af0a Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene.liverman@ltnglobal.com>
Date: Tue, 19 Aug 2025 08:44:08 -0400
Subject: [PATCH 1/2] Add btop

---
 modules/hosts/common/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/hosts/common/default.nix b/modules/hosts/common/default.nix
index 25ec28f..0d4d336 100644
--- a/modules/hosts/common/default.nix
+++ b/modules/hosts/common/default.nix
@@ -7,6 +7,7 @@
                else "libsqlite3.so";
 in {
   home.packages = with pkgs; [
+    btop
     bundix
     cargo
     cheat

From eac40083267c99813e42474768f3f2815f2461f2 Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene.liverman@ltnglobal.com>
Date: Tue, 19 Aug 2025 08:47:54 -0400
Subject: [PATCH 2/2] Add Zellij everywhere, but don't automatically use

---
 modules/hosts/common/default.nix              |  4 ++
 modules/hosts/darwin/home.nix                 | 44 ++++++++++---------
 .../darwin/mightymac/home-gene.liverman.nix   |  4 --
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/modules/hosts/common/default.nix b/modules/hosts/common/default.nix
index 0d4d336..e0023cc 100644
--- a/modules/hosts/common/default.nix
+++ b/modules/hosts/common/default.nix
@@ -256,6 +256,10 @@ in {
         let g:airline_powerline_fonts = 1
       '';
     };
+    zellij = {
+      enable = true;
+      enableZshIntegration = false;
+    };
     zsh = {
       enable = true;
       enableCompletion = true;
diff --git a/modules/hosts/darwin/home.nix b/modules/hosts/darwin/home.nix
index f7d831d..629ca0e 100644
--- a/modules/hosts/darwin/home.nix
+++ b/modules/hosts/darwin/home.nix
@@ -1,27 +1,29 @@
 { username, ... }: {
   # dawrwin-specific shell config
-  programs.zsh = {
-    initContent = ''
-      function otpon() {
-        osascript -e 'tell application "yubiswitch" to KeyOn'
-      }
-      function otpoff() {
-        osascript -e 'tell application "yubiswitch" to KeyOff'
-      }
+  programs = {
+    zsh = {
+      initContent = ''
+        function otpon() {
+          osascript -e 'tell application "yubiswitch" to KeyOn'
+        }
+        function otpoff() {
+          osascript -e 'tell application "yubiswitch" to KeyOff'
+        }
 
-      # Include Puppet's normal bin folder since it is installed via Homebrew
-      export PATH=$PATH:/opt/puppetlabs/bin
-      export PATH=$PATH:/opt/puppetlabs/pdk/bin
-      export PATH=$PATH:/opt/puppetlabs/puppet/bin
-    '';
-    oh-my-zsh.plugins = [ "macos" ];
-    shellAliases = {
-      currentwifi = "networksetup -getairportnetwork en0 |cut -d ':' -f2- | cut -d ' ' -f2-";
-      nixdiff = "brew outdated && brew outdated --cask && mas outdated && cd ~/repos/dots && sudo darwin-rebuild build --flake . && nvd diff /run/current-system result";
-      nixup = "sudo darwin-rebuild switch --flake ~/repos/dots";
-      uwgconnect = "networksetup -setairportnetwork en0 SecureWest";
-      uwgforget = "networksetup -removepreferredwirelessnetwork en0 SecureWest";
-      ykey = "pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L";
+        # Include Puppet's normal bin folder since it is installed via Homebrew
+        export PATH=$PATH:/opt/puppetlabs/bin
+        export PATH=$PATH:/opt/puppetlabs/pdk/bin
+        export PATH=$PATH:/opt/puppetlabs/puppet/bin
+      '';
+      oh-my-zsh.plugins = [ "macos" ];
+      shellAliases = {
+        currentwifi = "networksetup -getairportnetwork en0 |cut -d ':' -f2- | cut -d ' ' -f2-";
+        nixdiff = "brew outdated && brew outdated --cask && mas outdated && cd ~/repos/dots && sudo darwin-rebuild build --flake . && nvd diff /run/current-system result";
+        nixup = "sudo darwin-rebuild switch --flake ~/repos/dots";
+        uwgconnect = "networksetup -setairportnetwork en0 SecureWest";
+        uwgforget = "networksetup -removepreferredwirelessnetwork en0 SecureWest";
+        ykey = "pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L";
+      };
     };
   };
 
diff --git a/modules/hosts/darwin/mightymac/home-gene.liverman.nix b/modules/hosts/darwin/mightymac/home-gene.liverman.nix
index ab3c7ed..aa028c8 100644
--- a/modules/hosts/darwin/mightymac/home-gene.liverman.nix
+++ b/modules/hosts/darwin/mightymac/home-gene.liverman.nix
@@ -7,10 +7,6 @@
       goPath = "go";
     };
     k9s.enable = true;
-    zellij = {
-      enable = true;
-      enableZshIntegration = true;
-    };
   };
 
   sops = {