Compare commits
3 commits
b08d2ffe38
...
e962441ce1
Author | SHA1 | Date | |
---|---|---|---|
e962441ce1 | |||
77c73c2ea9 | |||
fe00695bde |
3 changed files with 20 additions and 7 deletions
12
flake.lock
generated
12
flake.lock
generated
|
@ -226,11 +226,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746171682,
|
"lastModified": 1747020534,
|
||||||
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
|
"narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "50eee705bbdbac942074a8c120e8194185633675",
|
"rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -303,11 +303,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746810718,
|
"lastModified": 1746957726,
|
||||||
"narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
|
"narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
|
"rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -123,9 +123,21 @@ in
|
||||||
# Jujutsu (alternative DVCS (git-compatible))
|
# Jujutsu (alternative DVCS (git-compatible))
|
||||||
jujutsu = {
|
jujutsu = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
# Use the more up to date version of jj
|
||||||
package = pkgs.unstable.jujutsu;
|
package = pkgs.unstable.jujutsu;
|
||||||
settings = {
|
settings = {
|
||||||
ui.pager = "bat";
|
ui = lib.mkMerge [
|
||||||
|
# If `bat` is available use it as the pager
|
||||||
|
(lib.mkIf config.programs.bat.enable { pager = "bat"; })
|
||||||
|
# if hunk.nvim is enabled use it as a diff editor
|
||||||
|
(lib.mkIf config.programs.nixvim.plugins.hunk.enable {
|
||||||
|
diff-editor = [
|
||||||
|
"nvim"
|
||||||
|
"-c"
|
||||||
|
"DiffEditor $left $right $output"
|
||||||
|
];
|
||||||
|
})
|
||||||
|
];
|
||||||
fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters;
|
fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters;
|
||||||
# mimic git commit --verbose by adding a diff
|
# mimic git commit --verbose by adding a diff
|
||||||
templates.draft_commit_description = ''
|
templates.draft_commit_description = ''
|
||||||
|
|
|
@ -174,6 +174,7 @@ in
|
||||||
mode = "virtualtext";
|
mode = "virtualtext";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
hunk.enable = true;
|
||||||
otter.enable = true;
|
otter.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue