diff --git a/homes/desktop.nix b/homes/desktop.nix index 03229ed..2a0790c 100644 --- a/homes/desktop.nix +++ b/homes/desktop.nix @@ -2,6 +2,7 @@ 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 58e7263..b3d0947 100644 --- a/playbooks/packages.yaml +++ b/playbooks/packages.yaml @@ -7,9 +7,11 @@ 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 476dfdb..36b2eb0 100644 --- a/playbooks/repos.yaml +++ b/playbooks/repos.yaml @@ -28,6 +28,14 @@ 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 ed6705f..520a4ef 100644 --- a/programs/firefox.nix +++ b/programs/firefox.nix @@ -1,4 +1,4 @@ -{ pkgs, firefox-addons, buildFirefoxXpiAddon, lib, ... }: { +{ firefox-addons, buildFirefoxXpiAddon, lib, ... }: { programs.firefox = { enable = true; package = @@ -31,49 +31,49 @@ }; }; containersForce = true; - 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 ]); + 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; + }; + }) + ]; search = { default = "Kagi"; privateDefault = "Milliron X Search"; @@ -246,6 +246,7 @@ "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" @@ -281,6 +282,7 @@ "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 new file mode 100644 index 0000000..bd91415 --- /dev/null +++ b/programs/ghostty.nix @@ -0,0 +1,19 @@ +{ 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 cff7787..757d42d 100644 --- a/programs/taskbar.nix +++ b/programs/taskbar.nix @@ -25,10 +25,6 @@ bundleIdentifier = "org.mozilla.thunderbird"; action = "launchOrActivateApp"; } - { - bundleIdentifier = "com.microsoft.Outlook"; - action = "launchOrActivateApp"; - } { bundleIdentifier = "dev.zed.Zed"; action = "launchOrActivateApp"; @@ -38,13 +34,11 @@ 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 dea0f34..582ffdf 100644 --- a/systems/darwin/corianne.nix +++ b/systems/darwin/corianne.nix @@ -73,12 +73,9 @@ in { in [ (sysApp "Firefox") (sysApp "Thunderbird") - (sysApp "Microsoft Outlook") - (sysApp "Zed") (sysApp "Logseq") + (sysApp "Zed") (sysApp "Steam") - (localApp "Instinct Dashboard") - (localApp "Carestream") ]; show-process-indicators = true; show-recents = false; @@ -185,6 +182,7 @@ in { "docker" "docker-buildx" "docker-credential-helper" + "firefoxpwa" "mpv" ]; casks = [ @@ -194,8 +192,10 @@ in { "dolphin" "firefox" "freetube" + "ghostty" "inkscape" "iterm2" + "logi-options+" "logseq" "macfuse" "musescore"