diff --git a/modules/programs/cli/eza.nix b/modules/programs/cli/eza.nix
new file mode 100644
index 0000000..ea2457b
--- /dev/null
+++ b/modules/programs/cli/eza.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
+  inherit (lib) mkIf;
+  cfg = config.modules.system.programs.eza;
+in {
+  config = mkIf cfg.enable {
+    home-manager.users.${username} = {
+      programs.eza = {
+        enable = true;
+        package = pkgs.eza;
+        git = true;
+        icons = true;
+        enableNushellIntegration = true;
+        enableBashIntegration = true;
+        enableFishIntegration = true;
+        enableZshIntegration = true;
+      };
+    };
+  };
+}
diff --git a/modules/programs/cli/module.nix b/modules/programs/cli/module.nix
index a0d3469..be138ef 100644
--- a/modules/programs/cli/module.nix
+++ b/modules/programs/cli/module.nix
@@ -1,9 +1,12 @@
 _: {
   imports = [
-    ./fish.nix
+    # ./fish.nix
     ./nh.nix
-    ./starship.nix
+    # ./starship.nix
     ./beets.nix
     ./zellij
+    ./oh-my-posh.nix
+    ./nushell.nix
+    ./eza.nix
   ];
 }
diff --git a/modules/programs/cli/nushell.nix b/modules/programs/cli/nushell.nix
new file mode 100644
index 0000000..bd5c650
--- /dev/null
+++ b/modules/programs/cli/nushell.nix
@@ -0,0 +1,36 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
+  inherit (lib) mkIf;
+  cfg = config.modules.system.programs.nushell;
+in {
+  config = mkIf cfg.enable {
+    home-manager.users.${username} = {
+      programs.nushell = {
+        enable = true;
+        package = pkgs.nushell;
+        settings = {
+          aliases = {
+            c = "clear";
+            cc = "cd ~ && clear";
+            mv = "mv -iv";
+            rm = "trash -v";
+            ls = "eza ";
+            l = "eza -a ";
+            la = "eza -lha --git";
+            lg = "lazygit";
+            # cd = "z";
+            v = "nvim";
+            h = "hx";
+            k = "kak";
+            e = "emacs";
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/modules/programs/cli/oh-my-posh.nix b/modules/programs/cli/oh-my-posh.nix
new file mode 100644
index 0000000..9a8dd39
--- /dev/null
+++ b/modules/programs/cli/oh-my-posh.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (config.modules.other.system) username;
+  inherit (lib) mkIf;
+  cfg = config.modules.system.programs.oh-my-posh;
+in {
+  config = mkIf cfg.enable {
+    home-manager.users.${username} = {
+      programs.oh-my-posh = {
+        enable = true;
+        package = pkgs.eza;
+        enableNushellIntegration = true;
+        enableBashIntegration = true;
+        enableFishIntegration = true;
+        enableZshIntegration = true;
+        settings = {
+        };
+      };
+    };
+  };
+}
diff --git a/modules/system/hardware/sound/pipewire/default.nix b/modules/system/hardware/sound/pipewire/module.nix
similarity index 70%
rename from modules/system/hardware/sound/pipewire/default.nix
rename to modules/system/hardware/sound/pipewire/module.nix
index acaf3eb..cabf27e 100644
--- a/modules/system/hardware/sound/pipewire/default.nix
+++ b/modules/system/hardware/sound/pipewire/module.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  inherit (config.modules.system.hardware.sound) pipewire;
+  cfg = config.modules.system.hardware.sound.pipewire;
   inherit (lib) mkIf;
 in {
-  config = mkIf pipewire.enable {
+  config = mkIf cfg.enable {
     services.pipewire = {
       enable = true;
       audio.enable = true;