From 1ff273fde02fdbe3e64b8661319d051d4767e943 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Thu, 28 Mar 2024 23:06:12 +0100 Subject: [PATCH] git: Add git-fs-monitor --- flake.lock | 55 +++++++++++++++++++++++++++- flake.nix | 10 +++++ home-manager/modules/git/default.nix | 7 ++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 3dbcee1..f445163 100644 --- a/flake.lock +++ b/flake.lock @@ -111,6 +111,27 @@ } }, "crane_2": { + "inputs": { + "nixpkgs": [ + "git-fs-monitor", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711586303, + "narHash": "sha256-iZDHWTqQj6z6ccqTSEOPOxQ8KMFAemInUObN2R9vHSs=", + "owner": "ipetkov", + "repo": "crane", + "rev": "a329cd00398379c62e76fc3b8d4ec2934260d636", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { "inputs": { "flake-compat": "flake-compat_4", "flake-utils": [ @@ -409,6 +430,37 @@ "type": "github" } }, + "git-fs-monitor": { + "inputs": { + "crane": "crane_2", + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": [ + "pre-commit-hooks" + ], + "rust-overlay": [ + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1711662933, + "narHash": "sha256-ZZRs5tAJElwsr0xs3wgUesAicPj9bkZ4DswTLSI00cI=", + "ref": "main", + "rev": "b3bdcdc4a31e995021ecbb7afedeabec5748eef9", + "revCount": 3, + "type": "git", + "url": "ssh://git@git.datarift.nl/erwin/git-fs-monitor.git" + }, + "original": { + "ref": "main", + "type": "git", + "url": "ssh://git@git.datarift.nl/erwin/git-fs-monitor.git" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -432,7 +484,7 @@ }, "ha-now-playing": { "inputs": { - "crane": "crane_2", + "crane": "crane_3", "flake-utils": [ "flake-utils" ], @@ -767,6 +819,7 @@ "eww": "eww", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_3", + "git-fs-monitor": "git-fs-monitor", "ha-now-playing": "ha-now-playing", "home-manager": "home-manager", "microvm": "microvm", diff --git a/flake.nix b/flake.nix index 2e92e14..29dc7c2 100644 --- a/flake.nix +++ b/flake.nix @@ -135,6 +135,16 @@ flake-parts.follows = "flake-parts"; }; }; + + git-fs-monitor = { + url = "git+ssh://git@git.datarift.nl/erwin/git-fs-monitor.git?ref=main"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; + rust-overlay.follows = "rust-overlay"; + pre-commit-hooks.follows = "pre-commit-hooks"; + }; + }; }; outputs = diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index b4947f1..73e7f9f 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -2,6 +2,7 @@ pkgs, config, lib, + flake-inputs, ... }: with lib; @@ -109,6 +110,12 @@ in core = { editor = "${config.eboskma.programs.emacs.package}/bin/emacsclient"; pager = "${pkgs.bat}/bin/bat"; + untrackedCache = true; + fsmonitor = + let + git-fs-monitor = flake-inputs.git-fs-monitor.packages.${pkgs.system}.default; + in + "${git-fs-monitor}/bin/git-fs-monitor"; }; merge = { ff = "only"; -- 2.47.0