motiejus
/
config
1
Fork 0
Code Packages Releases Activity

Revert "Revert "hm: remove watchman"" 

This reverts commit 9cca2a5850.
This commit is contained in:
Motiejus Jakštys 2023-10-26 11:42:55 +03:00 committed by Motiejus Jakštys
parent 9cca2a5850
commit bbc31af349
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
shared/home/default.nix
View File

@ -5,26 +5,7 @@
email,
devEnvironment,
...
}: let
queryWatchman = with pkgs; let
# TODO: this is a perl script which needs $LOCALE_ARCHIVE.
# As of writing, I have this in my ~/.bashrc:
# export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive
fsmon =
runCommand "fsmonitor-watchman"
{
src = "${git}/share/git-core/templates/hooks/fsmonitor-watchman.sample";
buildInputs = [gnused];
} ''
sed -e 's@^#!/usr/bin/perl@#!${perl}@' $src > $out
chmod +x $out
'';
in
writeShellScript "query-watchman" ''
export PATH=${pkgs.watchman}/bin:$PATH
exec ${fsmon.outPath} "$@"
'';
in {
}: {
home = {
inherit stateVersion;
@ -94,8 +75,6 @@ in {
userName = "Motiejus Jakštys";
aliases.yolo = "commit --amend --no-edit -a";
extraConfig = {
core.fsmonitor = queryWatchman.outPath;
core.untrackedcache = true;
rerere.enabled = true;
pull.ff = "only";
merge.conflictstyle = "diff3";