defaults (Dock/Taskbar): Make taskbar and dock have the same Apps

Except for Steam, because Steam is weird and will spawn extra windows
that don't play well with Taskbar.

homes/desktop.nix

@@ -2,7 +2,6 @@
 
   imports = [
     ./../programs/firefox.nix
-    ./../programs/ghostty.nix
     ./../programs/zed.nix
     ./../services/gpg-agent.nix
   ];

playbooks/packages.yaml

@@ -7,11 +7,9 @@
       ansible.builtin.dnf:
         name:
           - chromium
-          - firefoxpwa
           - fontconfig-devel
           - freetype-devel
           - fribidi-devel
-          - ghostty
           - inkscape
           - jq
           - kate

playbooks/repos.yaml

@@ -28,14 +28,6 @@
         enabled: true
         gpgcheck: true
         gpgkey: https://pkgs.tailscale.com/stable/fedora/repo.gpg
-    - name: Install FirefoxPWA repository
-      ansible.builtin.yum_repository:
-        name: firefoxpwa
-        description: FirefoxPWA repository
-        baseurl: https://packagecloud.io/filips/FirefoxPWA/fedora/$releasever/$basearch
-        gpgcheck: true
-        gpgkey: https://packagecloud.io/filips/FirefoxPWA/gpgkey
-        enabled: true
     # Note that I still have to specify the chroot for COPR repos b/c of Asahi
     - name: Install RStudio copr repository
       community.general.copr:

programs/firefox.nix

@@ -1,4 +1,4 @@
-{ firefox-addons, buildFirefoxXpiAddon, lib, ... }: {
+{ pkgs, firefox-addons, buildFirefoxXpiAddon, lib, ... }: {
   programs.firefox = {
     enable = true;
     package =
@@ -31,49 +31,49 @@
           };
         };
         containersForce = true;
-        extensions.packages = with firefox-addons; [
+        extensions.packages = with firefox-addons;
-          bitwarden
+          [
-          multi-account-containers
+            bitwarden
-          floccus
+            multi-account-containers
-          libredirect
+            libredirect
-          old-reddit-redirect
+            old-reddit-redirect
-          plasma-integration
+            ublock-origin
-          pwas-for-firefox
+            user-agent-string-switcher
-          ublock-origin
+            zotero-connector
-          user-agent-string-switcher
+            (buildFirefoxXpiAddon rec {
-          web-archives
+              pname = "always_in_container";
-          zotero-connector
+              version = "1.0.7";
-          (buildFirefoxXpiAddon rec {
+              addonId = "{a1e9543e-5f73-4763-b376-04e53fd12cbd}";
-            pname = "always_in_container";
+              url =
-            version = "1.0.7";
+                "https://addons.mozilla.org/firefox/downloads/file/4032840/${pname}-${version}.xpi";
-            addonId = "{a1e9543e-5f73-4763-b376-04e53fd12cbd}";
+              sha256 = "sha256-bLxjL2P6Sd06q98MSHYRTNigtcjGwn/C2r4ANWCqKrw=";
-            url =
+              meta = with lib; {
-              "https://addons.mozilla.org/firefox/downloads/file/4032840/${pname}-${version}.xpi";
+                homepage = "https://github.com/tiansh/always-in-container";
-            sha256 = "sha256-bLxjL2P6Sd06q98MSHYRTNigtcjGwn/C2r4ANWCqKrw=";
+                description =
-            meta = with lib; {
+                  "Chose a container every time you try to open a page out of a container";
-              homepage = "https://github.com/tiansh/always-in-container";
+                license = licenses.mpl20;
-              description =
+                platforms = platforms.all;
-                "Chose a container every time you try to open a page out of a container";
+              };
-              license = licenses.mpl20;
+            })
-              platforms = platforms.all;
+            (buildFirefoxXpiAddon rec {
-            };
+              pname = "open_with";
-          })
+              version = "7.2.6";
-          (buildFirefoxXpiAddon rec {
+              addonId = "openwith@darktrojan.net";
-            pname = "open_with";
+              url =
-            version = "7.2.6";
+                "https://addons.mozilla.org/firefox/downloads/file/3831723/${pname}-${version}.xpi";
-            addonId = "openwith@darktrojan.net";
+              sha256 = "sha256-f9eGhLxg4UyVn4o5e4DRkraLWzj11SGto/GOwsJa9kg=";
-            url =
+              meta = with lib; {
-              "https://addons.mozilla.org/firefox/downloads/file/3831723/${pname}-${version}.xpi";
+                homepage = "https://darktrojan.github.io/openwith/";
-            sha256 = "sha256-f9eGhLxg4UyVn4o5e4DRkraLWzj11SGto/GOwsJa9kg=";
+                description =
-            meta = with lib; {
+                  "Quickly test out your web pages in Chrome, Edge, Safari, or Opera. Open With opens the current page in your other browsers with just two clicks.";
-              homepage = "https://darktrojan.github.io/openwith/";
+                license = licenses.mpl20;
-              description =
+                platforms = platforms.all;
-                "Quickly test out your web pages in Chrome, Edge, Safari, or Opera. Open With opens the current page in your other browsers with just two clicks.";
+              };
-              license = licenses.mpl20;
+            })
-              platforms = platforms.all;
+          ] ++ (if pkgs.stdenv.hostPlatform.isDarwin then
-            };
+            [ ]
-          })
+          else
-        ];
+            [ plasma-integration ]);
         search = {
           default = "Kagi";
           privateDefault = "Milliron X Search";
@@ -246,7 +246,6 @@
                 "floccus_handmadeideas_org-browser-action"
                 "7esoorv3_alefvanoon_anonaddy_me-browser-action"
                 "plasma-browser-integration_kde_org-browser-action"
-                "firefoxpwa_filips_si-browser-action"
                 "_d07ccf11-c0cd-4938-a265-2a4d6ad01189_-browser-action" # Web Archives
                 "openwith_darktrojan_net-browser-action"
                 "zotero_chnm_gmu_edu-browser-action"
@@ -282,7 +281,6 @@
               "floccus_handmadeideas_org-browser-action"
               "7esoorv3_alefvanoon_anonaddy_me-browser-action"
               "plasma-browser-integration_kde_org-browser-action"
-              "firefoxpwa_filips_si-browser-action"
               "ublock0_raymondhill_net-browser-action"
               "_d07ccf11-c0cd-4938-a265-2a4d6ad01189_-browser-action"
               "zotero_chnm_gmu_edu-browser-action"

programs/ghostty.nix

@@ -1,19 +0,0 @@
-{ pkgs, ... }: {
-  programs.ghostty =
-    let modifierKey = if pkgs.stdenv.isDarwin then "cmd" else "ctrl";
-    in {
-      enable = true;
-      package = null;
-      enableBashIntegration = true;
-      enableZshIntegration = true;
-      settings = {
-        quick-terminal-position = "top";
-        quick-terminal-screen = "main";
-        quick-terminal-autohide = true;
-        quick-terminal-size = "50%,50%";
-        keybind = "global:${modifierKey}+backquote=toggle_quick_terminal";
-        macos-hidden = "always";
-        linux-cgroup = "always";
-      };
-    };
-}

programs/taskbar.nix

@@ -25,6 +25,10 @@
         bundleIdentifier = "org.mozilla.thunderbird";
         action = "launchOrActivateApp";
       }
+      {
+        bundleIdentifier = "com.microsoft.Outlook";
+        action = "launchOrActivateApp";
+      }
       {
         bundleIdentifier = "dev.zed.Zed";
         action = "launchOrActivateApp";
@@ -34,11 +38,13 @@
         action = "launchOrActivateApp";
       }
       {
+        # Instinct dashboard
         bundleIdentifier =
           "com.apple.Safari.WebApp.2F51A6D0-087A-438F-92D3-A73FE09CB4CC";
         action = "launchOrActivateApp";
       }
       {
+        # Carestream
         bundleIdentifier =
           "com.apple.Safari.WebApp.5EC6478E-03A6-4147-8A4D-6EF3DE3F06D3";
         action = "launchOrActivateApp";

systems/darwin/corianne.nix

@@ -73,9 +73,12 @@ in {
     in [
       (sysApp "Firefox")
       (sysApp "Thunderbird")
-      (sysApp "Logseq")
+      (sysApp "Microsoft Outlook")
       (sysApp "Zed")
+      (sysApp "Logseq")
       (sysApp "Steam")
+      (localApp "Instinct Dashboard")
+      (localApp "Carestream")
     ];
     show-process-indicators = true;
     show-recents = false;
@@ -182,7 +185,6 @@ in {
       "docker"
       "docker-buildx"
       "docker-credential-helper"
-      "firefoxpwa"
       "mpv"
     ];
     casks = [
@@ -192,10 +194,8 @@ in {
       "dolphin"
       "firefox"
       "freetube"
-      "ghostty"
       "inkscape"
       "iterm2"
-      "logi-options+"
       "logseq"
       "macfuse"
       "musescore"