From b8967c8e5c182b6d985a1641322c5c9de2c1dbf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 23 Mar 2021 21:00:21 +0100
Subject: [PATCH] feat: tmpfiles.d helper function

---
 configs/flix.nix  |  9 ++++++++-
 configs/radio.nix | 10 ++++++++--
 lib/default.nix   |  2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/configs/flix.nix b/configs/flix.nix
index d87d653..9cdc468 100644
--- a/configs/flix.nix
+++ b/configs/flix.nix
@@ -5,6 +5,7 @@ let
   indexFilename = "index";
   flixUser = "flix";
   flixGroup = "users";
+  inherit (import <niveum/lib>) tmpfilesConfig;
 in {
   fileSystems.${flixLocation} = {
     device = "prism.r:/export";
@@ -24,7 +25,13 @@ in {
   };
 
   systemd.tmpfiles.rules = [
-    "d '${cacheLocation}' 0750 ${flixUser} ${flixGroup} - -"
+    (tmpfilesConfig {
+      type = "d";
+      path = cacheLocation;
+      mode = "0750";
+      user = flixUser;
+      group = flixGroup;
+    })
   ];
 
   systemd.services.flix-index = {
diff --git a/configs/radio.nix b/configs/radio.nix
index e9a4947..21e10b9 100644
--- a/configs/radio.nix
+++ b/configs/radio.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config, ... }:
 let
-  inherit (import <niveum/lib>) nixpkgs-unstable;
+  inherit (import <niveum/lib>) nixpkgs-unstable tmpfilesConfig;
   radioStore = "/var/lib/radio";
   htgenPort = 8080;
   meddl = { streamPort = 8000; mpdPort = 6600; };
@@ -40,7 +40,13 @@ in
   ];
 
   systemd.tmpfiles.rules = [
-    "d '${radioStore}' 0755 ${config.users.extraUsers.radio.name} - 1d -"
+    (tmpfilesConfig {
+      type = "d";
+      path = radioStore;
+      mode = "0755";
+      user = config.users.extraUsers.radio.name;
+      age = "1d";
+    })
   ];
 
   users.extraUsers.radio.isSystemUser = true;
diff --git a/lib/default.nix b/lib/default.nix
index bc03860..7ca321b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -5,6 +5,8 @@ rec {
   };
   nixpkgs-unstable = import nixpkgs-src { config.allowUnfree = true; };
 
+  tmpfilesConfig = {type, path, mode ? "-", user ? "-", group ? "-", age ? "-", argument ? "-"}: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
+
   sshPort = 22022;
 
   colours = import ./colours/mac-os.nix;