diff --git a/conf/bash/scripts/git-commit-chunk-text.sh b/conf/bash/scripts/git-commit-chunk-text.sh
index cb63a1eb..a32810d3 100755
--- a/conf/bash/scripts/git-commit-chunk-text.sh
+++ b/conf/bash/scripts/git-commit-chunk-text.sh
@@ -68,7 +68,6 @@ commit_with_text() {
     done
 
     # Execute the git commit command
-    echo "Executing: ${git_cmd[*]}"
     "${git_cmd[@]}"
 }
 
diff --git a/conf/bash/scripts/jj-ai-commit.sh b/conf/bash/scripts/jj-ai-commit.sh
new file mode 100755
index 00000000..d82e83ae
--- /dev/null
+++ b/conf/bash/scripts/jj-ai-commit.sh
@@ -0,0 +1,148 @@
+#!/usr/bin/env bash
+
+# This script will run the jj describe command with input text for a given revision
+# Input text is long text with empty lines.
+# First line is commit message, rest is description.
+# to make long description with line break, we need to use multiple `-m`
+# Eg: jj describe -r <rev> -m "title" -m "description line 1" -m "description line 2" .........
+
+set -euo pipefail
+
+# Function to show usage
+show_usage() {
+    echo "Usage: $0 <rev> [OPTIONS]"
+    echo "Updates commit message for the given revision using multi-line text input"
+    echo ""
+    echo "Arguments:"
+    echo "  <rev>          Revision to update (required)"
+    echo ""
+    echo "Options:"
+    echo "  -h, --help     Show this help message"
+    echo "  -f, --file     Read commit message from file"
+    echo ""
+    echo "Examples:"
+    echo "  echo 'Title\n\nDescription line 1\nDescription line 2' | $0 @"
+    echo "  $0 @ -f commit_message.txt"
+    echo "  $0 @ < commit_message.txt"
+    echo "  aichat 'generate commit message' | $0 @"
+}
+
+# Function to process commit text and execute jj describe
+describe_with_text() {
+    local rev="$1"
+    local input_text="$2"
+
+    # Split input into lines and process
+    local lines=()
+
+    # Use readarray to split input into lines
+    readarray -t lines <<< "$input_text"
+    local line_count=${#lines[@]}
+
+    # Check if we have at least one line
+    if [[ $line_count -eq 0 ]]; then
+        echo "Error: No commit message provided" >&2
+        exit 1
+    fi
+
+    # First line is the commit title
+    local commit_title="${lines[0]}"
+
+    # Check if title is empty
+    if [[ -z "$commit_title" ]]; then
+        echo "Error: Commit title cannot be empty" >&2
+        exit 1
+    fi
+
+    # Build jj describe command
+    local jj_cmd=("jj" "describe" "--no-edit" "-r" "$rev" "-m" "$commit_title")
+
+    # Add description lines (skip first line and any immediately following empty lines)
+    local in_description=false
+    for ((i=1; i<line_count; i++)); do
+        local current_line="${lines[i]}"
+
+        # Skip empty lines immediately after title until we find content
+        if [[ -z "$current_line" ]] && [[ "$in_description" == false ]]; then
+            continue
+        fi
+
+        # Once we find content, we're in description mode
+        in_description=true
+        jj_cmd+=("-m" "$current_line")
+    done
+
+    # Execute the jj describe command
+    "${jj_cmd[@]}"
+}
+
+# Main script logic
+main() {
+    local rev=""
+    local input_text=""
+    local read_from_file=""
+
+    # Check if at least one argument is provided
+    if [[ $# -eq 0 ]]; then
+        echo "Error: Revision argument is required" >&2
+        show_usage
+        exit 1
+    fi
+
+    # First argument is the revision
+    rev="$1"
+    shift
+
+    # Parse remaining command line arguments
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            -h|--help)
+                show_usage
+                exit 0
+                ;;
+            -f|--file)
+                if [[ -z "${2:-}" ]]; then
+                    echo "Error: -f/--file requires a filename" >&2
+                    exit 1
+                fi
+                read_from_file="$2"
+                shift 2
+                ;;
+            *)
+                echo "Error: Unknown option $1" >&2
+                show_usage
+                exit 1
+                ;;
+        esac
+    done
+
+    # Read input based on source
+    if [[ -n "$read_from_file" ]]; then
+        # Read from file
+        if [[ ! -f "$read_from_file" ]]; then
+            echo "Error: File '$read_from_file' not found" >&2
+            exit 1
+        fi
+        input_text=$(cat "$read_from_file")
+    elif [[ ! -t 0 ]]; then
+        # Read from stdin (pipe or redirect)
+        input_text=$(cat)
+    else
+        # No input source provided
+        echo "Error: No input provided. Use -f to read from file or pipe/redirect input" >&2
+        show_usage
+        exit 1
+    fi
+
+    # Check if input is empty
+    if [[ -z "$input_text" ]]; then
+        echo "Error: No input provided" >&2
+        exit 1
+    fi
+
+    # Process and describe
+    describe_with_text "$rev" "$input_text"
+}
+
+# Run main function with all arguments
+main "$@"
diff --git a/conf/bash/scripts/jj-commit-context.sh b/conf/bash/scripts/jj-commit-context.sh
new file mode 100755
index 00000000..5037af2e
--- /dev/null
+++ b/conf/bash/scripts/jj-commit-context.sh
@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+
+# get context for llm jj commit message generation
+# script should redirect output to stdout, so it can be used in a pipeline
+
+## The context should include:
+
+# 1. Changes in the specified revision
+# 2. Last 10 commit messages
+
+## It should output in well formatted text
+
+## Steps
+
+### 1. check if repo is a jj repository, exit 1 if not
+### 2. Get the revision argument (default to @)
+### 3. Get changes for the specified revision
+### 4. Get last 10 commit messages
+### 5. Format the output in well formatted text
+### 6. Redirect the output to stdout
+### 7. Exit 0
+
+set -euo pipefail
+
+# Function to check if we're in a jj repository
+check_jj_repo() {
+    if ! jj status >/dev/null 2>&1; then
+        echo "Error: Not in a jj repository" >&2
+        exit 1
+    fi
+}
+
+# Function to get the revision argument
+get_revision() {
+    local rev="${1:-@}"
+    echo "$rev"
+}
+
+# Function to get changes for the specified revision
+get_revision_changes() {
+    local rev="$1"
+    echo "=== STAGED CHANGES ==="
+    echo
+    # Show the actual diff
+    echo "Changes:"
+    jj diff -r "$rev" --stat --color=never --no-pager
+    echo
+    jj diff -r "$rev" --color=never --no-pager
+    echo
+}
+
+# Function to get last 10 commit messages using template
+get_recent_commits() {
+    local rev="$1"
+    echo "=== RECENT COMMIT HISTORY ==="
+    echo
+    echo "Last 10 commits:"
+    # Use template to format output similar to git log --oneline
+    jj log -n 10 -r "..$rev" --no-pager --no-graph --color=never \
+        -T 'change_id.short() ++ " " ++ description.first_line() ++ "\n"'
+    echo
+}
+
+# Function to show usage
+usage() {
+    echo "Usage: $0 [revision]"
+    echo "  revision: The revision to analyze (default: @)"
+    echo "  Examples:"
+    echo "    $0        # Analyze working copy (@)"
+    echo "    $0 @-     # Analyze parent of working copy"
+    echo "    $0 abc123 # Analyze specific revision"
+    exit 1
+}
+
+# Main function
+main() {
+    # Check for help flag
+    if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
+        usage
+    fi
+
+    check_jj_repo
+
+    local rev
+    rev=$(get_revision "${1:-}")
+
+    echo "Git Commit Context"
+    echo "=================="
+    echo
+
+    get_revision_changes "$rev"
+    get_recent_commits "$rev"
+
+    echo "=== END OF CONTEXT ==="
+}
+
+# Run main function
+main "$@"
+
+exit 0
diff --git a/conf/bash/scripts/jj-split-on-bookmark.sh b/conf/bash/scripts/jj-split-on-bookmark.sh
new file mode 100755
index 00000000..3c013d69
--- /dev/null
+++ b/conf/bash/scripts/jj-split-on-bookmark.sh
@@ -0,0 +1,153 @@
+#!/usr/bin/env bash
+
+# man jj-split
+# 1. jj split -r @ -i -d <bookmark> -m "WIP: empty message"
+# 2. jj mv-next <bookmark>
+
+# This script does:
+# 1. Accept required argument -b for bookmark
+# 2. Accept optional argument -ai for using ai to generate commit.
+
+set -euo pipefail
+
+BASH_SCRIPT_DIR="$HOME/.local/bash/scripts"
+AI_COMMIT_CONTEXT_SCRIPT="$BASH_SCRIPT_DIR/jj-commit-context.sh"
+JJ_AI_COMMIT_SCRIPT="$BASH_SCRIPT_DIR/jj-ai-commit.sh"
+
+# Function to show usage
+show_usage() {
+    echo "Usage: <script> -b <bookmark> [-ai]"
+    echo "Split current working copy and optionally generate AI commit message"
+    echo ""
+    echo "Arguments:"
+    echo "  -b <bookmark>  Bookmark name (required)"
+    echo ""
+    echo "Options:"
+    echo "  -ai            Use AI to generate commit message for the split commit"
+    echo "  -h, --help     Show this help message"
+    echo ""
+    echo "Examples:"
+    echo "  <script> -b feature-branch"
+    echo "  <script> -b feature-branch -ai"
+}
+
+# Function to check if we're in a jj repository
+check_jj_repo() {
+    if ! jj status >/dev/null 2>&1; then
+        echo "Error: Not in a jj repository" >&2
+        exit 1
+    fi
+}
+
+# Function to perform the split operation
+perform_split() {
+    local bookmark="$1"
+    local use_ai="$2"
+
+    echo "Performing split operation with bookmark: $bookmark"
+
+    if ! jj split -r @ -i -d "$bookmark" -m "WIP: empty message"; then
+        echo "Error: Split operation failed or was cancelled" >&2
+        exit 1
+    fi
+
+    # Step 2: Extract the revision ID of the split commit from operation log
+    echo "Extracting revision information..."
+
+    # Get the most recent operation details to find the newly created revision
+    op_output=$(jj op log -n 1 --no-graph --no-pager -d --color=never)
+
+    # Extract the revision ID of the newly created commit
+    # Looking for pattern like: "+ nsvmzqu a6c0ab3 WIP: empty message"
+    rev=$(echo "$op_output" | grep -E "^\+ [a-z0-9]+ [a-z0-9]+ WIP: empty message" | sed -E 's/^\+ ([a-z0-9]+) .*/\1/')
+
+    if [[ -z "$rev" ]]; then
+        echo "Error: Could not extract revision ID from operation log" >&2
+        echo "Operation log output was:" >&2
+        echo "$op_output" >&2
+        exit 1
+    fi
+
+    echo "Split created revision: $rev"
+
+    # Step 3: Generate AI commit message if requested
+    if [[ "$use_ai" == "true" ]]; then
+        echo "Using AI to generate commit message for revision: $rev"
+
+        # Generate commit message using AI and apply it
+        if "$AI_COMMIT_CONTEXT_SCRIPT" "$rev" | aichat --role git-commit -S -c | "$JJ_AI_COMMIT_SCRIPT" "$rev"; then
+            echo "Successfully applied AI-generated commit message to revision: $rev"
+        else
+            echo "Warning: AI commit message generation failed, keeping default message" >&2
+        fi
+    fi
+
+    echo "Split operation completed successfully!"
+    echo "Created revision: $rev with bookmark: $bookmark"
+}
+
+# Main function
+main() {
+    local bookmark=""
+    local use_ai="false"
+
+    # Parse command line arguments
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            -b)
+                if [[ -z "${2:-}" ]]; then
+                    echo "Error: -b requires a bookmark name" >&2
+                    show_usage
+                    exit 1
+                fi
+                bookmark="$2"
+                shift 2
+                ;;
+            -ai)
+                use_ai="true"
+                shift
+                ;;
+            -h|--help)
+                show_usage
+                exit 0
+                ;;
+            *)
+                echo "Error: Unknown option $1" >&2
+                show_usage
+                exit 1
+                ;;
+        esac
+    done
+
+    # Check if bookmark is provided
+    if [[ -z "$bookmark" ]]; then
+        echo "Error: Bookmark name is required (-b option)" >&2
+        show_usage
+        exit 1
+    fi
+
+    # Check if we're in a jj repository
+    check_jj_repo
+
+    # Check if AI scripts exist when -ai is used
+    if [[ "$use_ai" == "true" ]]; then
+        if [[ ! -f "$AI_COMMIT_CONTEXT_SCRIPT" ]]; then
+            echo "Error: AI commit context script not found: $AI_COMMIT_CONTEXT_SCRIPT" >&2
+            exit 1
+        fi
+        if [[ ! -f "$JJ_AI_COMMIT_SCRIPT" ]]; then
+            echo "Error: AI commit script not found: $JJ_AI_COMMIT_SCRIPT" >&2
+            exit 1
+        fi
+        if ! command -v aichat >/dev/null 2>&1; then
+            echo "Error: aichat command not found. Please install aichat for AI functionality." >&2
+            exit 1
+        fi
+    fi
+
+    # Perform the split operation
+    perform_split "$bookmark" "$use_ai"
+}
+
+# Run main function with all arguments
+main "$@"
diff --git a/conf/llm/aichat/roles/git-commit.md b/conf/llm/aichat/roles/git-commit.md
index a4d49d4f..108394d3 100644
--- a/conf/llm/aichat/roles/git-commit.md
+++ b/conf/llm/aichat/roles/git-commit.md
@@ -4,64 +4,50 @@ temperature: 0
 top_p: 0.1
 ---
 
-你是一个 Git 提交信息专家。你的任务是根据提供的 git diff 和相关上下文，生成一个规范的 git commit message 以及 commit message 的详细描述。
+You are a Git commit message expert. Generate conventional commit messages based on git diff and context.
 
-遵循以下规则：
+## Rules
 
-1. 使用 Conventional Commits 规范
-2. 格式：`<type>[optional scope]: <description>`
-3. 类型包括：
+1. **Format**: `<type>[optional scope]: <description>`
 
-   - `feat`: 新功能
-   - `fix`: 修复 bug
-   - `docs`: 文档更改
-   - `style`: 代码格式（不影响代码运行的变动）
-   - `refactor`: 重构（既不是新增功能，也不是修改 bug 的代码变动）
-   - `perf`: 性能优化
-   - `test`: 增加测试
-   - `chore`: 构建过程或辅助工具的变动
-   - `ci`: CI/CD 相关变更
-   - `build`: 构建系统或外部依赖变更
+2. **Types**:
 
-4. 描述规则：
+   - `feat`: new feature
+   - `fix`: bug fix
+   - `docs`: documentation
+   - `style`: formatting (no logic change)
+   - `refactor`: code restructuring
+   - `perf`: performance improvement
+   - `test`: add/update tests
+   - `chore`: maintenance tasks
+   - `ci`: CI/CD changes
+   - `build`: build system/dependencies
 
-   - 使用英文
-   - 使用祈使句，现在时态（如 "add" 而不是 "added" 或 "adds"）
-   - 首字母小写
-   - 结尾不加句号
-   - 标题行简洁明了，通常不超过 50 个字符
-   - 描述做了什么，而不是为什么
-   - 如需详细说明，可在标题后空一行添加详细描述
+3. **Description**:
 
-5. 如果变更较大或涉及多个文件，可以添加 scope（可选）
+   - Use English, imperative mood, present tense
+   - Lowercase first letter, no period
+   - Max 50 characters for title
+   - Describe what, not why
+   - **Be concise**: Use minimal words while staying clear
 
-6. 分析 git diff 时：
+4. **Analysis**:
 
-   - 识别主要变更类型
-   - 关注文件路径和变更内容
-   - 优先考虑最重要的变更
-   - 如果有多个不相关的变更，选择最主要的一个
+   - Identify primary change type
+   - Focus on most important modification
+   - Add scope for multi-file changes if helpful
 
-7. 只输出 commit message，不要包含和 commit message 无关的文本
+5. **Output**: Only the commit message, no extra text. Keep descriptions brief and to the point.
 
-示例：
+## Examples
 
-简短格式：
+### Simple
 
-```
 feat: add user authentication system
-fix(api): handle null response in user service
-docs: update installation guide
-```
 
-带详细描述格式:
+### With details
 
-注意，使用空行进行分割，第一行会作为 commit message 的标题，后续行会作为 commit message 的详细描述。
-
-```
 feat: add user authentication system
 
 Implement JWT-based authentication with login, logout, and token refresh.
 Add middleware for route protection and user session management.
-Include password hashing and validation utilities.
-```
diff --git a/flake.lock b/flake.lock
index 14074665..aefb5756 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748149228,
-        "narHash": "sha256-mmonYFesFo42UUS49Hd0bcbVJRWX/aHBCDYUkkvylf4=",
+        "lastModified": 1748352827,
+        "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "a9939228f661df370c4094fe85f683e45d761dbe",
+        "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1747392669,
-        "narHash": "sha256-zky3+lndxKRu98PAwVK8kXPdg+Q1NVAhaI7YGrboKYA=",
+        "lastModified": 1748414334,
+        "narHash": "sha256-pWLq78fWssxiRAvLQZnxKupUogR25u+28XS4lfxMMoE=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "c3c27e603b0d9b5aac8a16236586696338856fbb",
+        "rev": "1c050d9008ff9e934f8bb5298c902259ea2cb3f7",
         "type": "github"
       },
       "original": {
@@ -410,11 +410,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748227609,
-        "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=",
+        "lastModified": 1748391243,
+        "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022",
+        "rev": "f5b12be834874f7661db4ced969a621ab2d57971",
         "type": "github"
       },
       "original": {
@@ -515,11 +515,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748186667,
-        "narHash": "sha256-UQubDNIQ/Z42R8tPCIpY+BOhlxO8t8ZojwC9o2FW3c8=",
+        "lastModified": 1748344075,
+        "narHash": "sha256-PsZAY3H0e/PBoDVn4fLwGEmeSwESj7SZPZ6CMfgbWFU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bdac72d387dca7f836f6ef1fe547755fb0e9df61",
+        "rev": "e0042dedfbc9134ef973f64e5c7f56a38cc5cc97",
         "type": "github"
       },
       "original": {
@@ -531,11 +531,11 @@
     },
     "nixpkgs-edge": {
       "locked": {
-        "lastModified": 1748277913,
-        "narHash": "sha256-3mOjCv8CrXY1mlY8BYwXToklANey7ANSJGBsciD9pnk=",
+        "lastModified": 1748417666,
+        "narHash": "sha256-Sdkdv1HWNtoFH0oOTYT9xzkw6pHnj5e6E3+F3cCiJo8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "30e0507fb1c4075c20df7d95eda982aebfef01b7",
+        "rev": "879a3857072bdfc01869941540bbe50ca1f0a896",
         "type": "github"
       },
       "original": {
@@ -565,11 +565,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1748273266,
-        "narHash": "sha256-G68XKUqPCMxvAegrnsCaSDATMORw3c1s++3Tre2aEUE=",
+        "lastModified": 1748371069,
+        "narHash": "sha256-emQWYhGIhhAD4wvIgudAbcJDs9WAs+9GrZMSH7nsnxk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b11c91d7a066a0792ba9e87de2220bc395ad7343",
+        "rev": "8b93ae07db3ba91d3729f76258b70a517f1b717d",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1747323949,
-        "narHash": "sha256-G4NwzhODScKnXqt2mEQtDFOnI0wU3L1WxsiHX3cID/0=",
+        "lastModified": 1748389118,
+        "narHash": "sha256-5QJCzMtA2lBFNGou2dbFrGgWXxfL2O92oJoUnqeoNjI=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "f8e784353bde7cbf9a9046285c1caf41ac484ebe",
+        "rev": "4f7af13637a77ce1dc21e58fcd3f635efbfb43a7",
         "type": "github"
       },
       "original": {
@@ -820,11 +820,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748261582,
-        "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
+        "lastModified": 1748306037,
+        "narHash": "sha256-Drxq660/1wBwxrbRlNSueh8noQZCb2N9sk6sGfXrLSM=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "aafb1b093fb838f7a02613b719e85ec912914221",
+        "rev": "35691a804e8b8cb81459283c62d69e6140b66573",
         "type": "github"
       },
       "original": {
diff --git a/nix/hm/editor.nix b/nix/hm/editor.nix
index d05b35c5..845b9dfd 100644
--- a/nix/hm/editor.nix
+++ b/nix/hm/editor.nix
@@ -19,7 +19,7 @@ in
     luajit
     # stylua
     # lua-language-server
-    luarocks
+    # luarocks
     # shellcheck
     # for nix language lsp support.
     nil
diff --git a/nix/hm/frontend-dev.nix b/nix/hm/frontend-dev.nix
index 41c67285..ee299111 100644
--- a/nix/hm/frontend-dev.nix
+++ b/nix/hm/frontend-dev.nix
@@ -9,10 +9,10 @@
     fnm
     nodejs
     pnpm
-    bun
+    # bun
     # biome
-    nodePackages.prettier
-    nodePackages.eslint
+    # nodePackages.prettier
+    # nodePackages.eslint
     # nodePackages.typescript
     # vtsls
     # nodePackages.typescript-language-server
diff --git a/nix/hm/git-town.nix b/nix/hm/git-town.nix
new file mode 100644
index 00000000..04a80b97
--- /dev/null
+++ b/nix/hm/git-town.nix
@@ -0,0 +1,25 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = with pkgs; [
+    git-town
+  ];
+  programs.fish.shellAliases = {
+    gt = "git-town";
+  };
+  programs.git = {
+    aliases = {
+      hack = ''!f() { if [ -z "$1" ]; then echo "Usage: git hack <description>"; return 1; fi; branch_name=$(aichat --role git-branch -S -c "$*"); if [ $? -eq 0 ] && [ -n "$branch_name" ]; then date_suffix=$(date +%m%d); final_branch_name="$branch_name-$date_suffix"; git-town hack "$final_branch_name"; else echo "Failed to generate branch name"; return 1; fi; }; f'';
+      append = ''!f() { if [ -z "$1" ]; then echo "Usage: git append <description>"; return 1; fi; branch_name=$(aichat --role git-branch -S -c "$*"); if [ $? -eq 0 ] && [ -n "$branch_name" ]; then date_suffix=$(date +%m%d); final_branch_name="$branch_name-$date_suffix"; git-town append "$final_branch_name"; else echo "Failed to generate branch name"; return 1; fi; }; f'';
+    };
+    extraConfig = {
+      git-town = {
+        sync-tags = false;
+        contribution-regex = "^(pub/sandbox)$";
+        sync-feature-strategy = "merge";
+      };
+    };
+  };
+}
diff --git a/nix/hm/git.nix b/nix/hm/git.nix
index c568ac2a..806b4d02 100644
--- a/nix/hm/git.nix
+++ b/nix/hm/git.nix
@@ -11,7 +11,6 @@ let
 in
 {
   programs.fish.shellAliases = {
-    gt = "git-town";
     ai-commit = "aichat --role git-commit -S -c (${bashScriptsDir}/git-commit-context.sh) | ${bashScriptsDir}/git-commit-chunk-text.sh";
     gcd = "cd-gitroot";
     git-conflict-rm = "git status | grep 'deleted by us' | sed 's/deleted by us: //' | xargs git rm";
@@ -34,7 +33,6 @@ in
   home.packages = with pkgs; [
     # github cli, manage repo, gists etc.
     gh
-    git-town
     # glab
     git-smash
     gnupg
@@ -54,7 +52,6 @@ in
     };
 
     aliases = {
-      hack = ''!f() { if [ -z "$1" ]; then echo "Usage: git hack <description>"; return 1; fi; branch_name=$(aichat --role git-branch -S -c "$*"); if [ $? -eq 0 ] && [ -n "$branch_name" ]; then date_suffix=$(date +%m%d); final_branch_name="$branch_name-$date_suffix"; git-town hack "$final_branch_name"; else echo "Failed to generate branch name"; return 1; fi; }; f'';
       co = "checkout";
       ad = "add";
       ada = "add -A";
@@ -209,7 +206,7 @@ in
         autoSetupRemote = true;
       };
       merge = {
-        autostash = true;
+        autostash = false;
         tool = "nvim";
         conflictstyle = "zdiff3";
         prompt = true;
@@ -264,10 +261,6 @@ in
       advice = {
         detachedHead = true;
       };
-      git-town = {
-        sync-tags = false;
-        contribution-regex = "^(pub/sandbox)$";
-      };
     };
 
     delta = {
diff --git a/nix/hm/jj.nix b/nix/hm/jj.nix
index cbb31b74..78dac1f7 100644
--- a/nix/hm/jj.nix
+++ b/nix/hm/jj.nix
@@ -16,9 +16,10 @@ in
   ];
   programs.fish.shellAliases = {
     jl = "jj log -n 8";
-    # j = "jj";
+    j = "jj";
     jj-mega-add = "jj-mega-merge -t m-m -f";
     jj-mega-rm = "jj-mega-merge -t m-m --remove";
+    jj-sq-on = "bash ${bashScriptsDir}/jj-split-on-bookmark.sh -ai";
   };
   programs.jujutsu = {
     # use master version
@@ -202,6 +203,56 @@ in
           ''
           ""
         ];
+        ai-ci = [
+          "util"
+          "exec"
+          "--"
+          "bash"
+          "-c"
+          ''
+            #!/usr/bin/env bash
+            set -euo pipefail
+
+            # Get the bash scripts directory
+            bashScriptsDir="$HOME/.local/bash/scripts"
+
+            if [[ $# -eq 0 ]]; then
+              # No revision provided - create interactive commit first
+              echo "No revision provided. Creating interactive commit..."
+
+              # Run interactive commit (let it be truly interactive)
+              if ! jj commit -m 'WIP: empty message' --color=never --no-pager -i; then
+                exit_code=$?
+                echo "Interactive commit failed or was cancelled" >&2
+                exit $exit_code
+              fi
+
+              # Now get the status output to extract parent commit ID
+              output=$(jj status --color=never --no-pager 2>&1)
+
+              # Extract the parent commit ID from the output
+              # Looking for pattern like: "Parent commit (@-): pknnznu 1c577a2 (empty) WIP: empty message"
+              rev=$(echo "$output" | grep -E "Parent commit.*:" | sed -E 's/Parent commit \(@-\): ([a-z0-9]+) .*/\1/')
+
+              if [[ -z "$rev" ]]; then
+                echo "Error: Could not extract parent commit ID from jj output" >&2
+                echo "Output was: $output" >&2
+                exit 1
+              fi
+
+              echo "[AI] Using rev: $rev"
+            else
+              # Revision provided as argument
+              rev="$1"
+            fi
+
+            # Generate commit message using aichat with jj context and apply it
+            "$bashScriptsDir/jj-commit-context.sh" "$rev" | \
+            aichat --role git-commit -S -c | \
+            "$bashScriptsDir/jj-ai-commit.sh" "$rev"
+          ''
+          ""
+        ];
         mv-back = [
           "bookmark"
           "move"
@@ -334,7 +385,7 @@ in
         # 2 create a new rev from the bookmark, jj new --from <bookmark>
         # 3 move the bookmark to the new rev, jj bookmark move <bookmark> --to <new-rev>
         # NOTE: log each command with echo
-        new-from-bookmark = [
+        nb = [
           "util"
           "exec"
           "--"
@@ -369,8 +420,8 @@ in
               echo "jj new --no-edit -r $bookmark --message \"$msg\""
               output=$(jj new --no-edit -r "$bookmark" --message "$msg" 2>&1)
             else
-              echo "jj new --no-edit -r $bookmark"
-              output=$(jj new --no-edit -r "$bookmark" 2>&1)
+              echo "jj new --no-edit -r $bookmark -m \"WIP: empty message\""
+              output=$(jj new --no-edit -r "$bookmark" -m "WIP: empty message" 2>&1)
             fi
 
             rev=$(echo "$output" | grep -Eo 'Created new commit [a-z0-9]+' | sed 's/Created new commit //')
diff --git a/nix/hm/lazygit.nix b/nix/hm/lazygit.nix
index 9715ca21..0c4bca4e 100644
--- a/nix/hm/lazygit.nix
+++ b/nix/hm/lazygit.nix
@@ -1,29 +1,26 @@
-{ pkgs-stable, config, ... }:
+{ config, ... }:
 let
   bashScriptsDir = "${config.home.homeDirectory}/.local/bash/scripts";
   aichatSelectCommit = [
     {
       key = "<c-a>";
-      description = "Pick AI commit";
+      description = "Auto commit with AI";
       command = ''
-        echo "Running commit suggestion..." > /tmp/lazygit-debug.log
-        aichat --role git-commit -S -c "$(${bashScriptsDir}/git-commit-context.sh)" 2>> /tmp/lazygit-debug.log | \
-            fzf --tmux --height 80% --border --ansi --preview "echo {}" --preview-window=up:wrap \
-            | {
-                read -r selected_msg
-                if [ -n "$selected_msg" ]; then
-                    echo "$selected_msg" | ${bashScriptsDir}/git-commit-chunk-text.sh
-                    if [ $? -ne 0 ]; then
-                        echo "Failed to commit."
-                        exit 1
-                    fi
-                else
-                    echo "No commit message selected."
-                fi
-            }
+        bash -c '
+          set -euo pipefail
+          echo "Running commit suggestion..." >&2
+          if ! command -v aichat >/dev/null 2>&1; then
+            echo "Error: aichat command not found" >&2
+            exit 1
+          fi
+          "${bashScriptsDir}/git-commit-context.sh" | \
+          aichat --role git-commit -S | \
+          "${bashScriptsDir}/git-commit-chunk-text.sh"
+        ' 2>> /tmp/lazygit-debug.log
       '';
       context = "files";
-      subprocess = true;
+      output = "log";
+      loadingText = "Generating commit suggestion";
     }
   ];
   gitTownCommands = [
@@ -32,7 +29,7 @@ let
       context = "global";
       description = "Git-Town sync";
       command = "git-town sync --all";
-      stream = true;
+      output = "log";
       loadingText = "Syncing";
     }
     {
@@ -47,7 +44,7 @@ let
           body = "Are you sure you want to Undo the last git-town command?";
         }
       ];
-      stream = true;
+      output = "log";
       loadingText = "Undoing Git-Town Command";
     }
     {
@@ -55,7 +52,7 @@ let
       context = "global";
       description = "Git-Town Repo (opens the repo link)";
       command = "git-town repo";
-      stream = true;
+      output = "log";
       loadingText = "Opening Repo Link";
     }
     {
@@ -70,7 +67,7 @@ let
         }
       ];
       command = "git-town append {{.Form.BranchName}}";
-      stream = true;
+      output = "log";
       loadingText = "Appending";
     }
     {
@@ -85,7 +82,7 @@ let
         }
       ];
       command = "git-town hack {{.Form.BranchName}}";
-      stream = true;
+      output = "log";
       loadingText = "Hacking";
     }
     {
@@ -100,7 +97,7 @@ let
           body = "Are you sure you want to delete the current feature branch?";
         }
       ];
-      stream = true;
+      output = "log";
       loadingText = "Deleting Feature Branch";
     }
     {
@@ -108,7 +105,7 @@ let
       context = "localBranches";
       description = "Git-Town Propose (creates a pull request)";
       command = "git-town propose";
-      stream = true;
+      output = "log";
       loadingText = "Creating pull request";
     }
     {
@@ -123,7 +120,7 @@ let
         }
       ];
       command = "git-town prepend {{.Form.BranchName}}";
-      stream = true;
+      output = "log";
       loadingText = "Prepending";
     }
     {
@@ -131,7 +128,7 @@ let
       context = "localBranches";
       description = "Git-Town Skip (skip branch with merge conflicts when syncing)";
       command = "git-town skip";
-      stream = true;
+      output = "log";
       loadingText = "Skipping";
     }
     {
@@ -139,7 +136,7 @@ let
       context = "files";
       description = "Git-Town GO aka:continue (continue after resolving merge conflicts)";
       command = "git-town continue";
-      stream = true;
+      output = "log";
       loadingText = "Continuing";
     }
   ];
@@ -147,7 +144,7 @@ in
 {
   # docs: https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md
   programs.lazygit = {
-    package = pkgs-stable.lazygit;
+    # package = pkgs-stable.lazygit;
     enable = true;
     settings = {
       gui = {
@@ -155,38 +152,45 @@ in
           selectedLineBgColor = [
             "#343A51"
           ];
-          selectedRangeBgColor = [
-            "#343A51"
-          ];
         };
         mouseEvents = true;
         showFileTree = true;
-        commitHashLength = 6;
+        commitHashLength = 7;
         showDivergenceFromBaseBranch = "arrowAndNumber";
-        enlargedSideViewLocation = "top";
-        showBottomLine = false;
+        enlargedSideViewLocation = "left";
+        showBottomLine = true;
         commandLogSize = 4;
         expandFocusedSidePanel = true;
         nerdFontsVersion = "3";
-        windowSize = "half"; # "full" | "half" | "default"
         border = "single";
-        animateExplosion = false;
+        animateExplosion = true;
         portraitMode = "auto"; # "never" | "always" | "auto"
         filterMode = "fuzzy"; # "fuzzy" | "substring(default)"
         statusPanelView = "dashboard"; # "dashboard" | "allBranchesLog"
+        showFileIcons = true; # Only relevant if nerdFontsVersion is not empty
+        showRandomTip = true;
+        showCommandLog = true;
+        showPanelJumps = true;
       };
       git = {
         merging = {
-          args = "--no-ff";
+          args = "--ff";
         };
         skipHookPrefix = "WIP";
         autoFetch = true;
         autoRefresh = true;
         fetchAll = false;
         paging = {
-          # colorArg = "always";
-          # externalDiffCommand = "difft --color=always";
+          colorArg = "always";
+          pager = "delta --paging=never";
         };
+        mainBranches = [
+          "master"
+          "main"
+        ];
+        autoForwardBranches = "onlyMainBranches"; # "none" | "onlyMainBranches" | "allBranches"
+        autoStageResolvedConflicts = true;
+        truncateCopiedCommitHashesTo = 12;
       };
       update = {
         method = "never";
@@ -211,7 +215,7 @@ in
             command = "nvim -c 'Gedit {{.SelectedCommit.Sha}}:{{.SelectedFile.Name}}'";
           }
         ]
-        ++ gitTownCommands
+        ++ (if config.vars.git-town.enable then gitTownCommands else [ ])
         ++ aichatSelectCommit;
       quitOnTopLevelReturn = false;
       disableStartupPopups = true;
diff --git a/nix/hm/shared.nix b/nix/hm/shared.nix
index 934c49e3..b0513620 100644
--- a/nix/hm/shared.nix
+++ b/nix/hm/shared.nix
@@ -25,8 +25,6 @@ in
   };
   home.packages =
     (with pkgs; [
-      # system info tool.
-      neofetch
       ## code counter
       scc
       # bore-cli
@@ -34,11 +32,11 @@ in
       # inetutils
       moreutils
       watchman
-      skim
+      # skim
       ## image support in terminal
       viu
       # concurrently
-      overmind
+      # overmind
       tig
       neovim-remote
       wget
@@ -53,7 +51,6 @@ in
       # docker-credential-helpers
       # harper
       uv
-      neofetch
       # docker
       # colima
       # kill process by port
diff --git a/nix/hm/starship.nix b/nix/hm/starship.nix
index 44898f2b..ac731adc 100644
--- a/nix/hm/starship.nix
+++ b/nix/hm/starship.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, config, ... }:
 let
   enable_starship = true;
 in
@@ -104,12 +104,13 @@ in
         disabled = true;
       };
       custom = {
-        git_town = {
+        gittown = {
+          disabled = !config.vars.git-town.enable;
           description = "Git Town";
           symbol = "🏘️";
           require_repo = true;
-          command = "git town status --pending";
-          format = "[$symbol($output )]($style)";
+          command = "git-town status --pending";
+          format = "[$symbol ($output)]($style)";
         };
       };
     };
diff --git a/nix/modules/config.nix b/nix/modules/config.nix
index 6cb81130..3b2cb09c 100644
--- a/nix/modules/config.nix
+++ b/nix/modules/config.nix
@@ -19,4 +19,10 @@
     type = lib.types.str;
     default = "nvim";
   };
+  options.vars.git-town = {
+    enable = lib.mkEnableOption {
+      description = "Whether to enable git-town";
+      default = false;
+    };
+  };
 }