add some jj aliases

flake.nix

@@ -13,29 +13,6 @@
 
   outputs = inputs@{ self, nix-darwin, nixpkgs, home-manager, nixvim }:
   {
-    darwinConfigurations."tid27880sperrau" = nix-darwin.lib.darwinSystem {
-      modules = [
-        {
-          system.configurationRevision = self.rev or self.dirtyRev or null;
-        }
-        ./nix-darwin
-        ./nix-darwin/hosts/tid27880sperrau
-        home-manager.darwinModules.home-manager
-        {
-          users.users.sperrault.home = "/Users/sperrault";
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            backupFileExtension = "before-home-manager";
-            extraSpecialArgs = {
-              inherit nixvim;
-            };
-            users.sperrault = import ./home-manager/users/sperrault.nix;
-          };
-        }
-      ];
-    };
-
     darwinConfigurations."Sloanes-MacBook-Air" = nix-darwin.lib.darwinSystem {
       modules = [
         {

home-manager/default.nix

@@ -35,17 +35,6 @@
 
   programs.fish = {
     enable = true;
-    plugins = [
-      {
-        name = "transient.fish";
-        src = pkgs.fetchFromGitHub {
-          owner = "zzhaolei";
-          repo = "transient.fish";
-          rev = "7091a1ef574e4c2d16779e59d37ceb567128c787";
-          hash = "sha256-rZqMQiVGEEYus5MxkpFhaXnjVStmsjWkGly4B6bjcks=";
-        };
-      }
-    ];
     interactiveShellInit = ''
       fish_vi_key_bindings
 
@@ -215,6 +204,7 @@
       revsets.log = "trunk() | ancestors(reachable(@ | mine(), mutable()), 2) | @";
       git = {
         push-bookmark-prefix = "sloane/push-";
+        push-new-bookmarks = true;
         private-commits = "wip | nocommit | dev-only";
       };
       revset-aliases = {
@@ -222,6 +212,15 @@
         nocommit = ''description(regex:"^\\[(nocommit|NOCOMMIT)\\]|(nocommit|NOCOMMIT):?")'';
         dev-only = ''description(regex:"^\\[(dev-only|DEV-ONLY)\\]|(dev-only|DEV-ONLY):?")'';
         current = ''(bookmarks() | wip | dev-only) & mine()'';
+        "closest_bookmark(to)" = "heads(::to & bookmarks())";
+      };
+      aliases = {
+        r = ["rebase"];
+        s = ["squash"];
+        n = ["new"];
+        e = ["edit"];
+        tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];
+        catchup = ["rebase" "-b" "all(current() ~immutable())" "-d" "trunk()" "--skip-emptied"];
       };
     };
   };

home-manager/users/sperrault.nix

@@ -1,12 +0,0 @@
-{ ... }:
-{
-  imports = [ ../default.nix ];
-  home = {
-    username = "sperrault";
-    homeDirectory = "/Users/sperrault";
-
-    sessionPath = [
-      "/Applications/Postgres.app/Contents/Versions/15/bin"
-    ];
-  };
-}

nix-darwin/hosts/tid27880sperrau/default.nix

@@ -1,38 +0,0 @@
-{ ... }: {
-  system.defaults = {
-    dock.persistent-apps = [
-      "/Applications/Firefox.app"
-      "/Applications/Things3.app"
-      "/System/Applications/Mail.app"
-      "/Applications/Fantastical.app"
-      "/Applications/Microsoft Outlook.app"
-      "/Applications/Microsoft Teams.app"
-      "/Applications/Slack.app"
-      "/Applications/Obsidian.app"
-      "/Applications/Ghostty.app"
-    ];
-  };
-
-  homebrew = {
-    brews = [
-      "make"
-      "wget"
-      "zlib"
-      "sqlite3"
-      "spatialindex"
-      "pcre"
-      "gdal"
-      "xz"
-    ];
-    casks = [
-      "chromedriver"
-      "discord"
-      "keycastr"
-      "mouseless@preview"
-      "netnewswire"
-      "postgres-unofficial"
-      "postico"
-      "slack"
-    ];
-  };
-}