Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Next #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
towry merged 5 commits into from
Apr 1, 2025
Merged

Next #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4b721e
jj alias
towry Mar 24, 2025
c3dee74
change mcp
towry Mar 26, 2025
5110498
update-font
towry Mar 26, 2025
c4c8cd0
enable stg
towry Mar 31, 2025
e6971f2
Merge branch 'main' into next
towry Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions conf/cursor/mcp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
{
"mcpServers": {
"filesystem": {
"command": "npx",
"args": [
"-y",
"@modelcontextprotocol/server-filesystem",
"/Users/towry/workspace/work"
]
},
"playwright": {
"command": "npx",
"args": ["-y", "@executeautomation/playwright-mcp-server"]
"args": ["-y", "@playwright/mcp@latest"]
},
"web_content_search": {
"command": "npx",
Expand Down
2 changes: 1 addition & 1 deletion conf/ghostty/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
26 changes: 12 additions & 14 deletions nix/hm/git.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ in
home.packages = with pkgs; [
# github cli, manage repo, gists etc.
gh
# stgit
stgit
git-smash
gnupg
# git-sim
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions nix/hm/jj.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ in
];
sq = [
"squash"
"-u"
];
unsq = [
"unsquash"
Expand Down