From 7f7b84548461de85cb1e9b464c6bf8c69fa772a4 Mon Sep 17 00:00:00 2001
From: Tim Keller <tjkeller.xyz>
Date: Thu, 9 Jan 2025 10:30:58 -0600
Subject: fix automount

---
 derivations/st/default.nix           | 47 ++++++++++++++++++++++++++++++++++++
 modules/hosts/T495/configuration.nix |  1 +
 modules/root/nas.nix                 |  2 +-
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 derivations/st/default.nix

diff --git a/derivations/st/default.nix b/derivations/st/default.nix
new file mode 100644
index 0000000..cf463ab
--- /dev/null
+++ b/derivations/st/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fontconfig,
+  libX11,
+  libXext,
+  libXft,
+  ncurses,
+  pkg-config,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "st";
+  version = "tj-0.9.2.0";
+
+  src = pkgs.fetchZip {
+    url = "https://git.tjkeller.xyz/${pname}/snapshot/${pname}-${version}.tar.xz";
+    sha256 = "sha256-xsUHdmicHX/fQQgojVjWfzI82e4NezkmlACOpdPxLE0=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+  buildInputs = [
+    fontconfig
+    libX11
+    libXext
+    libXft
+    ncurses
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    TERMINFO=$out/share/terminfo make install PREFIX=$out
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://git.tjkeller.xyz/st";
+    description = "My st with various patches";
+    mainProgram = "st";
+    license = licenses.mit;
+    maintainers = [ maintainers.tjkeller ];
+  };
+}
diff --git a/modules/hosts/T495/configuration.nix b/modules/hosts/T495/configuration.nix
index a3bad32..526b7bb 100644
--- a/modules/hosts/T495/configuration.nix
+++ b/modules/hosts/T495/configuration.nix
@@ -25,6 +25,7 @@
 	# Enable network drives
 	nas.enable = true;
 	nas.office.enable = true;
+	nas.office.automount = false;
 
 	networking.hosts = {
 		"192.168.77.3"  = [ "devel" ];
diff --git a/modules/root/nas.nix b/modules/root/nas.nix
index 525456e..0116ba3 100644
--- a/modules/root/nas.nix
+++ b/modules/root/nas.nix
@@ -3,7 +3,7 @@ let
 	mkNetworkFileSystem = device: automount: {
 		device = "${device}";
 		fsType = "nfs";
-		options = [ "defaults" ] ++ lib.optionals automount [ "noauto" ];
+		options = [ "defaults" ] ++ lib.optionals (!automount) [ "noauto" ];
 	};
 in {
 	options = {
-- 
cgit v1.2.3