♻️ Modularized the xorg.xkill package

Author: theobori

docs/docs/tasks.md

@@ -11,5 +11,5 @@ Here are a non-exhaustive list of tasks.
 - [x] Customize Spotify with [Spicetify](https://github.com/Gerg-L/spicetify-nix)
 - [x] Add declarative Flatpak supports with [declarative-flatpak](https://github.com/GermanBread/declarative-flatpak)
 - [ ] Better email accounts management
-- [ ] Solve TODO in the file `modules/home/roles/desktop/default.nix`
+- [x] Solve TODO in the file `modules/home/roles/desktop/default.nix`
 

modules/home/cli/programs/xkill/default.nix

@@ -0,0 +1,20 @@
+{
+  lib,
+  config,
+  namespace,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) mkBoolOpt;
+
+  cfg = config.${namespace}.cli.programs.xkill;
+in
+{
+  options.${namespace}.cli.programs.xkill = {
+    enable = mkBoolOpt false "Whether or not to enable xkill.";
+  };
+
+  config = mkIf cfg.enable { home.packages = with pkgs; [ xorg.xkill ]; };
+}

modules/home/roles/desktop/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   namespace,
@@ -25,9 +24,6 @@ in
       };
     };
 
-    # TODO: Make modules for this packages
-    home.packages = with pkgs; [ xorg.xkill ];
-
     ${namespace} = {
       roles = {
         common = enabled;
@@ -44,7 +40,10 @@ in
       };
 
       cli = {
-        programs.fast-anime = enabled;
+        programs = {
+          fast-anime = enabled;
+          xkill = enabled;
+        };
         terminals = {
           syncterm = enabled;
           wezterm = enabled;