balkian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj: improve ux

Browse Source
This commit is contained in:
J. Fernando Sánchez
2026-02-11 10:17:45 +01:00
parent 1522c8d6a0
commit 9befba5522
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
home-manager/common.nix
View File

@@ -148,6 +148,11 @@
home.shellAliases = { home.shellAliases = {
lg = "lazygit"; lg = "lazygit";
gs = "git status"; gs = "git status";
j = "jj";
js = "jj status";
jt = "jj tug";
jf = "jj git fetch";
jl = "jj log";
}; };
programs.fish = { programs.fish = {
@@ -173,7 +178,12 @@
#programs.helix.enable = true; #programs.helix.enable = true;
#programs.helix.defaultEditor = true; #programs.helix.defaultEditor = true;
programs.zoxide.enable = true; programs.zoxide = {
enable = true;
options = [
"--cmd z"
];
};
programs.bash = { programs.bash = {
enable = true; enable = true;
initExtra = '' initExtra = ''

7
jj/.config/jj/config.toml
View File

@@ -10,11 +10,18 @@ email = "j@sanchezrada.es"
name = "J. Fernando Sánchez" name = "J. Fernando Sánchez"
email = "f.sanchez@thechannelstore.tv" email = "f.sanchez@thechannelstore.tv"
[aliases]
tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]
l = ["log"]
s = ["status"]
f = ["git", "fetch"]
p = ["git", "push"]
[ui] [ui]
pager = "delta" #":builtin" pager = "delta" #":builtin"
diff-formatter=":git" diff-formatter=":git"
paginate = "auto" paginate = "auto"
default-command = ["log", "--reversed"]
[merge-tools.delta] [merge-tools.delta]
diff-args=["--color-only", "--side-by-side", "$left", "$right", "--width=$width"] diff-args=["--color-only", "--side-by-side", "$left", "$right", "--width=$width"]