From ecd03b901d29e20d140b3ed68b8a4aa89e643e8e Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Tue, 5 Nov 2024 17:05:47 +0100 Subject: [PATCH] Remove git-fs-monitor --- flake.lock | 59 ++-------------------------- flake.nix | 10 ----- home-manager/modules/git/default.nix | 5 --- 3 files changed, 3 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index d9b2db0..1998dac 100644 --- a/flake.lock +++ b/flake.lock @@ -72,27 +72,6 @@ } }, "crane": { - "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_2": { "inputs": { "flake-compat": "flake-compat_3", "flake-utils": [ @@ -122,7 +101,7 @@ "type": "github" } }, - "crane_3": { + "crane_2": { "inputs": { "nixpkgs": [ "pamedia", @@ -344,37 +323,6 @@ "type": "github" } }, - "git-fs-monitor": { - "inputs": { - "crane": "crane", - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": [ - "pre-commit-hooks" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1711698730, - "narHash": "sha256-/rCvMprkNJHIJUIUB+jjzv1ZSZkcIK5wMn3I/QoAsFk=", - "ref": "main", - "rev": "5807cf59b93d937b3804e7b73e30221337c598ad", - "revCount": 5, - "type": "git", - "url": "https://git.datarift.nl/erwin/git-fs-monitor.git" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://git.datarift.nl/erwin/git-fs-monitor.git" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -398,7 +346,7 @@ }, "ha-now-playing": { "inputs": { - "crane": "crane_2", + "crane": "crane", "flake-utils": [ "flake-utils" ], @@ -625,7 +573,7 @@ }, "pamedia": { "inputs": { - "crane": "crane_3", + "crane": "crane_2", "flake-parts": [ "flake-parts" ], @@ -684,7 +632,6 @@ "eww": "eww", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_2", - "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 070f47d..fc1bba0 100644 --- a/flake.nix +++ b/flake.nix @@ -121,16 +121,6 @@ rust-overlay.follows = "rust-overlay"; }; }; - - git-fs-monitor = { - url = "git+https://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 825efc4..02dfba8 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -125,11 +125,6 @@ in editor = "${editor}"; 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";