Update inputs, add Jujutsu, use Ghostty from Nix (#185)

ethnt · web-flow · commit 9808a44b5e8a · 2026-03-10T17:01:34.000-04:00
* Zed configuration tweaks

* Update inputs

* Add Jujutsu

* Remove jj-starship (for now)

* Use Ghostty from Nix
diff --git a/flake.lock b/flake.lock
diff --git a/modules/development/treefmt.nix b/modules/development/treefmt.nix
@@ -7,6 +7,7 @@
         inherit (config.flake-root) projectRootFile;
 
         programs = {
+          actionlint.enable = true;
           deadnix.enable = true;
           statix.enable = true;
           nixfmt = {
@@ -22,8 +23,7 @@
       formatter = inputs.treefmt.lib.mkWrapper pkgs treefmtConfig;
 
       devShells.treefmt = pkgs.mkShell {
-        nativeBuildInputs = with pkgs;
-          [ config.treefmt.build.wrapper ]
+        nativeBuildInputs = [ config.treefmt.build.wrapper ]
           ++ (builtins.attrValues config.treefmt.build.programs);
       };
     };
diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix
@@ -10,6 +10,8 @@
       };
     in {
       nixpkgs-master-darwin-linux-builder = nixpkgs-master.darwin.linux-builder;
+
+      inherit (nixpkgs-master) ghostty-bin;
     };
   };
 }
diff --git a/modules/profiles/home/ghostty.nix b/modules/profiles/home/ghostty.nix
@@ -1,16 +1,15 @@
-{
-  programs.fish.shellInit = ''
-    if set -q GHOSTTY_RESOURCES_DIR
-      source "$GHOSTTY_RESOURCES_DIR/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish"
-    end
-  '';
-
-  xdg.configFile."ghostty/config".text = ''
-    adjust-cell-height = 10
-    cursor-style = bar
-    font-family = PragmataPro Mono Liga
-    font-size = 16
-    theme = nord
-    window-padding-x = 8
-  '';
+{ pkgs, ... }: {
+  programs.ghostty = {
+    enable = true;
+    enableFishIntegration = true;
+    package = pkgs.ghostty-bin;
+    settings = {
+      adjust-cell-height = 10;
+      cursor-style = "bar";
+      font-family = "PragmataPro Mono Liga";
+      font-size = 16;
+      theme = "nord";
+      window-padding-x = 8;
+    };
+  };
 }
diff --git a/modules/profiles/home/jujutsu.nix b/modules/profiles/home/jujutsu.nix
@@ -0,0 +1,8 @@
+{
+  programs.jujutsu = {
+    enable = true;
+    settings = { user.name = "Ethan Turkeltaub"; };
+  };
+
+  programs.jjui.enable = true;
+}
diff --git a/modules/profiles/home/starship.nix b/modules/profiles/home/starship.nix
@@ -2,6 +2,6 @@
   programs.starship = {
     enable = true;
     enableFishIntegration = true;
-    settings.character.success_symbol = "[➜](bold green)";
+    settings = { nix_shell.symbol = "❄️ "; };
   };
 }
diff --git a/modules/profiles/home/zed-editor.nix b/modules/profiles/home/zed-editor.nix
@@ -28,7 +28,7 @@
       git.inline_blame.enabled = false;
 
       # File associations
-      file_types = { "Haskell" = [ "ghci" ]; };
+      file_types = { "Haskell" = [ "ghci" "persistentmodels" ]; };
 
       # Language-specific
       languages = {
@@ -50,7 +50,7 @@
       };
 
       # AI
-      show_edit_predictions = false;
+      disable_ai = true;
     };
   };
 }
diff --git a/modules/profiles/system/darwin/brew.nix b/modules/profiles/system/darwin/brew.nix
@@ -18,7 +18,7 @@
       "docker-desktop"
       "elgato-stream-deck"
       "emacs-mac-spacemacs-icon"
-      "ghostty"
+      # "ghostty"
       "fantastical"
       "firefox"
       "istat-menus"
diff --git a/modules/suites/home.nix b/modules/suites/home.nix
@@ -14,6 +14,7 @@ with profiles;
     ghostty
     helix
     lazygit
+    jujutsu
     navi
     paths
     rippkgs
diff --git a/users/et/home.nix b/users/et/home.nix
@@ -3,6 +3,7 @@
     base ++ development ++ identity ++ (with profiles; [ haskell nodejs ])
     ++ [ secrets.users.et.home ] ++ [
       ./profiles/git.nix
+      ./profiles/jujutsu.nix
       ./profiles/tmuxp.nix
       ./profiles/tools.nix
       ./profiles/vscode.nix
diff --git a/users/et/profiles/jujutsu.nix b/users/et/profiles/jujutsu.nix
@@ -0,0 +1 @@
+{ programs.jujutsu.settings.user.email = "et@mercury.com"; }
diff --git a/users/ethan/home.nix b/users/ethan/home.nix
@@ -1,7 +1,11 @@
 { suites, profiles, pkgs, ... }: {
   imports = (with suites; base ++ development ++ identity)
-    ++ (with profiles; [ elixir mise nodejs tools.media-management ruby ])
-    ++ [ ./profiles/git.nix ./profiles/tmuxp.nix ./profiles/vscode.nix ];
+    ++ (with profiles; [ elixir mise nodejs tools.media-management ruby ]) ++ [
+      ./profiles/git.nix
+      ./profiles/jujutsu.nix
+      ./profiles/tmuxp.nix
+      ./profiles/vscode.nix
+    ];
 
   home.packages = with pkgs; [ borgbackup nixd ];
 
diff --git a/users/ethan/profiles/jujutsu.nix b/users/ethan/profiles/jujutsu.nix
@@ -0,0 +1 @@
+{ programs.jujutsu.settings.user.email = "ethan@turkeltaub.dev"; }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`};`
`11`	`11`	`in {`
`12`	`12`	`nixpkgs-master-darwin-linux-builder = nixpkgs-master.darwin.linux-builder;`
	`13`	`+`
	`14`	`+ inherit (nixpkgs-master) ghostty-bin;`
`13`	`15`	`};`
`14`	`16`	`};`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`programs.starship = {`
`3`	`3`	`enable = true;`
`4`	`4`	`enableFishIntegration = true;`
`5`		`- settings.character.success_symbol = "[➜](bold green)";`
	`5`	`+ settings = { nix_shell.symbol = "❄️ "; };`
`6`	`6`	`};`
`7`	`7`	`}`
-Original file line number
+Diff line change
     ghostty
     helix
     lazygit
 +    jujutsu
     navi
     paths
     rippkgs