Update Flake input (nixpkgs, home-manager)

Changes

4 changed files (+16/-17)

• flake.lock
  • @@ -223,11 +223,11 @@
    ] }, "locked": { - "lastModified": 1758250706, - "narHash": "sha256-Jv/V+PNi5RyqCUK2V6YJ0iCqdLPutU69LZas85EBUaU=", + "lastModified": 1765860045, + "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=", "owner": "nix-community", "repo": "home-manager", - "rev": "363007f12930caf8b0ea59c0bf5be109c52ad0ef", + "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99", "type": "github" }, "original": {
  • @@ -315,11 +315,11 @@
    }, "nixpkgs_2": { "locked": { - "lastModified": 1761880412, - "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", "type": "github" }, "original": {
• modules/hm/vcs/git.nix
  • @@ -21,10 +21,7 @@
    programs.git = { enable = true; - # TODO: Migrate to "programs.difftastic.git.enable" - difftastic.enable = true; - - extraConfig = { + settings = { core.editor = if config.programs.neovim.enable then "nvim" else "vim"; init.defaultBranch = "trunk";
  • @@ -55,5 +52,10 @@
    in nvim ++ darwin ++ bazel; }; + + programs.difftastic = { + enable = true; + git.enable = true; + }; }; }
• modules/hm/vcs/identity.nix
  • @@ -23,9 +23,9 @@
    email = "pockawoooh@gmail.com"; in { - programs.git = { - userName = lib.mkDefault name; - userEmail = lib.mkDefault email; + programs.git.settings.user = { + name = lib.mkDefault name; + email = lib.mkDefault email; }; programs.jujutsu.settings.user = {
• modules/hm/vcs/jj.nix
  • @@ -24,16 +24,13 @@
    }: { config = { - # TODO: Migrate to "programs.difftastic" - home.packages = with pkgs; [ difftastic ]; - programs.jujutsu = { enable = true; settings = { ui = { diff-formatter = [ - "difft" + (lib.getExe pkgs.difftastic) "--color=always" "$left" "$right"