erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:b3aa9a97d201b85642b879a6c9f41b73f692ea55
Branches Tags
erwin:main
..
compare: erwin:d39af34997852d481b7338d98e64ac854bd56637
Branches Tags
erwin:main

2 commits
b3aa9a97d2 ... d39af34997

Author SHA1 Message Date
Erwin Boskma
d39af34997
home: Enable jujutsu 2024-11-14 09:41:00 +01:00
Erwin Boskma
ba693ccad9
jujutsu: Disable ediff, fix difftastic config 2024-11-14 09:40:41 +01:00
2 changed files with 21 additions and 10 deletions
Show stats Expand all files Collapse all files

23
home-manager/modules/jujutsu/default.nix
View file

@ -40,6 +40,8 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.jujutsu = { programs.jujutsu = {
enable = true; enable = true;
ediff = false;
settings = { settings = {
user = { user = {
name = cfg.name; name = cfg.name;
@ -58,18 +60,19 @@ in
pager = lib.getExe pkgs.bat; pager = lib.getExe pkgs.bat;
}; };
diff.difftastic = { merge-tools = {
program = lib.getExe pkgs.difftastic; difftastic = {
diff-args = [ program = lib.getExe pkgs.difftastic;
"--color=auto" diff-args = [
"--background=dark" "--color=always"
"--display=side-by-side-show-both" "--background=dark"
"$left" "--display=side-by-side-show-both"
"$right" "$left"
]; "$right"
];
};
}; };
signing = { signing = {
sign-all = true; sign-all = true;
backend = cfg.signingBackend; backend = cfg.signingBackend;

8
users/erwin/home.nix
View file

@ -98,6 +98,13 @@ in
}; };
}; };
gpg.enable = true; gpg.enable = true;
jujutsu = {
enable = true;
name = "Erwin Boskma";
email = "erwin@datarift.nl";
signingKey = "~/.ssh/id_ed25519_sk_personal.pub";
signingBackend = "ssh";
};
mpd.enable = true; mpd.enable = true;
neovim.enable = true; neovim.enable = true;
nnn.enable = true; nnn.enable = true;
@ -274,6 +281,7 @@ in
# wineWowPackages.waylandFull # wineWowPackages.waylandFull
# winetricks # winetricks
wl-clipboard wl-clipboard
wlvncc
zeal zeal
zed-editor zed-editor