diff --git a/homes/desktop.nix b/homes/desktop.nix index 2a0790c..03229ed 100644 --- a/homes/desktop.nix +++ b/homes/desktop.nix @@ -2,7 +2,6 @@ imports = [ ./../programs/firefox.nix - ./../programs/ghostty.nix ./../programs/zed.nix ./../services/gpg-agent.nix ]; diff --git a/playbooks/packages.yaml b/playbooks/packages.yaml index b3d0947..58e7263 100644 --- a/playbooks/packages.yaml +++ b/playbooks/packages.yaml @@ -7,11 +7,9 @@ ansible.builtin.dnf: name: - chromium - - firefoxpwa - fontconfig-devel - freetype-devel - fribidi-devel - - ghostty - inkscape - jq - kate diff --git a/playbooks/repos.yaml b/playbooks/repos.yaml index 36b2eb0..476dfdb 100644 --- a/playbooks/repos.yaml +++ b/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: diff --git a/programs/firefox.nix b/programs/firefox.nix index 520a4ef..ed6705f 100644 --- a/programs/firefox.nix +++ b/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; [ - bitwarden - multi-account-containers - floccus - libredirect - old-reddit-redirect - plasma-integration - pwas-for-firefox - ublock-origin - user-agent-string-switcher - web-archives - zotero-connector - (buildFirefoxXpiAddon rec { - pname = "always_in_container"; - version = "1.0.7"; - addonId = "{a1e9543e-5f73-4763-b376-04e53fd12cbd}"; - url = - "https://addons.mozilla.org/firefox/downloads/file/4032840/${pname}-${version}.xpi"; - sha256 = "sha256-bLxjL2P6Sd06q98MSHYRTNigtcjGwn/C2r4ANWCqKrw="; - meta = with lib; { - homepage = "https://github.com/tiansh/always-in-container"; - description = - "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"; - addonId = "openwith@darktrojan.net"; - url = - "https://addons.mozilla.org/firefox/downloads/file/3831723/${pname}-${version}.xpi"; - sha256 = "sha256-f9eGhLxg4UyVn4o5e4DRkraLWzj11SGto/GOwsJa9kg="; - meta = with lib; { - homepage = "https://darktrojan.github.io/openwith/"; - description = - "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; - }; - }) - ]; + extensions.packages = with firefox-addons; + [ + bitwarden + multi-account-containers + libredirect + old-reddit-redirect + ublock-origin + user-agent-string-switcher + zotero-connector + (buildFirefoxXpiAddon rec { + pname = "always_in_container"; + version = "1.0.7"; + addonId = "{a1e9543e-5f73-4763-b376-04e53fd12cbd}"; + url = + "https://addons.mozilla.org/firefox/downloads/file/4032840/${pname}-${version}.xpi"; + sha256 = "sha256-bLxjL2P6Sd06q98MSHYRTNigtcjGwn/C2r4ANWCqKrw="; + meta = with lib; { + homepage = "https://github.com/tiansh/always-in-container"; + description = + "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"; + addonId = "openwith@darktrojan.net"; + url = + "https://addons.mozilla.org/firefox/downloads/file/3831723/${pname}-${version}.xpi"; + sha256 = "sha256-f9eGhLxg4UyVn4o5e4DRkraLWzj11SGto/GOwsJa9kg="; + meta = with lib; { + homepage = "https://darktrojan.github.io/openwith/"; + description = + "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" diff --git a/programs/ghostty.nix b/programs/ghostty.nix deleted file mode 100644 index bd91415..0000000 --- a/programs/ghostty.nix +++ /dev/null @@ -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"; - }; - }; -} diff --git a/programs/taskbar.nix b/programs/taskbar.nix index 757d42d..cff7787 100644 --- a/programs/taskbar.nix +++ b/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"; diff --git a/systems/darwin/corianne.nix b/systems/darwin/corianne.nix index 582ffdf..dea0f34 100644 --- a/systems/darwin/corianne.nix +++ b/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"