Refactor dwm and thunar configuration

nix/hosts/t490/configuration.nix

@@ -18,8 +18,10 @@
   features = {
     desktop = {
       autorandr.enable = true;
+      dwm.enable = true;
       gaming.enable = true;
       i3.enable = true;
+      thunar.enable = true;
       peek.enable = true;
     };
   };

nix/hosts/t490/services/dwm.nix

@@ -1,27 +1,40 @@
-{ pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with lib;
 
 {
-  services = {
-    dwm-status = {
-      enable = true;
+  options.features.desktop.dwm.enable = mkEnableOption "Enable dwm";
 
-      order = [
-        "audio"
-        "backlight"
-        "battery"
-        "cpu_load"
-        "network"
-        "time"
-      ];
+  config = mkIf config.features.desktop.dwm.enable {
+    services = {
+      dwm-status = {
+        enable = true;
+
+        order = [
+          "audio"
+          "backlight"
+          "battery"
+          "cpu_load"
+          "network"
+          "time"
+        ];
+      };
+
+      xserver.windowManager.dwm.enable = true;
     };
 
-    xserver.windowManager.dwm.enable = true;
-  };
+    systemd.user.services.dwm-status.serviceConfig.Restart = "on-failure";
 
-  environment.systemPackages = with pkgs; [
-    dmenu
-    dmenu-bluetooth
-    networkmanager_dmenu
-    st
-  ];
+    environment.systemPackages = with pkgs; [
+      dmenu
+      dmenu-bluetooth
+      networkmanager_dmenu
+      st
+    ];
+  };
 }