diff --git a/home-manager/luna/categories/cli/default.nix b/home-manager/luna/categories/cli/default.nix
index 0242d23..7e186ec 100644
--- a/home-manager/luna/categories/cli/default.nix
+++ b/home-manager/luna/categories/cli/default.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   imports = [
-    #./zsh
+    ./zsh
   ];
 
   home.packages = with pkgs; [
@@ -9,5 +9,7 @@
 
     nixd # nix lsp
     alejandra # formatter
+
+    oh-my-posh
   ];
 }
diff --git a/home-manager/luna/categories/cli/zsh/default.nix b/home-manager/luna/categories/cli/zsh/default.nix
new file mode 100644
index 0000000..89891ae
--- /dev/null
+++ b/home-manager/luna/categories/cli/zsh/default.nix
@@ -0,0 +1,16 @@
+{...}: {
+  programs.zsh = {
+    enable = true;
+
+    oh-my-zsh = {
+      enable = true;
+    };
+    history.size = 10000;
+
+    initContent = {
+      _type = "order";
+      content = ''eval "$(oh-my-posh init zsh)"'';
+      priority = 0;
+    };
+  };
+}
diff --git a/home-manager/luna/categories/desktop/common/default.nix b/home-manager/luna/categories/desktop/common/default.nix
new file mode 100644
index 0000000..321b845
--- /dev/null
+++ b/home-manager/luna/categories/desktop/common/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./fonts.nix
+  ];
+}
diff --git a/home-manager/luna/categories/desktop/common/fonts.nix b/home-manager/luna/categories/desktop/common/fonts.nix
new file mode 100644
index 0000000..76192f9
--- /dev/null
+++ b/home-manager/luna/categories/desktop/common/fonts.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  fonts = {
+    packages = with pkgs; [
+      (nerd-fonts.override {fonts = ["JetBrains Mono"];})
+      jetbrains-mono
+    ];
+  };
+}
diff --git a/home-manager/luna/hummingbird.nix b/home-manager/luna/hummingbird.nix
index a22fde9..394bab0 100644
--- a/home-manager/luna/hummingbird.nix
+++ b/home-manager/luna/hummingbird.nix
@@ -3,8 +3,6 @@
     ./common
 
     ./categories/cli
+    ./categories/desktop/common
   ];
-
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
 }