diff --git a/home/modules/defaultDesktopPack.nix b/home/modules/defaultDesktopPack.nix
index a6021e5..6e84fab 100644
--- a/home/modules/defaultDesktopPack.nix
+++ b/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; [
diff --git a/home/modules/firefox.nix b/home/modules/firefox.nix
index c260730..cc053fe 100644
--- a/home/modules/firefox.nix
+++ b/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;
diff --git a/home/modules/gui/waybar.nix b/home/modules/gui/waybar.nix
index e7ed2aa..7112b41 100644
--- a/home/modules/gui/waybar.nix
+++ b/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,22 +26,20 @@ in {
             "clock"
           ];
 
-          modules-right =
-            [
-              "privacy"
-              "cpu"
-              "memory"
-              "disk"
-              "temperature"
-              "keyboard-state"
-              "tray"
-            ]
-            ++ lists.optionals laptop [
-              "battery"
-            ];
+          modules-right = [
+            "privacy"
+            "cpu"
+            "memory"
+            "disk"
+            "temperature"
+            "keyboard-state"
+            "tray"
+          ] ++ lists.optionals laptop [
+            "battery"
+          ];
           "battery" = mkIf laptop {
-            format = "{capacity}% {icon}";
-            format-icons = ["" "" "" "" ""];
+              format = "{capacity}% {icon}";
+              format-icons = ["" "" "" "" ""];
           };
           "keyboard-state" = {
             numlock = true;
diff --git a/home/platforms/fabian@t14/default.nix b/home/platforms/fabian@t14/default.nix
index 09472d7..f0ae36c 100644
--- a/home/platforms/fabian@t14/default.nix
+++ b/home/platforms/fabian@t14/default.nix
@@ -11,10 +11,7 @@
   ];
 
   local = {
-    defaultDesktopPack = {
-      enable = true;
-      laptop = true;
-    };
+    defaultDesktopPack.enable = true;
 
     services = {
       gpg.defaultKey = "7206D8EE2474F3DF18EA876F0EC1691FF8C1A81F";
diff --git a/sys/platforms/vps/srv/radicale.nix b/sys/platforms/vps/srv/radicale.nix
index ce0b309..1b7b5eb 100644
--- a/sys/platforms/vps/srv/radicale.nix
+++ b/sys/platforms/vps/srv/radicale.nix
@@ -23,7 +23,7 @@ with lib; {
       enable = true;
       settings = {
         server = {
-          hosts = ["127.0.0.1:5232"];
+          hosts = [ "127.0.0.1:5232" ];
         };
         auth = {
           type = "htpasswd";