authorgravatar for git@paperclover.netclover caruso <git@paperclover.net> 2025-12-29 06:15:52-08:00
committergravatar for git@paperclover.netclover caruso <git@paperclover.net> 2026-01-30 20:26:53-08:00
log4ce547cd1090c98735622fc88e72ab9bf7e34b5a
tree2c3860c281d6257f2298c0fe8451a4f1d3dd3718
parent9687d552742d9dea6d65e2bb9efee9c31a03ff8f
signature Signed by SSH key SHA256:xbd+BjjhyBfwk7GVoURf9Yx0gzDerHbvYv7SddNWmAs

clover: stuff

4 files changed, 33 insertions(+), 49 deletions(-)

modules/home/default.nix+4-5
...@@ -140,12 +140,11 @@ in...@@ -140,12 +140,11 @@ in
140 jujutsu = {140 jujutsu = {
141 settings = {141 settings = {
142 user = {142 user = {
143 name = config.programs.git.settings.user.name;143 inherit (config.programs.git.settings.user) name email;
144 email = config.programs.git.settings.user.email;
145 };144 };
146 signing = lib.mkIf (config.programs.git.signing.key != null) {145 signing = lib.mkIf (config.programs.git.signing.format != null) {
147 inherit (config.programs.git.signing) key;146 backend = config.programs.git.signing.format;
148 backend = "gpg";147 key = "~/.ssh/id_ed25519.pub";
149 # signatures are slow, compute them on push instead of on change.148 # signatures are slow, compute them on push instead of on change.
150 behavior = "drop";149 behavior = "drop";
151 };150 };
users/clover/home.nix+29-42
...@@ -21,18 +21,15 @@ in...@@ -21,18 +21,15 @@ in
21 nh21 nh
22 autofmt22 autofmt
23 gnupg23 gnupg
24 nodejs_24
24 ];25 ];
25 # packages to install for desktop environments (non-server)26 # packages to install for desktop environments (non-server)
26 desktop = [27 desktop = [
27 lazygit
28 jjui
29 ];28 ];
30 # packages to install on all servers29 # packages to install on all servers
31 server = [ ];30 server = [ ];
32 # packages to install on macOS desktops31 # packages to install on macOS desktops
33 darwin = [32 darwin = [ ];
34 raycast
35 ];
36 # packages to install on linux desktops33 # packages to install on linux desktops
37 linux = [34 linux = [
38 ];35 ];
...@@ -109,46 +106,21 @@ in...@@ -109,46 +106,21 @@ in
109 command jj "$@"106 command jj "$@"
110 fi107 fi
111 }108 }
112
113 function push() {
114 command jj git push "$@" --dry-run
115 printf "Press any key to continue... "
116 read -r
117 if bash -c 'cd $(jj workspace root); bun local-ci'; then
118 command jj git push "$@"
119 fi
120 }
121
122 function pr() {
123 message=$(jj log -r '@' -T 'description' --no-graph)
124 if [[ -z "$message" ]] || [[ "$message" = "WIP:"* ]]; then
125 jj desc
126 message=$(jj log -r '@' -T 'description' --no-graph)
127 if [[ -z "$message" ]] || [[ "$message" = "WIP:"* ]]; then
128 exit
129 fi
130 fi
131 if [ -n "$1" ]; then
132 if [[ "clo"/* = "$1" ]]; then
133 branch="$1";
134 else
135 branch="clo/$1"
136 fi
137 command jj git push --named "$branch"=@
138 else
139 command jj git push -c @
140 branch="$(jj log -r '@-' -T 'bookmarks.join("\n")' --no-graph | head -1)"
141 fi
142 open "$(git remote get-url origin | sed 's/git@github\.com:/https:\/\/github.com\//' | sed 's/\.git$//')/compare/master...$branch?quick_pull=1&labels=awaiting+code+review,awaiting+functionality+review&body="
143 }
144 '';109 '';
145 };110 };
146111
147 # use a git-specific email
148 git = {112 git = {
113 # use a git-specific email
149 settings.user.email = "git@paperclover.net";114 settings.user.email = "git@paperclover.net";
150 settings.gpg.format = "ssh";115 settings.gpg.ssh.allowedSignersFile = "${pkgs.writeText "allowed_signers" ''
151 signing.signByDefault = true;116 git@paperclover.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAVa1aq1LEj/VXHJYlR5HJpK65lS/9jOL/dAB9ZS1chd
117 ''}";
118 # signing
119 signing = {
120 signByDefault = true;
121 key = "~/.ssh/id_ed25519";
122 format = "ssh";
123 };
152 };124 };
153125
154 jujutsu = {126 jujutsu = {
...@@ -221,6 +193,15 @@ in...@@ -221,6 +193,15 @@ in
221 revsets = {193 revsets = {
222 short-prefixes = "(trunk()..@)::";194 short-prefixes = "(trunk()..@)::";
223 };195 };
196 aliases = {
197 "ab" = [ "abandon" ];
198 # "ai" = [
199 # "util"
200 # "exec"
201 # "--"
202 # "~/jj-ai-sync.sh"
203 # ];
204 };
224 };205 };
225 };206 };
226207
...@@ -228,15 +209,21 @@ in...@@ -228,15 +209,21 @@ in
228 enable = true;209 enable = true;
229 enableDefaultConfig = false;210 enableDefaultConfig = false;
230 extraConfig = ''211 extraConfig = ''
212 Include ~/.orbstack/ssh/config*
213
231 SetEnv TERM=xterm-256color214 SetEnv TERM=xterm-256color
232 '';215 '';
233 matchBlocks = rec {216 matchBlocks = rec {
234 "*" = { };217 "*" = { };
235 zenith = {218 zenith = {
236 user = "clo";219 user = "clo";
237 port = 222;220 port = 22;
221 };
222 "git.paperclover.net" = zenith;
223 "paperclover.net" = {
224 user = "clo";
225 port = 22;
238 };226 };
239 "nas.paperclover.net" = zenith;
240 };227 };
241 };228 };
242 };229 };
users/clover/paperback/home.nix-1
...@@ -12,7 +12,6 @@...@@ -12,7 +12,6 @@
12 };12 };
13 home.packages = with pkgs; [13 home.packages = with pkgs; [
14 deno14 deno
15 nodejs_22
16 rustup15 rustup
17 typescript16 typescript
18 pm217 pm2
users/clover/work/home.nix-1
...@@ -19,7 +19,6 @@...@@ -19,7 +19,6 @@
19 }))19 }))
20 doppler20 doppler
21 deno21 deno
22 nodejs_24
23 rustup22 rustup
24 typescript23 typescript
25 ssm-session-manager-plugin24 ssm-session-manager-plugin