diff --git a/modules/functionality/ensure.nix b/modules/functionality/ensure.nix deleted file mode 100644 index d874bd7..0000000 --- a/modules/functionality/ensure.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; -with lib.our; -let - cfg = config.services.ensure; -in -{ - options.services.ensure = with types; { - enable = mkBoolOpt true; - directories = mkOpt (listOf str) [ ]; - }; - - config.systemd.services = { - "ensure-directories" = mkIf (cfg.enable && (length cfg.directories > 0)) { - description = "Ensures certain directories exist (${concatStringsSep "," cfg.directories})"; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "oneshot"; - script = "mkdir -p ${concatStringsSep " " cfg.directories}"; - }; - }; -} diff --git a/modules/global/general.nix b/modules/global/general.nix index 94bcbaa..48d323f 100644 --- a/modules/global/general.nix +++ b/modules/global/general.nix @@ -13,13 +13,15 @@ # Enable Early Out of Memory service earlyoom.enable = true; - # Ensure certain necessary directories always exist - ensure.directories = [ "/mnt" ]; - # Accept EULA for all minecraft servers minecraft-servers.eula = true; }; + # Ensure certain necessary directories always exist + systemd.tmpfiles.rules = [ + "d /mnt 0777 root root - -" + ]; + system.activationScripts = { # FIX: command-not-found database doesn't exist normally # FIXME: activation script doesn't work properly, and frequently errors diff --git a/readme.md b/readme.md index af7e605..a177f74 100644 --- a/readme.md +++ b/readme.md @@ -43,7 +43,6 @@ The real meat of the configuration, defines a bunch of NixOS modules that all ge Modules that create some sort of new functionality. -- `ensure.nix`: Takes a list of directories, and ensures they exist after boot. - `soft-serve.nix`: Runs the `soft-serve` git server. - `ssh-tunnel.nix`: Runs an SSH session for opening ports.