Save detached HEAD changes

flake.lock

@@ -151,11 +151,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1759899363,
+        "lastModified": 1759997506,
-        "narHash": "sha256-ZVN7/pcvtGxo7phZrYL8SmPaOXNp/cYVsdgZkUTuNuc=",
+        "narHash": "sha256-dqWvB1CJI7ksD3ldqPwWjqM3WTTCEuqyGG8XumN8V5c=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "424dc615f7baf6b6b3954a99caaa6e695766698e",
+        "rev": "1ca8a5fabd35f99eb93af95f76320205cc99be01",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1759903608,
+        "lastModified": 1759987268,
-        "narHash": "sha256-TT5MEMIWkzWrjXS8J6kNKHYVqAf332hlJGMkXCs8CNM=",
+        "narHash": "sha256-SfR2OvP6Qu+G4u8Omo1jw4pWZhXeevRq86+2nliCuPo=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "89ee67d66a2135527e95bf9570fa2b6f34cc4ea0",
+        "rev": "950458f1c06229ddb0aaaf57108ad125cf23f5f4",
         "type": "github"
       },
       "original": {
@@ -228,11 +228,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759903222,
+        "lastModified": 1759997385,
-        "narHash": "sha256-pufSAv93NSb8ZD6YQwC7xA6/SCEGEr7/Xm2+E2GDHvY=",
+        "narHash": "sha256-wRxqHCD0iW+jsWa2hE1HinF90iz7+dfL/T9SA3hoH/E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "59f9c6722b8f24b0014f222715cc3158192f7396",
+        "rev": "f16815c7683f77a7cd8f204d9d1aca84f5908f6f",
         "type": "github"
       },
       "original": {
@@ -297,11 +297,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1759878636,
+        "lastModified": 1759927289,
-        "narHash": "sha256-yKMf+iG5KmQkMamtT8wWNFwyjSiluHyH683OcpJh/kQ=",
+        "narHash": "sha256-EWdwR9l+JG466rPuNmjjzDPvQAuh37lmhgWa2xeaMdk=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c074710027ce3047382326d1fcc1a4e174cccfcc",
+        "rev": "57006a3ace4a3c889ab61b70fd5d8b197de8314e",
         "type": "github"
       },
       "original": {

modules/darwin/home/default.nix

@@ -7,6 +7,7 @@
 in {
   imports = [
     ./ghostty.nix
+    ./zed.nix
   ];
 
   home = {

modules/darwin/home/zed.nix

@@ -0,0 +1,58 @@
+{pkgs, ...}:
+{
+  programs.zed-editor = {
+    enable = true;
+    extraPackages = [
+      pkgs.vtsls
+    ];
+    userSettings = {
+      theme = {
+        mode = "system";
+        light = "One Light";
+        dark = "Catppuccin Mocha";
+      };
+      buffer_font_family = "Iosevka Nerd Font";
+      buffer_font_size = 17;
+      ui_font_family = "Iosevka Nerd Font";
+      ui_font_size = 16;
+      vim_mode = true;
+      ssh_connections = [
+        {
+          host = "tahani";
+          projects = [
+            {
+              paths = [
+                "/home/cschmatzler/Projects/Personal/shnosh"
+              ];
+            }
+          ];
+        }
+      ];
+      format_on_save = "off";
+      buffer_font_features = {
+        calt = 0;
+      };
+      inlay_hints = {
+        enabled = true;
+        show_value_hints = true;
+        show_type_hints = true;
+        show_parameter_hints = true;
+        show_other_hints = true;
+        show_background = false;
+        edit_debounce_ms = 700;
+        scroll_debounce_ms = 50;
+        toggle_on_modifiers_press = {
+          control = false;
+          alt = false;
+          shift = false;
+          platform = false;
+          function = false;
+        };
+      };
+      telemetry = {
+        diagnostics = false;
+        metrics = false;
+      };
+    };
+  };
+}

modules/home/default.nix

@@ -12,8 +12,8 @@
     ./fish.nix
     ./fzf.nix
     ./git.nix
-    ./jjui.nix
+
-    ./jujutsu.nix
+
     ./mise.nix
     ./neovim
     ./opencode.nix

modules/home/git.nix

@@ -5,6 +5,7 @@ in {
     enable = true;
     ignores = ["*.swp"];
     userName = name;
+    userEmail = "christoph@schmatzler.com";
     lfs = {
       enable = true;
     };
@@ -13,10 +14,19 @@ in {
       core = {
         editor = "vim";
         autocrlf = "input";
+        pager = "delta";
       };
       # commit.gpgsign = true;
       pull.rebase = true;
       rebase.autoStash = true;
+      interactive.diffFilter = "delta --color-only";
+      delta = {
+        navigate = true;
+        line-numbers = true;
+        syntax-theme = "GitHub";
+        side-by-side = true;
+        pager = "less -FRX";
+      };
     };
   };
 

modules/home/jjui.nix

@@ -1,5 +0,0 @@
-{
-  programs.jjui = {
-    enable = true;
-  };
-}

modules/home/jujutsu.nix

@@ -1,19 +0,0 @@
-{
-  programs.jujutsu = {
-    enable = true;
-    settings = {
-      user = {
-        name = "Christoph Schmatzler";
-        email = "christoph@schmatzler.com";
-      };
-      diff = {
-        tool = "delta";
-      };
-      ui = {
-        default-command = "status";
-        diff-formatter = ":git";
-        pager = ["delta" "--pager" "less -FRX"];
-      };
-    };
-  };
-}

modules/home/neovim/mappings.nix

@@ -94,16 +94,7 @@
       options.desc = "Symbols (LSP, buffer)";
     }
     # g - git
-    {
+
-      mode = "n";
-      key = "<leader>gg";
-      action.__raw = ''
-        function()
-          require('toggleterm.terminal').Terminal:new({ cmd = 'jjui', direction = 'float' }):toggle()
-        end
-      '';
-      options.desc = "jjui";
-    }
     # l - lsp/formatter
     {
       mode = "n";

modules/home/starship.nix

@@ -5,7 +5,7 @@
     settings = {
       add_newline = true;
       command_timeout = 200;
-      format = "[$directory$\{custom.jj}]($style)$character";
+      format = "[$directory$git_commit$git_branch$git_status]($style)$character";
       character = {
         error_symbol = "[✗ ](bold #e64553)";
         success_symbol = "[❯](bold #40a02b)[❯](bold #df8e1d)[❯](bold #dc8a78)";
@@ -16,29 +16,18 @@
         repo_root_style = "bold cyan";
         repo_root_format = "[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) ";
       };
-      custom.jj = {
+      git_commit = {
-        command = ''
+        commit_hash_length = 4;
-          jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '
+        only_detached = false;
-            separate(" ",
+        tag_disabled = true;
-              change_id.shortest(4),
+        format = "[$hash]($style) ";
-              bookmarks,
+      };
-              "|",
+      git_branch = {
-              concat(
+        format = "[$branch]($style) ";
-                if(conflict, "💥"),
+        symbol = "";
-                if(divergent, "🚧"),
+      };
-                if(hidden, "👻"),
+      git_status = {
-                if(immutable, "🔒"),
+        format = "| [$all_status$ahead_behind]($style) ";
-              ),
-              raw_escape_sequence("\x1b[1;32m") ++ if(empty, "(empty)"),
-              raw_escape_sequence("\x1b[1;32m") ++ coalesce(
-                truncate_end(29, description.first_line(), "…"),
-                "(no description set)",
-              ) ++ raw_escape_sequence("\x1b[0m"),
-            )
-          '
-        '';
-        when = "jj --ignore-working-copy root";
-        symbol = "🥋";
       };
     };
   };

modules/nixos/home/default.nix

@@ -1,8 +1,4 @@
 {pkgs, ...}: {
-  imports = [
-    ./zellij.nix
-  ];
-
   home = {
     packages = pkgs.callPackage ../packages.nix {};
   };

modules/nixos/home/zellij.nix

@@ -1,5 +0,0 @@
-{
-  programs.zellij = {
-    enableFishIntegration = true;
-  };
-}

modules/packages.nix

@@ -2,9 +2,9 @@
 with pkgs; [
   (callPackage ./bin/open-project.nix {})
   age
+  amp-cli
   alejandra
   ast-grep
-  codex
   delta
   devenv
   dig
@@ -21,6 +21,7 @@ with pkgs; [
   hyperfine
   jq
   killall
+
   lsof
   nurl
   openssh