home/modules/defaultDesktopPack.nix

@@ -9,10 +9,6 @@ with lib; let
 in {
   options.local.defaultDesktopPack = {
     enable = mkEnableOption "common desktop programs and services";
-    laptop = mkOption {
-      type = types.bool;
-      default = false;
-    };
   };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [

home/modules/firefox.nix

@@ -12,13 +12,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.firefox = {
-      enable = true;
-      package = pkgs.firefox.override {
-        nativeMessagingHosts = [pkgs.passff-host];
-      };
-    };
-
+    programs.firefox.enable = true;
     xdg = {
       mimeApps = {
         enable = true;

home/modules/gui/waybar.nix

@@ -6,7 +6,7 @@
 }:
 with lib; let
   cfg = config.local.gui;
-  laptop = config.local.defaultDesktopPack.laptop;
+  laptop = config.trivium.laptop.enable;
 in {
   config = mkIf cfg.enable {
     programs.waybar = {
@@ -26,8 +26,7 @@ in {
             "clock"
           ];
 
-          modules-right =
-            [
+          modules-right = [
             "privacy"
             "cpu"
             "memory"
@@ -35,8 +34,7 @@ in {
             "temperature"
             "keyboard-state"
             "tray"
-            ]
-            ++ lists.optionals laptop [
+          ] ++ lists.optionals laptop [
             "battery"
           ];
           "battery" = mkIf laptop {

home/platforms/fabian@t14/default.nix

@@ -11,10 +11,7 @@
   ];
 
   local = {
-    defaultDesktopPack = {
-      enable = true;
-      laptop = true;
-    };
+    defaultDesktopPack.enable = true;
 
     services = {
       gpg.defaultKey = "7206D8EE2474F3DF18EA876F0EC1691FF8C1A81F";