Merge pull request #539 from genebean/mightymac

add btop & Zellij everywhere, but don't automatically use Zellij

modules/hosts/common/default.nix

@@ -7,6 +7,7 @@
                else "libsqlite3.so";
 in {
   home.packages = with pkgs; [
+    btop
     bundix
     cargo
     cheat
@@ -255,6 +256,10 @@ in {
         let g:airline_powerline_fonts = 1
       '';
     };
+    zellij = {
+      enable = true;
+      enableZshIntegration = false;
+    };
     zsh = {
       enable = true;
       enableCompletion = true;

modules/hosts/darwin/home.nix

@@ -1,6 +1,7 @@
 { username, ... }: {
   # dawrwin-specific shell config
-  programs.zsh = {
+  programs = {
+    zsh = {
       initContent = ''
         function otpon() {
           osascript -e 'tell application "yubiswitch" to KeyOn'
@@ -24,6 +25,7 @@
         ykey = "pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L";
       };
     };
+  };
 
   sops.age.keyFile = "/Users/${username}/Library/Application Support/sops/age/keys.txt";
 }

modules/hosts/darwin/mightymac/home-gene.liverman.nix

@@ -7,10 +7,6 @@
       goPath = "go";
     };
     k9s.enable = true;
-    zellij = {
-      enable = true;
-      enableZshIntegration = true;
-    };
   };
 
   sops = {