formatting

hosts/hebesu/users/ahnwuoa/default.nix

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

hosts/hyuganatsu/users/ahnwuoa/default.nix

@@ -9,16 +9,5 @@
   ];
 
   home.username = "ahnwuoa";
-  services.activitywatch = {
+  u.has.activitywatch = true;
-    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,17 +1,21 @@
 # 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 =
+  config,
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  lib,
-    ];
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [ ];
+  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

@@ -0,0 +1,25 @@
+{
+  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,4 +1,8 @@
-{config, lib, ...}: {
+{
+  config,
+  lib,
+  ...
+}: {
   programs.starship = {
     enable = true;
     settings = lib.mkDefault {

user/default.nix

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

user/options.nix

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