| author |  Natalie Marks <nmarks413@gmail.com> 2025-10-27 13:24:50-07:00 |
| committer | Natalie Marks <nmarks413@gmail.com> 2025-10-27 13:24:50-07:00 |
| log | e2b8565883a286f4b254a6c8dac2cf89696d0918 |
| tree | bd90b1184183215cbfce057722ccf96659a68776 |
| parent | d046afcbfaca4760a4357b5d653a7220f990ccc3 |
| parent | 970faf03945ee254b2d2e9e161cac7b7b590621a |
| signature | Commit is signed but in an unrecognized format. |
Merge branch 'main' of paperclover.dev:nix/config
3 files changed, 35 insertions(+), 12 deletions(-)
switch+5-4
| ... | @@ -1,16 +1,17 @@ | ... | @@ -1,16 +1,17 @@ |
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | set -e | ||
| 3 | cd "$(dirname "$0")" | ||
| 2 | nh_subcommand="os" | 4 | nh_subcommand="os" |
| 3 | fallback_command="nixos-rebuild" | 5 | fallback_command="nixos-rebuild" |
| 4 | hostname_file="$(dirname "$0")/.hostname" | ||
| 5 | if [ -n "$1" ]; then | 6 | if [ -n "$1" ]; then |
| 6 | hostname="$1" | 7 | hostname="$1" |
| 7 | elif [ -f "$hostname_file" ]; then | 8 | elif [ -f ".hostname" ]; then |
| 8 | hostname=$(cat "$hostname_file") | 9 | hostname=$(cat .hostname) |
| 9 | fi | 10 | fi |
| 10 | if [ -z "$hostname" ]; then | 11 | if [ -z "$hostname" ]; then |
| 11 | hostname="$(hostname)" | 12 | hostname="$(hostname)" |
| 12 | fi | 13 | fi |
| 13 | printf "%s" "$hostname" >"$hostname_file" | 14 | printf "%s" "$hostname" >.hostname |
| 14 | if [ "$(uname -o)" = "Darwin" ]; then | 15 | if [ "$(uname -o)" = "Darwin" ]; then |
| 15 | nh_subcommand="darwin" | 16 | nh_subcommand="darwin" |
| 16 | fallback_command="nix run .#darwin-rebuild" | 17 | fallback_command="nix run .#darwin-rebuild" |
users/clover/home.nix+28-6
| ... | @@ -48,9 +48,10 @@ in | ... | @@ -48,9 +48,10 @@ in |
| 48 | settings = { | 48 | settings = { |
| 49 | theme = "light:Farmhouse Light,dark:Challenger Deep"; | 49 | theme = "light:Farmhouse Light,dark:Challenger Deep"; |
| 50 | font-family = "AT Name Mono"; | 50 | font-family = "AT Name Mono"; |
| 51 | adjust-cursor-thickness = 1; | 51 | adjust-cursor-thickness = 2; |
| 52 | background-opacity = 0.9; | 52 | background-opacity = 0.95; |
| 53 | background-blur = true; | 53 | background-blur = true; |
| 54 | unfocused-split-opacity = 1; | ||
| 54 | }; | 55 | }; |
| 55 | }; | 56 | }; |
| 56 | 57 | ||
| ... | @@ -59,10 +60,16 @@ in | ... | @@ -59,10 +60,16 @@ in |
| 59 | enable = true; | 60 | enable = true; |
| 60 | shellAliases = { | 61 | shellAliases = { |
| 61 | switch = "~/config/switch"; | 62 | switch = "~/config/switch"; |
| 62 | gg = "lazygit"; | 63 | |
| 63 | ga = "git add"; | 64 | # move a bookmark from the previous commit |
| 64 | g = "git status"; | 65 | jf = "jj git fetch"; |
| 65 | gp = "git pull --rebase && git push"; | 66 | e = "jj edit"; |
| 67 | d = "jj desc"; | ||
| 68 | bup = "jj b m --from 'parents(@)' --to '@'"; | ||
| 69 | push = "jj git push"; | ||
| 70 | moveself = "jj rebase -r @ -d"; | ||
| 71 | logall = "jj log -r 'all()'"; | ||
| 72 | cherry = "jj git fetch && jj split -i -p -m 'SPLIT_CHANGES' && jj edit -r 'description(\"SPLIT_CHANGES\")' && jj desc -m '' --edit"; | ||
| 66 | }; | 73 | }; |
| 67 | initContent = '' | 74 | initContent = '' |
| 68 | export PS1="%{$(tput setaf 207)%}%m%{$(tput setaf 15)%}:%{$(tput setaf 87)%}%~ %{$(tput sgr0)%}$ " | 75 | export PS1="%{$(tput setaf 207)%}%m%{$(tput setaf 15)%}:%{$(tput setaf 87)%}%~ %{$(tput sgr0)%}$ " |
| ... | @@ -74,6 +81,21 @@ in | ... | @@ -74,6 +81,21 @@ in |
| 74 | fi | 81 | fi |
| 75 | uv run --project "$dirname" "$@" | 82 | uv run --project "$dirname" "$@" |
| 76 | } | 83 | } |
| 84 | |||
| 85 | function pr() { | ||
| 86 | message=$(jj log -r '@' -T 'description' --no-graph) | ||
| 87 | if [[ -z "$message" ]] || [[ "$message" = "WIP:"* ]]; then | ||
| 88 | jj desc | ||
| 89 | fi | ||
| 90 | if [ -n "$1" ]; then | ||
| 91 | jj git push --named "clo/$1"=@ | ||
| 92 | branch="clo/$1" | ||
| 93 | else | ||
| 94 | branch="$(jj log -r '@' -T '"clo/push-" ++ change_id.short()' --no-graph)" | ||
| 95 | jj git push -c @ | ||
| 96 | fi | ||
| 97 | open "$(git remote get-url origin | sed 's/git@github\.com:/https:\/\/github.com\//' | sed 's/\.git$//')/compare/master...$branch" | ||
| 98 | } | ||
| 77 | ''; | 99 | ''; |
| 78 | }; | 100 | }; |
| 79 | 101 |
users/clover/work/home.nix+2-2
| ... | @@ -10,10 +10,10 @@ | ... | @@ -10,10 +10,10 @@ |
| 10 | }; | 10 | }; |
| 11 | home.packages = with pkgs; [ | 11 | home.packages = with pkgs; [ |
| 12 | (bun.overrideAttrs (_: rec { | 12 | (bun.overrideAttrs (_: rec { |
| 13 | version = "1.1.17"; | 13 | version = "1.3.0"; |
| 14 | src = fetchurl { | 14 | src = fetchurl { |
| 15 | url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; | 15 | url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; |
| 16 | hash = "sha256-aULgRZ9evcGUhKJ6slLJOg3IEzUeNfIkJF8RDP3YUlo="; | 16 | hash = "sha256-hYSOP5ZIHvyr51pQD9O5S5u5VoaretCjiSl2x74VA2o="; |
| 17 | }; | 17 | }; |
| 18 | })) | 18 | })) |
| 19 | doppler | 19 | doppler |