feat: floorp

flake/config.nix

@@ -15,10 +15,6 @@
 
       # TODO: Move these to custom modules
       overlays = [
-        (import ./overlays/firefox-addons {
-          inherit (inputs.nixpkgs) lib;
-          inherit inputs;
-        })
         (import ./overlays/jetbrains.nix {inherit inputs;})
         (import ./overlays/wezterm.nix {inherit inputs;})
       ];

modules/darwin/profiles.nix

@@ -4,6 +4,7 @@ in {
   marleyos = {
     programs = {
       fish = enabled;
+      floorp = enabled;
       nh = enabled;
       wezterm = enabled;
       wireguard = enabled;

modules/darwin/programs/default.nix

@@ -1,6 +1,7 @@
 {
   imports = [
     ./fish.nix
+    ./floorp.nix
     ./nh.nix
     ./wezterm.nix
     ./wireguard.nix

modules/darwin/programs/floorp.nix

@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.marleyos.programs.floorp;
+in {
+  options.marleyos.programs.floorp.enable = lib.mkEnableOption "floorp";
+
+  config = lib.mkIf cfg.enable {
+    homebrew.casks = ["floorp"];
+  };
+}

modules/home/profiles.nix

@@ -51,6 +51,7 @@ in {
         CEmu = enabled;
         cheat = enabled;
         discord = enabled;
+        floorp = enabled;
         fzf = enabled;
         gh = enabled;
         glow = enabled;

modules/home/programs/default.nix

@@ -13,6 +13,7 @@
     ./eza.nix
     ./figlet.nix
     ./fish.nix
+    ./floorp.nix
     ./fuzzel.nix
     ./fzf.nix
     ./gh.nix

modules/home/programs/floorp.nix

@@ -1,15 +1,27 @@
 {
-  lib,
+  marleylib,
   config,
+  osConfig,
+  lib,
   pkgs,
   ...
 }: let
+  inherit (marleylib.module) mkEnableOption';
+
   cfg = config.marleyos.programs.floorp;
+  osCfg = osConfig.marleyos.programs.floorp.enable or false;
 in {
-  options.marleyos.programs.floorp.enable = lib.mkEnableOption "floorp";
+  options.marleyos.programs.floorp.enable = mkEnableOption' "floorp" osCfg;
 
   config = lib.mkIf cfg.enable {
-    # FIXME: switch to this once it's available
+    nixpkgs.overlays = [
+      (import ../../../overlays/firefox-addons {
+        inherit lib;
+        inherit pkgs;
+      })
+    ];
+
+    # FIXME: switch to this once upgraded to 25.05
     # stylix.targets.floorp = {
     #   enable = true;
     #   colorTheme.enable = true;
@@ -18,9 +30,10 @@ in {
 
     programs.floorp = {
       enable = true;
+      package = lib.mkIf pkgs.stdenv.isDarwin pkgs.emptyDirectory;
 
       profiles = {
-        "${config.marleyos.my.name}" = {
+        "${config.marleycfg.my.name}" = {
           extensions =
             (with pkgs.nur.repos.rycee.firefox-addons; [
               archivebox-exporter
@@ -75,7 +88,7 @@ in {
             # Quieter Fox - - - - - - - - - - - - - - - - - - - - - - - - - - -
             # Recommendations
             "extensions.getAddons.showPane" = false; # uses google analytics
-            "extensions.htmlaboutaddons.reccomendations.enabled" = false;
+            "extensions.htmlaboutaddons.recommendations.enabled" = false;
             "browser.discovery.enabled" = false;
             "browser.shopping.experience2023.enabled" = false;
 
@@ -177,7 +190,7 @@ in {
             "security.ssl.treat_unsafe_negotiation_as_broken" = true;
             "browser.xul.error_pages.expert_bad_cert" = true;
 
-            # Referers - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+            # Referrers - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
             "network.http.referer.XOriginTrimmingPolicy" = 2;
 
             # Containers - - - - - - - - - - - - - - - - - - - - - - - - - - - -

overlays/firefox-addons/default.nix

@@ -1,11 +1,11 @@
 {
   lib,
-  inputs,
+  pkgs,
   ...
 }: let
   buildFirefoxXpiAddon = lib.makeOverridable ({
-    stdenv ? inputs.nixpkgs.stdenv,
+    stdenv ? pkgs.stdenv,
-    fetchurl ? inputs.nixpkgs.fetchurl,
+    fetchurl ? pkgs.fetchurl,
     pname,
     version,
     addonId,
@@ -35,7 +35,7 @@
 in
   _: prev: {
     marleyos =
-      prev.marleyos
+      (prev.marleyos or {})
       // {
         firefox-addons = import ./addons.nix {
           inherit buildFirefoxXpiAddon lib;