diff --git a/modules/desktop/bspwm/bspwm.nix b/modules/desktop/bspwm.nix
similarity index 100%
rename from modules/desktop/bspwm/bspwm.nix
rename to modules/desktop/bspwm.nix
diff --git a/modules/desktop/kitty.nix b/modules/desktop/kitty.nix
new file mode 100644
index 00000000..5cc26915
--- /dev/null
+++ b/modules/desktop/kitty.nix
@@ -0,0 +1,20 @@
+{ options, config, lib, pkgs, ...}:
+with lib;
+let cfg = config.modules.desktop.kitty;
+in {
+  options.modules.desktop.kitty = {
+    enable = mkBoolOpt false;
+  };
+
+  config = mkIf cfg.enable {
+    users.users.sako.packages = with pkgs; [
+      kitty
+    ];
+    fonts.fonts = with pkgs; [
+      jetbrains-mono
+      (nerdfonts.override { fonts = [
+        "JetBrainsMono"
+      ];}) 
+    ];
+  };
+}
diff --git a/modules/desktop/kitty/kitty.nix b/modules/desktop/kitty/kitty.nix
deleted file mode 100644
index e69de29b..00000000
diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix
new file mode 100644
index 00000000..0dfaec9e
--- /dev/null
+++ b/modules/shell/zsh.nix
@@ -0,0 +1,15 @@
+{ options, config, lib, pkgs, ...}:
+with lib;
+let cfg = config.modules.shell.zsh;
+in {
+  options.modules.shell.zsh = {
+    enable = mkBoolOpt false;
+  };
+
+  config = mkIf cfg.enable {
+    programs.zsh = {
+      enable = true;
+      promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-heme";
+    };
+  };
+}