colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

git: populate with sane.fs instead of home-manager

Browse Source
This commit is contained in:
Colin
2023-01-27 07:55:38 +00:00
parent 76c0c3dc6a
commit aee928dac0
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/home-manager/git.nix
View File

@@ -1,20 +1,19 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, sane-lib, ... }:
let
mkCfg = lib.generators.toINI { };
in
lib.mkIf config.sane.home-manager.enable lib.mkIf config.sane.home-manager.enable
{ {
home-manager.users.colin.programs.git = { sane.fs."/home/colin/.config/git/config" = sane-lib.fs.wantedText (mkCfg {
enable = true; user.name = "Colin";
userName = "colin"; user.email = "colin@uninsane.org";
userEmail = "colin@uninsane.org"; alias.co = "checkout";
# difftastic docs:
aliases = { co = "checkout"; }; # - <https://difftastic.wilfred.me.uk/git.html>
extraConfig = { diff.tool = "difftastic";
# difftastic docs: difftool.prompt = false;
# - <https://difftastic.wilfred.me.uk/git.html> "difftool \"difftastic\"".cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
diff.tool = "difftastic"; # now run `git difftool` to use difftastic git
difftool.prompt = false; });
"difftool \"difftastic\"".cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
# now run `git difftool` to use difftastic git
};
};
} }

1
modules/packages.nix
View File

@@ -205,6 +205,7 @@ let
fd fd
file file
gawk gawk
git
gptfdisk gptfdisk
hdparm hdparm
htop htop