hosts/hebesu/users/ahnwuoa/default.nix

@@ -9,5 +9,4 @@
 
   home.username = "ahnwuoa";
   xresources.properties."Xft.dpi" = 120;
-  u.has.activitywatch = true;
 }

hosts/hyuganatsu/users/ahnwuoa/default.nix

@@ -9,5 +9,16 @@
   ];
 
   home.username = "ahnwuoa";
-  u.has.activitywatch = true;
+  services.activitywatch = {
+    enable = true;
+    watchers = {
+      aw-watcher-afk.package = pkgs.activitywatch;
+      aw-watcher-window.package = pkgs.activitywatch;
+    };
+  };
+  systemd.user.targets.activitywatch = {
+    Unit.Requires = lib.mkForce ["autostart.target"];
+    Unit.After = lib.mkForce ["autostart.target"];
+    Install.WantedBy = lib.mkForce ["autostart.target"];
+  };
 }

hosts/mikan/hardware-configuration.nix

@@ -1,21 +1,17 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
+{ config, lib, pkgs, modulesPath, ... }:
 
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

user/activitywatch.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-lib.mkIf config.u.has.activitywatch {
-  services.activitywatch = {
-    enable = true;
-    watchers = {
-      aw-watcher-afk.package = pkgs.activitywatch;
-      aw-watcher-window.package = pkgs.activitywatch;
-    };
-  };
-  systemd.user.targets.activitywatch = {
-    Unit.Requires = lib.mkForce ["autostart.target"];
-    Unit.After = lib.mkForce ["autostart.target"];
-    Install.WantedBy = lib.mkForce ["autostart.target"];
-  };
-  home.packages = with pkgs; [
-    activitywatch
-    python312Packages.aw-client
-    python312Packages.aw-core
-  ];
-}

user/config/starship/default.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: {
+{config, lib, ...}: {
   programs.starship = {
     enable = true;
     settings = lib.mkDefault {

user/default.nix

@@ -4,7 +4,6 @@
   ...
 }: {
   imports = [
-    ./activitywatch.nix
     ./autostart.nix
     ./bin
     ./config

user/options.nix

@@ -43,24 +43,22 @@
       });
       description = "list of file manager bookmarks";
     };
-    has = let
-      mkOpt = name:
-        lib.mkOption {
-          type = lib.types.bool;
-          description = "enable ${name}";
-          default = true;
-        };
-      mkOptF = name:
-        lib.mkOption {
-          type = lib.types.bool;
-          description = "enable ${name}";
-          default = false;
-        };
-    in {
-      graphical = mkOpt "graphical";
-      wine = mkOpt "wine";
-      prog = mkOpt "prog";
-      activitywatch = mkOptF "activitywatch";
+    has = {
+      graphical = lib.mkOption {
+        type = lib.types.bool;
+        description = "enable graphical settings";
+        default = true;
+      };
+      wine = lib.mkOption {
+        type = lib.types.bool;
+        description = "enable wine settings";
+        default = true;
+      };
+      prog = lib.mkOption {
+        type = lib.types.bool;
+        description = "enable prog settings";
+        default = true;
+      };
     };
     lib = lib.mkOption {
       type = lib.types.attrs;