Compare commits

..

7 commits

Author SHA1 Message Date
85c38b1337 home: jujutsu: simplify 'jj jj' alias
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-07-21 14:02:14 +00:00
cdd9bf4209 home: jujutsu: explicitly create 'conf.d'
This is to serve as a reminder of _how_ to add a local configuration
file.
2025-07-21 14:02:14 +00:00
15e89f9c2e WIP: ADD NOTE FOR FUTURE SELF 2025-07-21 14:02:14 +00:00
04794e5401 home: jj: use verbose draft commit messages 2025-07-21 14:01:59 +00:00
8a0fe25168 WIP: add jujutsu (w/ Delta) 2025-07-21 14:01:59 +00:00
13b61346f5 home: tmux: increase history scrollback
All checks were successful
ci/woodpecker/push/check Pipeline was successful
Even *longer*.
2025-07-16 14:50:16 +00:00
979ae901c4 flake: bump inputs 2025-07-16 14:50:16 +00:00
2 changed files with 4 additions and 4 deletions

6
flake.lock generated
View file

@ -175,11 +175,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1752480373,
"narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
"lastModified": 1752644555,
"narHash": "sha256-oeRcp4VEyZ/3ZgfRRoq60/08l2zy0K53l8MdfSIYd24=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
"rev": "9100a4f6bf446603b9575927c8585162f9ec9aa6",
"type": "github"
},
"original": {

View file

@ -60,7 +60,7 @@ in
# FIXME: fetch prune/pruneTags?
# FIXME: pull.rebase=true? Probably true TBH
# FIXME: push.default=simple? Probably true TBH
# FIXME: conflict style? ui.conflict-marker-style=git is diff3/zdiff3
# FIXME: conflict style? ui.conflict-marker-style=git is diff3, not zdiff3. Default looks fine-ish
# FIXME: from ma_9's config, plus my own stuff
# snapshot = {