diff --git a/configs/hu-berlin.nix b/configs/hu-berlin.nix
index 37ae845..65ed76b 100644
--- a/configs/hu-berlin.nix
+++ b/configs/hu-berlin.nix
@@ -1,8 +1,8 @@
 { pkgs, lib, ... }:
 let
   eduroam = {
-    identity = lib.strings.removeSuffix "\n" (builtins.readFile <shared-secrets/eduroam/identity>);
-    password = lib.strings.removeSuffix "\n" (builtins.readFile <shared-secrets/eduroam/password>);
+    identity = lib.strings.fileContents <shared-secrets/eduroam/identity>;
+    password = lib.strings.fileContents <shared-secrets/eduroam/password>;
   };
   eduroamAuth = ''
     key_mgmt=WPA-EAP
diff --git a/configs/mail.nix b/configs/mail.nix
index 4da7b8e..e3402ee 100644
--- a/configs/mail.nix
+++ b/configs/mail.nix
@@ -1,6 +1,4 @@
 { config, pkgs, lib, ... }:
-let inherit (import <lib> { inherit lib; }) strip;
-in
 {
   environment.systemPackages = [
     pkgs.notmuch
@@ -27,7 +25,7 @@ in
       };
       msmtp.enable = true;
       notmuch.enable = true;
-      passwordCommand = "echo '${strip (builtins.readFile <shared-secrets/eduroam/password>)}'";
+      passwordCommand = "echo '${lib.strings.fileContents <shared-secrets/eduroam/password>}'";
       offlineimap = {
         enable = true;
         postSyncHookCommand = "notmuch new";
diff --git a/configs/traadfri.nix b/configs/traadfri.nix
index 1a73ee3..63763e9 100644
--- a/configs/traadfri.nix
+++ b/configs/traadfri.nix
@@ -6,7 +6,7 @@
     enable = true;
     user = "kmein";
     host = "192.168.178.28";
-    key = lib.strings.removeSuffix "\n" (builtins.readFile <shared-secrets/traadfri.key>);
+    key = lib.strings.fileContents <shared-secrets/traadfri.key>;
     rooms = {
       bedroom = 131074;
       corridor = 131076;
diff --git a/systems/catullus/containers.nix b/systems/catullus/containers.nix
index e50ed3a..99e5781 100644
--- a/systems/catullus/containers.nix
+++ b/systems/catullus/containers.nix
@@ -25,7 +25,7 @@ in {
   niveum.telegramBots.quotebot = {
     enable = true;
     time = "08/6:00";
-    token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram/kmein.token>);
+    token = lib.strings.fileContents <secrets/telegram/kmein.token>;
     chatIds = [ "18980945" "757821027" ];
     command = "${pkgs.literature-quote}/bin/literature-quote";
     parseMode = "Markdown";
@@ -34,7 +34,7 @@ in {
   niveum.telegramBots.autorenkalender = {
     enable = true;
     time = "07:00";
-    token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram/kmein.token>);
+    token = lib.strings.fileContents <secrets/telegram/kmein.token>;
     chatIds = [ "@autorenkalender" ];
     command = "${pkgs.autorenkalender}/bin/autorenkalender";
   };
@@ -42,7 +42,7 @@ in {
   systemd.services.telegram-odyssey = {
     wantedBy = [ "multi-user.target" ];
     description = "Telegram bot reciting the Odyssey to you";
-    environment.TELEGRAM_ODYSSEY_TOKEN = builtins.readFile <secrets/telegram/odyssey.token>;
+    environment.TELEGRAM_ODYSSEY_TOKEN = lib.strings.fileContents <secrets/telegram/odyssey.token>;
     enable = true;
     script = ''${pkgs.telegram-odyssey}/bin/telegram-odyssey'';
     serviceConfig.Restart = "always";
@@ -51,7 +51,7 @@ in {
   systemd.services.telegram-reverse = {
     wantedBy = [ "multi-user.target" ];
     description = "Telegram bot for reversing things";
-    environment.TELEGRAM_REVERSE_TOKEN = builtins.readFile <secrets/telegram/reverse.token>;
+    environment.TELEGRAM_REVERSE_TOKEN = lib.strings.fileContents <secrets/telegram/reverse.token>;
     enable = true;
     script = ''${pkgs.telegram-reverse}/bin/telegram-reverse'';
     serviceConfig.Restart = "always";
@@ -60,7 +60,7 @@ in {
   systemd.services.telegram-betacode = {
     wantedBy = [ "multi-user.target" ];
     description = "Telegram bot for converting Ancient Greek betacode into unicode";
-    environment.TELEGRAM_BETACODE_TOKEN = builtins.readFile <secrets/telegram/betacode.token>;
+    environment.TELEGRAM_BETACODE_TOKEN = lib.strings.fileContents <secrets/telegram/betacode.token>;
     enable = true;
     script = ''${pkgs.telegram-betacode}/bin/telegram-betacode'';
     serviceConfig.Restart = "always";
@@ -69,7 +69,7 @@ in {
   systemd.services.telegram-proverb = {
     wantedBy = [ "multi-user.target" ];
     description = "Telegram bot for generating inspiring but useless proverbs";
-    environment.TELEGRAM_PROVERB_TOKEN = builtins.readFile <secrets/telegram/proverb.token>;
+    environment.TELEGRAM_PROVERB_TOKEN = lib.strings.fileContents <secrets/telegram/proverb.token>;
     enable = true;
     script = ''${pkgs.telegram-proverb}/bin/proverb_bot.py'';
     serviceConfig.Restart = "always";