2 files changed, 17 insertions, 10 deletions
diff --git a/modules/home-manager/personal/gui/x/default.nix b/modules/home-manager/personal/gui/x/default.nix
index 066c557..a5ab736 100644
--- a/modules/home-manager/personal/gui/x/default.nix
+++ b/modules/home-manager/personal/gui/x/default.nix
@@ -1,17 +1,25 @@
-{ config, lib, ... }@extraArgs:
-
-let cfg = config.personal.x;
+{
+  config,
+  lib,
+  ...
+} @ extraArgs: let
+  cfg = config.personal.x;
 in {
-  imports = [ ./i3 ./idlehook.nix ./picom.nix ];
+  imports = [./i3 ./idlehook.nix ./picom.nix];
 
   options.personal.x = {
-    enable = lib.mkEnableOption "X" // {
-      default = extraArgs.osConfig.services.xserver.enable or false;
-    };
+    enable =
+      lib.mkEnableOption "X"
+      // {
+        default = extraArgs.osConfig.services.xserver.enable or false;
+      };
   };
 
   config = lib.mkIf (cfg.enable && config.personal.gui.enable) {
     xsession.enable = true;
-    services.picom.enable = lib.mkDefault true;
+    services = {
+      picom.enable = lib.mkDefault true;
+      network-manager-applet.enable = extraArgs.osConfig.networking.networkmanager.enable or false;
+    };
   };
 }
diff --git a/modules/home-manager/personal/gui/x/i3/startup.nix b/modules/home-manager/personal/gui/x/i3/startup.nix
index b3e875d..dc52fb0 100644
--- a/modules/home-manager/personal/gui/x/i3/startup.nix
+++ b/modules/home-manager/personal/gui/x/i3/startup.nix
@@ -2,7 +2,7 @@
   config,
   lib,
   ...
-} @ extraArgs: {
+}: {
   xsession.windowManager.i3.config.startup = let
     autostart = {
       command,
@@ -18,7 +18,6 @@
       (autostart {command = "keepassxc";})
     ]
     ++ autostartIf config.programs.thunderbird.enable {command = "thunderbird";}
-    ++ autostartIf (extraArgs.osConfig.networking.networkmanager.enable or false) {command = "nm-applet";}
     ++ autostartIf
     (config.personal.profiles.social && config.personal.identities.personal) {
       command = "signal-desktop";