From d4b721e6ddcf7d7fd65bc0da0b5db0aff7083b26 Mon Sep 17 00:00:00 2001 From: Towry Wang Date: Mon, 24 Mar 2025 13:49:27 +0800 Subject: [PATCH 1/4] jj alias --- nix/hm/jj.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/hm/jj.nix b/nix/hm/jj.nix index 6a543824..16882dd8 100644 --- a/nix/hm/jj.nix +++ b/nix/hm/jj.nix @@ -187,6 +187,7 @@ in ]; sq = [ "squash" + "-u" ]; unsq = [ "unsquash" From c3dee744bffe865ca381b52ccfd8395f6e4b652a Mon Sep 17 00:00:00 2001 From: Towry Wang Date: Wed, 26 Mar 2025 14:19:43 +0800 Subject: [PATCH 2/4] change mcp --- conf/cursor/mcp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cursor/mcp.json b/conf/cursor/mcp.json index 77ba01fe..ea7d8b6d 100644 --- a/conf/cursor/mcp.json +++ b/conf/cursor/mcp.json @@ -10,7 +10,7 @@ }, "playwright": { "command": "npx", - "args": ["-y", "@executeautomation/playwright-mcp-server"] + "args": ["-y", "@playwright/mcp@latest"] }, "web_content_search": { "command": "npx", From 5110498175339cdf5f825e6c65dd29ed4bef2f0c Mon Sep 17 00:00:00 2001 From: Towry Wang Date: Wed, 26 Mar 2025 17:59:48 +0800 Subject: [PATCH 3/4] update-font --- conf/cursor/mcp.json | 8 -------- conf/ghostty/config | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/conf/cursor/mcp.json b/conf/cursor/mcp.json index ea7d8b6d..20164456 100644 --- a/conf/cursor/mcp.json +++ b/conf/cursor/mcp.json @@ -1,13 +1,5 @@ { "mcpServers": { - "filesystem": { - "command": "npx", - "args": [ - "-y", - "@modelcontextprotocol/server-filesystem", - "/Users/towry/workspace/work" - ] - }, "playwright": { "command": "npx", "args": ["-y", "@playwright/mcp@latest"] diff --git a/conf/ghostty/config b/conf/ghostty/config index b436a7cd..914f0888 100644 --- a/conf/ghostty/config +++ b/conf/ghostty/config @@ -4,7 +4,7 @@ theme = dark:kanagawabones,light:solarized-light -font-family = "Berkeley Mono Nerd Font" +font-family = "Berkeley Mono" font-feature = "+calt" # font-family = "Maple Mono" # font-feature = "-zero, +calt, +cv01, +ss03, +ss06, +ss02, -cv35" From c4c8cd05f8cc099efb44604706cee1826972cec5 Mon Sep 17 00:00:00 2001 From: Towry Wang Date: Mon, 31 Mar 2025 09:33:22 +0800 Subject: [PATCH 4/4] enable stg --- nix/hm/git.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/nix/hm/git.nix b/nix/hm/git.nix index 069fc26d..05f9b9ff 100644 --- a/nix/hm/git.nix +++ b/nix/hm/git.nix @@ -27,7 +27,7 @@ in home.packages = with pkgs; [ # github cli, manage repo, gists etc. gh - # stgit + stgit git-smash gnupg # git-sim @@ -68,18 +68,19 @@ in # stash staged changes ss-staged = "stash --staged"; up = ''!git push -u origin HEAD:$(git rev-parse --abbrev-ref HEAD)''; - fu = ''!git status --short && git push -u --force-with-lease''; - pr = "pull --rebase"; + force-push = ''!git status --short && git push -u --force-with-lease''; + gp = ''!git status --short && git push -u --force-with-lease''; + pull-rebase = "pull --rebase"; pp = ''!git pull --no-tags --prune --ff origin $(git rev-parse --abbrev-ref HEAD)''; - px = ''pull --all --prune --no-tags''; + down = ''!git pull --no-tags --prune --ff origin $(git rev-parse --abbrev-ref HEAD)''; + pull-all-prune = ''pull --all --prune --no-tags''; pp-theirs = ''!git pull -X theirs --no-tags --ff origin $(git rev-parse --abbrev-ref HEAD)''; pp-ours = ''!git pull -X ours --no-tags --ff origin $(git rev-parse --abbrev-ref HEAD)''; ps = ''!git pull --autostash --no-tags origin $(git rev-parse --abbrev-ref HEAD)''; pf = ''!git pull --no-tags --ff-only $(git-rev-parse --abbrev-ref HEAD)''; - fa = "fetch --all --no-tags"; + fetch-all = "fetch --all --no-tags"; # fz = "fuzzy"; - ff = "fetch --no-tags"; - fp = "fetch --prune --prune-tags"; + fetch-prune = "fetch --prune --prune-tags"; mg = "merge --no-edit --ff"; mg-theirs = "merge --no-edit --ff -X theirs"; kill-merge = "merge --abort"; @@ -117,10 +118,6 @@ in mt = "mergetool"; mt-code = "mergetool --tool=code"; mt-cursor = "mergetool --tool=cursor"; - bi = "bisect"; - rp = "rev-parse"; - rl = "rev-list"; - rn = "name-rev"; rb = "rebase"; rbk = "rebase --skip"; rbc = "rebase --continue"; @@ -138,9 +135,10 @@ in # count commit diff between two branches commit-diff-count = ''!f() { git rev-list --count HEAD ^$1; }; f''; # create feat branch in format of feat/YYYYMMDD-short-description, also accept other git arguments - br-feat = "!f() { git checkout -b feat/$(date +%Y%m)-$1 $2; }; f"; - br-fix = "!f() { git checkout -b fix/$(date +%Y%m)-$1 $2; }; f"; - br-refactor = "!f() { git checkout -b refactor/$(date +%Y%m)-$1 $2; }; f"; + br-feat = "!f() { git checkout -b towry-feat-$(date +%Y%m)-$1 $2; }; f"; + br-fix = "!f() { git checkout -b towry-fix-$(date +%Y%m)-$1 $2; }; f"; + br-refactor = "!f() { git checkout -b towry-refactor-$(date +%Y%m)-$1 $2; }; f"; + br-chore = "!f() { git checkout -b towry-chore-$(date +%Y%m)-$1 $2; }; f"; # sync and rebase, for example: git sync-rebase origin master do: git fetch origin master && git rebase origin/master sync-rebase = "!f() { git fetch $1 $2 && git rebase $1/$2; }; f"; # commit convention