From 821a964af5766c1135572ffa22dd14a1cd230023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 25 Oct 2023 08:43:23 +0300 Subject: [PATCH] hm: remove watchman it should be enabled per-repo instead --- shared/home/default.nix | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/shared/home/default.nix b/shared/home/default.nix index 9c3bf48..9b3436f 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -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";