hm cleanup
This commit is contained in:
parent
4eedb65822
commit
5d7ab7c414
18 changed files with 534 additions and 328 deletions
|
|
@ -19,9 +19,14 @@
|
|||
};
|
||||
extraConfig.pull.rebase = true;
|
||||
};
|
||||
|
||||
home.packages = [ pkgs.watchman ];
|
||||
programs.jujutsu = {
|
||||
enable = true;
|
||||
settings = {
|
||||
core = {
|
||||
fsmonitor = "watchman";
|
||||
};
|
||||
user = {
|
||||
email = "cjriddz@protonmail.com";
|
||||
name = "iofq";
|
||||
|
|
@ -29,12 +34,21 @@
|
|||
operation = {
|
||||
username = "iofq";
|
||||
};
|
||||
signing = {
|
||||
behavior = "own";
|
||||
backend = "gpg";
|
||||
key = "cjriddz@protonmail.com";
|
||||
};
|
||||
ui = {
|
||||
default-command = ["log"];
|
||||
conflict-marker-style = "git";
|
||||
merge-editor = "vimdiff";
|
||||
diff-editor = "diffview";
|
||||
diff.format = "git";
|
||||
paginate = "never";
|
||||
movement = {
|
||||
edit = true;
|
||||
};
|
||||
};
|
||||
merge-tools.vimdiff = {
|
||||
program = "nvim";
|
||||
|
|
@ -65,8 +79,6 @@
|
|||
};
|
||||
aliases = {
|
||||
tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@"];
|
||||
ne = ["next" "--edit"];
|
||||
be = ["edit" "-r" "@-"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue