Converted bat from nixosModule to homeModule

homes/x86_64-linux/alejandro/default.nix

@@ -9,6 +9,7 @@
 }: {
   aa = {
     apps = {
+      bat.enable = true;
       btop.enable = true;
       tmux.enable = true;
     };

modules/home/apps/bat/default.nix

@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  namespace,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.apps.bat;
+in {
+  options.${namespace}.apps.bat = {
+    enable = mkEnableOption "bat";
+  };
+
+  config = mkIf cfg.enable {
+    programs.bat = {
+      enable = true;
+      config.theme = "gruvbox-dark";
+    };
+  };
+}

modules/nixos/apps/bat/default.nix

@@ -1,23 +0,0 @@
-{
-  options,
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.aa.apps.bat;
-in {
-  options.aa.apps.bat = with types; {
-    enable = mkEnableOption "bat";
-  };
-
-  config = mkIf cfg.enable {
-    aa.home.extraOptions = {
-      programs.bat = {
-        enable = true;
-        config.theme = "gruvbox-dark";
-      };
-    };
-  };
-}

modules/nixos/suites/utils/default.nix

@@ -1,23 +1,23 @@
 {
-  options,
   config,
   lib,
   pkgs,
   inputs,
   ...
-}:
+}: let
-with lib; let
+  inherit (lib) mkIf mkEnableOption;
+
   cfg = config.aa.suites.utils;
 in {
-  options.aa.suites.utils = with lib.types; {
+  options.aa.suites.utils = {
     enable = mkEnableOption "common configuration";
   };
 
   config = mkIf cfg.enable {
-    aa.apps.bat.enable = true;
+    environment.systemPackages =
-    environment.systemPackages = with pkgs; [
+      (with pkgs; [
-      inputs.agenix.packages.x86_64-linux.default
         alejandra
+        bat
         bind # for dig
         curl
         deploy-rs
@@ -36,6 +36,7 @@ in {
         tcpdump
         usbutils
         wget
-    ];
+      ])
+      ++ [inputs.agenix.packages.x86_64-linux.default];
   };
 }