Retire iterm2

- Remove iterm2, we have alacritty now
- Only start zellij when we're not in a vscode terminal
- Install discord everywhere we have a gui

Bootstrapfile

@@ -7,6 +7,7 @@ gui do
   install "zoom"
   install "vlc"
   install "steam"
+  install "discord"
   install "spotify"
   install "slack"
   install "gimp"
@@ -17,12 +18,10 @@ gui do
   install "alacritty"
 
   macos do
-    install "iterm2"
     install "flux"
   end
 
   windows do
-    install "discord"
     install "flux"
   end
 end

bashrc

@@ -1,8 +1,10 @@
 #!/bin/bash
 
 # zellij
-export ZELLIJ_AUTO_EXIT=true
-eval "$(zellij setup --generate-auto-start bash)"
+if [[ "$TERM_PROGRAM" != "vscode" ]] then
+  export ZELLIJ_AUTO_EXIT=true
+  eval "$(zellij setup --generate-auto-start bash)"
+fi
 
 # aliases
 alias b="bundle"

bootstrap/lib/bootstrap/package/sources.yml

@@ -169,3 +169,9 @@ zellij:
   fedora:
     dnf:
       copr: varlad/zellij
+
+discord:
+  ubuntu:
+    snap: true
+  fedora:
+    flatpak: true

test/bootstrap/fedora_test.rb

@@ -116,6 +116,10 @@ class FedoraTest < TestCase
       test "installs alacritty" do
         assert_dnf_installed("alacritty")
       end
+
+      test "installs discord" do
+        assert_flatpak_installed("discord")
+      end
     else
       test "does not install flux" do
         assert_dnf_not_installed("fluxgui")
@@ -172,6 +176,10 @@ class FedoraTest < TestCase
       test "does not install alacritty" do
         assert_dnf_not_installed("alacritty")
       end
+
+      test "does not install discord" do
+        assert_flatpak_not_installed("discord")
+      end
     end
 
     private

test/bootstrap/macos_test.rb

@@ -65,10 +65,6 @@ class MacosTest < TestCase
     end
 
     if gui?
-      test "installs iterm2" do
-        assert_brew_cask_installed("iterm2")
-      end
-
       test "installs firefox" do
         assert_brew_cask_installed("firefox")
       end
@@ -128,11 +124,11 @@ class MacosTest < TestCase
       test "installs alacritty" do
         assert_brew_cask_installed("alacritty")
       end
-    else
-      test "does not install iterm2" do
-        assert_brew_cask_not_installed("iterm2")
-      end
 
+      test "installs discord" do
+        assert_brew_cask_installed("discord")
+      end
+    else
       test "does not install flux" do
         assert_brew_cask_not_installed("flux")
       end
@@ -188,6 +184,10 @@ class MacosTest < TestCase
       test "does not install alacritty" do
         assert_brew_cask_not_installed("alacritty")
       end
+
+      test "does not install discord" do
+        assert_brew_cask_not_installed("discord")
+      end
     end
 
     private

test/bootstrap/ubuntu_test.rb

@@ -116,6 +116,10 @@ class UbuntuTest < TestCase
       test "installs alacritty" do
         assert_snap_installed("alacritty")
       end
+
+      test "installs discord" do
+        assert_snap_installed("discord")
+      end
     else
       test "does not install flux" do
         assert_apt_not_installed("fluxgui")
@@ -172,6 +176,10 @@ class UbuntuTest < TestCase
       test "does not install alacritty" do
         assert_snap_not_installed("alacritty")
       end
+
+      test "does not install discord" do
+        assert_snap_not_installed("discord")
+      end
     end
 
     private

test/bootstrap/windows_test.rb

@@ -80,6 +80,10 @@ class WindowsTest < TestCase
       assert_winget_installed("alacritty")
     end
 
+    test "installs discord" do
+      assert_winget_installed("discord")
+    end
+
     private
 
     def assert_winget_installed(package_name)