diff --git a/modules/home/octelly/shell/default.nix b/modules/home/octelly/shell/default.nix
new file mode 100644
index 0000000..87dd879
--- /dev/null
+++ b/modules/home/octelly/shell/default.nix
@@ -0,0 +1,32 @@
+{ lib, config, ... }:
+let
+  cfg = config.octelly.shell;
+in
+with lib; {
+  options.octelly.shell =
+    {
+      enable = mkEnableOption "Evaluate Octelly's shell settings";
+      shell = mkOption { default = cfg.enable; };
+      cli = {
+        enable = mkOption {
+          default = cfg.enable;
+          description = "Enable default CLI apps";
+        };
+        ranger = {
+          enable = mkOption {
+            default = cfg.cli.enable;
+            description = "Enable ranger";
+          };
+        };
+      };
+    };
+
+  config = mkIf cfg.enable {
+    programs.zsh = {
+      enable = mkDefault cfg.shell;
+    };
+    programs.ranger = mkIf cfg.cli.ranger.enable {
+      enable = true;
+    };
+  };
+}