diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix
index 6d45aff..301c018 100644
--- a/modules/desktop/options.nix
+++ b/modules/desktop/options.nix
@@ -34,11 +34,13 @@
     {
       options.chiasson.desktop = {
         defaultSession = lib.mkOption {
-          type = lib.types.nullOr (lib.types.enum [
-            "hyprland"
-            "niri"
-            "plasma"
-          ]);
+          type = lib.types.nullOr (
+            lib.types.enum [
+              "hyprland"
+              "niri"
+              "plasma"
+            ]
+          );
           default = null;
           example = "niri";
           description = ''
@@ -56,10 +58,12 @@
 
         displayManager = {
           variant = lib.mkOption {
-            type = lib.types.nullOr (lib.types.enum [
-              "sddm"
-              "dankgreeter"
-            ]);
+            type = lib.types.nullOr (
+              lib.types.enum [
+                "sddm"
+                "dankgreeter"
+              ]
+            );
             default = null;
             description = ''
               SDDM vs DankGreeter (greetd + DMS — [docs](https://danklinux.com/docs/dankgreeter/nixos-flake)).
@@ -80,11 +84,13 @@
         };
 
         displayManager.sddm = {
-          wayland.enable = lib.mkEnableOption ''
-            SDDM greeter on Wayland (nicer on HiDPI; turn off if the greeter glitches on your GPU).
-          '' // {
-            default = true;
-          };
+          wayland.enable =
+            lib.mkEnableOption ''
+              SDDM greeter on Wayland (nicer on HiDPI; turn off if the greeter glitches on your GPU).
+            ''
+            // {
+              default = true;
+            };
 
           enableHidpi = lib.mkOption {
             type = lib.types.bool;
@@ -159,12 +165,14 @@
         };
 
         keyring = {
-          enable = lib.mkEnableOption ''
-            gnome-keyring + pam (login + sddm or greetd) + HM user service + `gcr` + `services.xserver.updateDbusEnvironment`.
-            niri/hyprland: `dbus-update-activation-environment` at compositor start so libsecret/Electron see `WAYLAND_DISPLAY`.
-          '' // {
-            default = true;
-          };
+          enable =
+            lib.mkEnableOption ''
+              gnome-keyring + pam (login + sddm or greetd) + HM user service + `gcr` + `services.xserver.updateDbusEnvironment`.
+              niri/hyprland: `dbus-update-activation-environment` at compositor start so libsecret/Electron see `WAYLAND_DISPLAY`.
+            ''
+            // {
+              default = true;
+            };
         };
       };
 
@@ -184,8 +192,7 @@
               message = "chiasson.desktop.defaultSession = \"plasma\" requires chiasson.desktop.plasma.enable = true.";
             }
             {
-              assertion =
-                cfg.displayManager.variant != "dankgreeter" || cfg.hyprland.enable || cfg.niri.enable;
+              assertion = cfg.displayManager.variant != "dankgreeter" || cfg.hyprland.enable || cfg.niri.enable;
               message = "chiasson.desktop.displayManager.variant = \"dankgreeter\" requires chiasson.desktop.hyprland or chiasson.desktop.niri.";
             }
             {
@@ -210,7 +217,7 @@
         (lib.mkIf (dmsEnabled && hmAvailable) {
           "home-manager".sharedModules = [ self.homeManagerModules.desktopShellDms ];
         })
-        (lib.mkIf (hmAvailable && (dmsEnabled || cfg.niri.enable)) {
+        (lib.mkIf hmAvailable {
           "home-manager".extraSpecialArgs = { inherit inputs; };
         })
       ];
diff --git a/modules/hosts/14900k/home.nix b/modules/hosts/14900k/home.nix
index 3e4ea1d..eb09722 100644
--- a/modules/hosts/14900k/home.nix
+++ b/modules/hosts/14900k/home.nix
@@ -22,7 +22,6 @@
               spotify.openDiscoveryFirewall = true;
               pokeclicker.enable = true;
             };
-
           };
         }
       ];
diff --git a/modules/hosts/ideapad/home.nix b/modules/hosts/ideapad/home.nix
index 6dbc7ba..2cafdae 100644
--- a/modules/hosts/ideapad/home.nix
+++ b/modules/hosts/ideapad/home.nix
@@ -4,18 +4,5 @@
     { self, ... }:
     {
       imports = [ self.nixosModules.desktopHomeBase ];
-
-      # Host-only HM overrides (tablet apps, toggles off from desktop-home-base, …).
-      chiasson.users.extraModules.olivier = [
-        # {
-        #   chiasson.home = {
-        #     # editors.kate.enable = true;
-        #   };
-        # }
-        # (
-        #   { pkgs, ... }:
-        #   { home.packages = with pkgs; [ ]; }
-        # )
-      ];
     };
 }
diff --git a/modules/hosts/t2mbp/home.nix b/modules/hosts/t2mbp/home.nix
index de6c6e1..b267c32 100644
--- a/modules/hosts/t2mbp/home.nix
+++ b/modules/hosts/t2mbp/home.nix
@@ -8,9 +8,7 @@
       chiasson.users.extraModules.olivier = [
         {
           chiasson.home = {
-            browsers = {
-              edge.enable = true;
-            };
+            browsers.edge.enable = true;
 
             apps = {
               discord.enable = true;
@@ -19,6 +17,5 @@
           };
         }
       ];
-
     };
 }
diff --git a/modules/hosts/uConsole/home.nix b/modules/hosts/uConsole/home.nix
index 9f67b2e..11a7ef2 100644
--- a/modules/hosts/uConsole/home.nix
+++ b/modules/hosts/uConsole/home.nix
@@ -7,9 +7,7 @@
 
       chiasson.users.extraModules.olivier = [
         {
-          chiasson.home = {
-            hardware.uconsoleGamepad.enable = true;
-          };
+          chiasson.home.hardware.uconsoleGamepad.enable = true;
         }
       ];
     };