diff --git a/modules/home/shell/aichat.nix b/modules/home/shell/aichat.nix
new file mode 100644
index 0000000..6be07a2
--- /dev/null
+++ b/modules/home/shell/aichat.nix
@@ -0,0 +1,15 @@
+{...}: {
+  programs = {
+    aichat = {
+      enable = true;
+      settings = {
+        model = "gemini:gemini-2.0-flash-lite";
+        clients = [
+          {
+            type = "gemini";
+          }
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index d84abe7..3adc8a0 100755
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -1,4 +1,9 @@
 {pkgs, ...}: {
+  imports = [
+    ./lazygit.nix
+    ./aichat.nix
+  ];
+
   programs = {
     bat.enable = true;
     zsh = {
@@ -24,7 +29,6 @@
         bindkey '^R' fzf-history-widget
       '';
     };
-    lazygit.enable = true;
     zoxide = {
       enable = true;
       options = ["--cmd cd"];
diff --git a/modules/home/shell/lazygit.nix b/modules/home/shell/lazygit.nix
new file mode 100644
index 0000000..d1221e2
--- /dev/null
+++ b/modules/home/shell/lazygit.nix
@@ -0,0 +1,79 @@
+{...}: {
+  programs.lazygit = {
+    enable = true;
+    settings = {
+      gui = {
+        showIcons = true;
+        nerdFontsVersion = "3";
+      };
+      customCommands = [
+        {
+          key = "<c-a>";
+          description = "Pick AI commit";
+          command = ''
+            aichat "Please suggest 10 commit messages, given the following diff:
+
+            \`\`\`diff
+            $(git diff --cached)
+            \`\`\`
+
+            **Criteria:**
+
+            1. **Format:** Each commit message must follow the conventional commits format, which is \`<type>(<scope>): <description>\`.
+            2. **Relevance:** Avoid mentioning a module name unless it's directly relevant to the change.
+            3. **Enumeration:** List the commit messages from 1 to 10.
+            4. **Clarity and Conciseness:** Each message should clearly and concisely convey the change made.
+
+            **Commit Message Examples:**
+
+            - fix(app): add password regex pattern
+            - test(unit): add new test cases
+            - style: remove unused imports
+            - refactor(pages): extract common code to \`utils/wait.ts\`
+
+            **Recent Commits on Repo for Reference:**
+
+            \`\`\`
+            $(git log -n 10 --pretty=format:'%h %s')
+            \`\`\`
+
+            **Output Template**
+
+            Follow this output template and ONLY output raw commit messages without spacing, numbers or other decorations.
+
+            fix(app): add password regex pattern
+            test(unit): add new test cases
+            style: remove unused imports
+            refactor(pages): extract common code to \`utils/wait.ts\`
+
+
+            **Instructions:**
+
+            - Take a moment to understand the changes made in the diff.
+            - Think about the impact of these changes on the project (e.g., bug fixes, new features, performance improvements, code refactoring, documentation updates). It's critical to my career you abstract the changes to a higher level and not just describe the code changes.
+            - Generate commit messages that accurately describe these changes, ensuring they are helpful to someone reading the project's history.
+            - Remember, a well-crafted commit message can significantly aid in the maintenance and understanding of the project over time.
+            - If multiple changes are present, make sure you capture them all in each commit message.
+
+            Keep in mind you will suggest 10 commit messages. Only 1 will be used. It's better to push yourself (esp to synthesize to a higher level) and maybe wrong about some of the 10 commits because only one needs to be good. I'm looking for your best commit, not the best average commit. It's better to cover more scenarios than include a lot of overlap.
+
+            Write your 10 commit messages below in the format shown in Output Template section above." \
+              | fzf --height 40% --border --ansi --preview "echo {}" --preview-window=up:wrap \
+              | xargs -I {} bash -c '
+                  COMMIT_MSG_FILE=$(mktemp)
+                  echo "{}" > "$COMMIT_MSG_FILE"
+                  ''${EDITOR:-vim} "$COMMIT_MSG_FILE"
+                  if [ -s "$COMMIT_MSG_FILE" ]; then
+                      git commit -F "$COMMIT_MSG_FILE"
+                  else
+                      echo "Commit message is empty, commit aborted."
+                  fi
+                  rm -f "$COMMIT_MSG_FILE"'
+          '';
+          context = "files";
+          output = "terminal";
+        }
+      ];
+    };
+  };
+}