kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-19 19:41:08 +01:00
Code Releases Activity

improvement: use lib.strings.fileContents wherever possible

Browse Source
This commit is contained in:
Kierán Meinhardt
2019-09-11 07:33:27 +02:00
parent 890da6c00d
commit ddb465367e
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configs/hu-berlin.nix
View File

@@ -1,8 +1,8 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
eduroam = { eduroam = {
identity = lib.strings.removeSuffix "\n" (builtins.readFile <shared-secrets/eduroam/identity>); identity = lib.strings.fileContents <shared-secrets/eduroam/identity>;
password = lib.strings.removeSuffix "\n" (builtins.readFile <shared-secrets/eduroam/password>); password = lib.strings.fileContents <shared-secrets/eduroam/password>;
}; };
eduroamAuth = '' eduroamAuth = ''
key_mgmt=WPA-EAP key_mgmt=WPA-EAP

4
configs/mail.nix
View File

@@ -1,6 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let inherit (import <lib> { inherit lib; }) strip;
in
{ {
environment.systemPackages = [ environment.systemPackages = [
pkgs.notmuch pkgs.notmuch
@@ -27,7 +25,7 @@ in
}; };
msmtp.enable = true; msmtp.enable = true;
notmuch.enable = true; notmuch.enable = true;
passwordCommand = "echo '${strip (builtins.readFile <shared-secrets/eduroam/password>)}'"; passwordCommand = "echo '${lib.strings.fileContents <shared-secrets/eduroam/password>}'";
offlineimap = { offlineimap = {
enable = true; enable = true;
postSyncHookCommand = "notmuch new"; postSyncHookCommand = "notmuch new";

2
configs/traadfri.nix
View File

@@ -6,7 +6,7 @@
enable = true; enable = true;
user = "kmein"; user = "kmein";
host = "192.168.178.28"; 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 = { rooms = {
bedroom = 131074; bedroom = 131074;
corridor = 131076; corridor = 131076;

12
systems/catullus/containers.nix
View File

@@ -25,7 +25,7 @@ in {
niveum.telegramBots.quotebot = { niveum.telegramBots.quotebot = {
enable = true; enable = true;
time = "08/6:00"; 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" ]; chatIds = [ "18980945" "757821027" ];
command = "${pkgs.literature-quote}/bin/literature-quote"; command = "${pkgs.literature-quote}/bin/literature-quote";
parseMode = "Markdown"; parseMode = "Markdown";
@@ -34,7 +34,7 @@ in {
niveum.telegramBots.autorenkalender = { niveum.telegramBots.autorenkalender = {
enable = true; enable = true;
time = "07:00"; time = "07:00";
token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram/kmein.token>); token = lib.strings.fileContents <secrets/telegram/kmein.token>;
chatIds = [ "@autorenkalender" ]; chatIds = [ "@autorenkalender" ];
command = "${pkgs.autorenkalender}/bin/autorenkalender"; command = "${pkgs.autorenkalender}/bin/autorenkalender";
}; };
@@ -42,7 +42,7 @@ in {
systemd.services.telegram-odyssey = { systemd.services.telegram-odyssey = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "Telegram bot reciting the Odyssey to you"; 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; enable = true;
script = ''${pkgs.telegram-odyssey}/bin/telegram-odyssey''; script = ''${pkgs.telegram-odyssey}/bin/telegram-odyssey'';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
@@ -51,7 +51,7 @@ in {
systemd.services.telegram-reverse = { systemd.services.telegram-reverse = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "Telegram bot for reversing things"; 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; enable = true;
script = ''${pkgs.telegram-reverse}/bin/telegram-reverse''; script = ''${pkgs.telegram-reverse}/bin/telegram-reverse'';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
@@ -60,7 +60,7 @@ in {
systemd.services.telegram-betacode = { systemd.services.telegram-betacode = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "Telegram bot for converting Ancient Greek betacode into unicode"; 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; enable = true;
script = ''${pkgs.telegram-betacode}/bin/telegram-betacode''; script = ''${pkgs.telegram-betacode}/bin/telegram-betacode'';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
@@ -69,7 +69,7 @@ in {
systemd.services.telegram-proverb = { systemd.services.telegram-proverb = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "Telegram bot for generating inspiring but useless proverbs"; 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; enable = true;
script = ''${pkgs.telegram-proverb}/bin/proverb_bot.py''; script = ''${pkgs.telegram-proverb}/bin/proverb_bot.py'';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";