diff --git a/lib/default.nix b/lib/default.nix index ac518f2..5f4e218 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1 +1 @@ -inputs: [ (import ./misc.nix inputs) ] +_inputs: [ ] diff --git a/lib/misc.nix b/lib/misc.nix deleted file mode 100644 index 44a8994..0000000 --- a/lib/misc.nix +++ /dev/null @@ -1,9 +0,0 @@ -_inputs: _self: super: -let - writeText = text: (super.writeText (builtins.hashString "sha256" "${text}") "${text}"); -in -{ - lib = super.lib // { - inherit writeText; - }; -} diff --git a/modules/smb-mounts.nix b/modules/smb-mounts.nix index 4698b7c..14fdd6b 100644 --- a/modules/smb-mounts.nix +++ b/modules/smb-mounts.nix @@ -88,6 +88,9 @@ in "dir_mode=0700" "credentials=${cfg.credentials}" "x-systemd.after=sys-devices-virtual-net-samba\\x2dpatrick.device" + "x-systemd.automount" + "x-systemd.mount-timeout=30" + "_netdev" ] ++ (optional (!cfg.automatic) "noauto"); in diff --git a/users/patrick/minion.nix b/users/patrick/minion.nix index 3e61106..dbff1f5 100644 --- a/users/patrick/minion.nix +++ b/users/patrick/minion.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: let # addon-path is base64 encode path - cfgFile = lib.writeText '' + cfgFile = pkgs.writeText "mimion.xml" '' 2 @@ -30,6 +30,7 @@ in # yet another program that uses the config file as a live state file # Why? home.activation.installMinionConfig = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + run mkdir -p .minion run cp -f ${cfgFile} .minion/minion.xml ''; }