From f4193b5ef65fed49daf6bb026e4145003f5ceef3 Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Wed, 20 Mar 2024 23:44:34 +0100
Subject: [PATCH] util-linux might be better

---
 nixos/hosts/shodan/auto-mount.nix    | 2 +-
 nixos/hosts/shodan/configuration.nix | 1 -
 pkgs/auto-mount/default.nix          | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix
index 601fcf7..3ef57c0 100644
--- a/nixos/hosts/shodan/auto-mount.nix
+++ b/nixos/hosts/shodan/auto-mount.nix
@@ -15,7 +15,7 @@
     KERNEL=="nvme0n1p9|nvme0n1p1[0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service"
   '';
   systemd.services."external-drive-mount@" = {
-    path = with pkgs; [jq coreutils udisks bash flock auto-mount];
+    path = with pkgs; [jq coreutils udisks bash util-linux auto-mount];
     enable = true;
     description = "Mount External Drive on %i";
     script = "auto-mount add %i";
diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix
index aa32396..474e628 100644
--- a/nixos/hosts/shodan/configuration.nix
+++ b/nixos/hosts/shodan/configuration.nix
@@ -55,7 +55,6 @@
     alejandra
     btrfs-progs
     efitools
-    flock
     git
     git-filter-repo
     home-manager
diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix
index c61b32c..48c4ad1 100644
--- a/pkgs/auto-mount/default.nix
+++ b/pkgs/auto-mount/default.nix
@@ -4,7 +4,7 @@
   jq,
   coreutils,
   udisks,
-  flock,
+  util-linux,
   writeShellApplication,
 }:
 writeShellApplication
@@ -13,7 +13,7 @@ writeShellApplication
 
   name = "auto-mount";
 
-  runtimeInputs = [jq coreutils udisks flock];
+  runtimeInputs = [jq coreutils udisks util-linux];
 
   text = ''
     set -euo pipefail