diff --git a/home-manager/cli/bat.nix b/home-manager/cli/bat.nix
deleted file mode 100644
index 46803a1..0000000
--- a/home-manager/cli/bat.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-_:{
-  programs.bat = {
-    enable = true;
-    config = {
-      theme = "base16";
-    };
-  };
-
-  programs.zsh.shellAliases = {
-    cat = "bat";
-  };
-}
diff --git a/home-manager/cli/eza.nix b/home-manager/cli/eza.nix
deleted file mode 100644
index 7345765..0000000
--- a/home-manager/cli/eza.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, ...}:
-{
-  home.packages = with pkgs; [
-    eza
-  ];
-
-  programs.zsh.shellAliases = {
-    ls = "eza";
-  };
-  home.sessionVariables = {
-    EXA_COLORS = "xx=2";
-  };
-}
diff --git a/hosts/luci/home-config.nix b/hosts/luci/home-config.nix
index 1c5127a..babdfaa 100644
--- a/hosts/luci/home-config.nix
+++ b/hosts/luci/home-config.nix
@@ -8,6 +8,7 @@
       ghq.enable = true;
       git.enable = true;
       neovim.enable = true;
+      utils.enable = true;
       vifm.enable = true;
       zsh.enable = true;
     };
diff --git a/modules/home-manager/cli/utils/default.nix b/modules/home-manager/cli/utils/default.nix
new file mode 100644
index 0000000..a30c0e7
--- /dev/null
+++ b/modules/home-manager/cli/utils/default.nix
@@ -0,0 +1,33 @@
+{ lib, config, pkgs, ... }:
+with lib;
+let
+  cfg = config.modules.cli.utils;
+in
+{
+  options.modules.cli.utils = {
+    enable = mkEnableOption "Install cli utils";
+  };
+  config = mkIf cfg.enable {
+
+    programs.bat = {
+      enable = true;
+      config = {
+        theme = "base16";
+      };
+    };
+
+    home.packages = with pkgs; [
+      eza
+    ];
+    
+    home = {
+      sessionVariables = {
+        EXA_COLORS = "xx=2";
+      };
+      shellAliases = {
+        ls = "eza";
+        cat = "bat";
+      };
+    };
+  };
+}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 50565c6..42146ad 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -7,6 +7,7 @@
     ./cli/ghq/default.nix
     ./cli/git
     ./cli/neovim
+    ./cli/utils
     ./cli/vifm
     ./cli/zsh
     ./desktop/sway