leaner
parent
41b41d5939
commit
bf812d1e88
16
.sops.yaml
16
.sops.yaml
|
@ -1,16 +0,0 @@
|
|||
keys:
|
||||
- &htran-mbp age1jpm9mtxz6n8vncrk6pk7dppj3r7qxfj5hsgvcdulmp3lxvxez94qvxlgay
|
||||
- &htran age1jw958shpwu7st8sc4z0fufuswmfpxfc9wl3df9g3f3y57m45j92syr0mng
|
||||
- &bao age1umzkd4k0xt6uv5de85fpc4uztrph86nsd79h5f8cpuvtpy8n6adss7q2fv
|
||||
- &root_bao age1vx7e6vz9zptwqd0cakjj8erqv58cstddama8zcrppc36rqqmlvjs53x9u0
|
||||
- &htran1 age1vkd39dmrft3uk5wnfqppharn38dhrh78ev6pl85u005jhcge5e9qz4lt79
|
||||
creation_rules:
|
||||
- path_regex: .*
|
||||
key_groups:
|
||||
- age:
|
||||
- *htran
|
||||
- *htran-mbp
|
||||
- *bao
|
||||
- *root_bao
|
||||
- *htran1
|
||||
|
19
README.md
19
README.md
|
@ -9,6 +9,25 @@ a bit more experiment on NixOS, I'll keep this repository as simple as possible.
|
|||
([`init.lua`](./native_configs/neovim/init.lua), [`sshconfig`](./native_configs/ssh/config),...)
|
||||
to be idempotent for Nix and non-Nix targets.
|
||||
|
||||
## Bleed-first development
|
||||
|
||||
NOTE: this is extremely bleeding edge with many different branches that are probably
|
||||
stale. This is because I'm breaking all the time and wanted my `master` branch
|
||||
to be simply "minimally" available, regardless of what features I implemented later
|
||||
on.
|
||||
|
||||
Currently, `master` is probably not as stable as we all want it to be.
|
||||
|
||||
`bleed` was created as I moved onto using [`gh:divnix/std`](https://github.com/divnix/std)
|
||||
which introduced more explorations to make it backward compatible
|
||||
|
||||
`lean` was created in the process of merging `bleed` back onto `master`. Couple
|
||||
of my infra on Linode are spun down due to Akamai's increased cost, so I try
|
||||
to keep everything lean, while having an available branch (`bleed`) to look
|
||||
back to if I need to do anything fancy. `lean` here means it's minimal to the
|
||||
best of its ability by having only functional code.
|
||||
|
||||
|
||||
## Nix
|
||||
|
||||
Monorepo that contains my commonly used personal environments.
|
||||
|
|
25
docs/DEV.md
25
docs/DEV.md
|
@ -34,3 +34,28 @@ documentations and defaults
|
|||
|
||||
- `mkShell` doesn't care about `packages`, `nativeBuildInputs`, `buildInputs`
|
||||
|
||||
## Archive a branch
|
||||
|
||||
Very common to see branches getting stale. We either want to have them become
|
||||
PR or just have them stale and not deleted (for maximal data collection if
|
||||
needed)
|
||||
|
||||
Hence, here's the aspect of archiving a branch, that also reflects remote branch
|
||||
|
||||
```bash
|
||||
# archive. Feel free to just rename the BRANCH_NAME here
|
||||
BRANCH_NAME="boost"
|
||||
git tag "archive/$BRANCH_NAME" $BRANCH_NAME
|
||||
git branch -D $BRANCH_NAME
|
||||
# Now delete at origin
|
||||
git branch -d -r "origin/$BRANCH_NAME"
|
||||
git push --tags
|
||||
git push origin :$BRANCH_NAME
|
||||
|
||||
# restore
|
||||
BRANCH_NAME="hello_world"
|
||||
git fetch origin
|
||||
git checkout -b "$BRANCH_NAME" "archive/$BRANCH_NAME"
|
||||
```
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue