From 3d450c6f3d1d516a0c07f146debb5bd73d6c9e36 Mon Sep 17 00:00:00 2001
From: clover caruso <git@paperclover.net>
Date: Thu, 9 Oct 2025 16:12:25 -0700
Subject: [PATCH 1/2] clover: work things

---
 switch                     | 9 +++++----
 users/clover/home.nix      | 5 +++--
 users/clover/work/home.nix | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/switch b/switch
index bf5697d655d9362730c9db9854db34b7950154fc..04af03eb5978615a646d5094da65c81dc95f7d60 100755
--- a/switch
+++ b/switch
@@ -1,16 +1,17 @@
 #!/bin/sh
+set -e
+cd "$(dirname "$0")"
 nh_subcommand="os"
 fallback_command="nixos-rebuild"
-hostname_file="$(dirname "$0")/.hostname"
 if [ -n "$1" ]; then
   hostname="$1"
-elif [ -f "$hostname_file" ]; then
-  hostname=$(cat "$hostname_file")
+elif [ -f ".hostname" ]; then
+  hostname=$(cat .hostname)
 fi
 if [ -z "$hostname" ]; then
   hostname="$(hostname)"
 fi
-printf "%s" "$hostname" >"$hostname_file"
+printf "%s" "$hostname" >.hostname
 if [ "$(uname -o)" = "Darwin" ]; then
   nh_subcommand="darwin"
   fallback_command="nix run .#darwin-rebuild"
diff --git a/users/clover/home.nix b/users/clover/home.nix
index bf3d6838a0719a93f9c88a12d087b6345d6b36cd..5158945a91c454f9c5d31521ec2062e4db2066b8 100644
--- a/users/clover/home.nix
+++ b/users/clover/home.nix
@@ -48,9 +48,10 @@ in
       settings = {
         theme = "light:Farmhouse Light,dark:Challenger Deep";
         font-family = "AT Name Mono";
-        adjust-cursor-thickness = 1;
-        background-opacity = 0.9;
+        adjust-cursor-thickness = 2;
+        background-opacity = 0.95;
         background-blur = true;
+        unfocused-split-opacity = 1;
       };
     };
 
diff --git a/users/clover/work/home.nix b/users/clover/work/home.nix
index a5fb595349707f6b857c0e40e4208e08ccdeb756..f1f78f8ac0aaef5a8242939fa6e8f0cfb032132e 100644
--- a/users/clover/work/home.nix
+++ b/users/clover/work/home.nix
@@ -10,10 +10,10 @@
   };
   home.packages = with pkgs; [
     (bun.overrideAttrs (_: rec {
-      version = "1.1.17";
+      version = "1.2.23";
       src = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        hash = "sha256-aULgRZ9evcGUhKJ6slLJOg3IEzUeNfIkJF8RDP3YUlo=";
+        hash = "sha256-IvX6P/9ysNO45+D4BR7K3y5Bkg1HSsYttSeRRICckAU=";
       };
     }))
     doppler
-- 
2.54.0


From 970faf03945ee254b2d2e9e161cac7b7b590621a Mon Sep 17 00:00:00 2001
From: clover caruso <git@paperclover.net>
Date: Wed, 22 Oct 2025 18:18:44 -0700
Subject: [PATCH 2/2] work stuff

---
 users/clover/home.nix      | 29 +++++++++++++++++++++++++----
 users/clover/work/home.nix |  4 ++--
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/users/clover/home.nix b/users/clover/home.nix
index 5158945a91c454f9c5d31521ec2062e4db2066b8..5fb0d3e278fe30910d702ec5e12ed553fc1461e3 100644
--- a/users/clover/home.nix
+++ b/users/clover/home.nix
@@ -60,10 +60,16 @@ in
       enable = true;
       shellAliases = {
         switch = "~/config/switch";
-        gg = "lazygit";
-        ga = "git add";
-        g = "git status";
-        gp = "git pull --rebase && git push";
+
+        # move a bookmark from the previous commit
+        jf = "jj git fetch";
+        e = "jj edit";
+        d = "jj desc";
+        bup = "jj b m --from 'parents(@)' --to '@'";
+        push = "jj git push";
+        moveself = "jj rebase -r @ -d";
+        logall = "jj log -r 'all()'";
+        cherry = "jj git fetch && jj split -i -p -m 'SPLIT_CHANGES' && jj edit -r 'description(\"SPLIT_CHANGES\")' && jj desc -m '' --edit";
       };
       initContent = ''
         export PS1="%{$(tput setaf 207)%}%m%{$(tput setaf 15)%}:%{$(tput setaf 87)%}%~ %{$(tput sgr0)%}$ "
@@ -75,6 +81,21 @@ in
           fi
           uv run --project "$dirname" "$@"
         }
+
+        function pr() {
+          message=$(jj log -r '@' -T 'description' --no-graph)
+          if [[ -z "$message" ]] || [[ "$message" = "WIP:"* ]]; then
+            jj desc
+          fi
+          if [ -n "$1" ]; then
+            jj git push --named "clo/$1"=@
+            branch="clo/$1"
+          else
+            branch="$(jj log -r '@' -T '"clo/push-" ++ change_id.short()' --no-graph)"
+            jj git push -c @
+          fi
+          open "$(git remote get-url origin | sed 's/git@github\.com:/https:\/\/github.com\//' | sed 's/\.git$//')/compare/master...$branch"
+        }
       '';
     };
 
diff --git a/users/clover/work/home.nix b/users/clover/work/home.nix
index f1f78f8ac0aaef5a8242939fa6e8f0cfb032132e..3dcb3ea9c5e53de6b451d59bbcbb3d78a1cff0cf 100644
--- a/users/clover/work/home.nix
+++ b/users/clover/work/home.nix
@@ -10,10 +10,10 @@
   };
   home.packages = with pkgs; [
     (bun.overrideAttrs (_: rec {
-      version = "1.2.23";
+      version = "1.3.0";
       src = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        hash = "sha256-IvX6P/9ysNO45+D4BR7K3y5Bkg1HSsYttSeRRICckAU=";
+        hash = "sha256-hYSOP5ZIHvyr51pQD9O5S5u5VoaretCjiSl2x74VA2o=";
       };
     }))
     doppler
-- 
2.54.0