From 850c8a0cc17295062e253665bcf2cd02ea086deb Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sun, 25 Aug 2024 23:05:35 +0200 Subject: [PATCH] lib: add `trimNewlines` Signed-off-by: Christoph Heiss --- lib/default.nix | 4 +++- secrets/email.nix | Bin 5244 -> 5198 bytes services/home-assistant.nix | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 864e26f..977e6b4 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,3 +1,5 @@ _: _: -{ } +{ + trimNewlines = builtins.replaceStrings [ "\n" ] [ "" ]; +} diff --git a/secrets/email.nix b/secrets/email.nix index 5457b36107c8285768e8bce2de08ccf763b9524d..ebc97dc9acc9ce399278155926559a91f049227d 100644 GIT binary patch literal 5198 zcmV-U6tU|7M@dveQdv+`0On7cB0mt_?J-*`IV~^fUz{5ttX*RI_pwzm0U8+dxE1o@ zJ3MGkHFxwr{Pg=1f>kz)_5l*=8KPp>1)g~as}m#oJq2frofqaI0TQ&F40KN$?hyj# zzsbEQ0Kg*guaY){>7VT1t&WurWwe*pY!Fi!i|7|SyQNxblLW@mg{SkIhrT{2YS=k< z*tK0u#IE0_tB5h6gbLheCSke^q|(%d4`; zC9huaVnkaRR4E zf^bMCu;&#EIoT`puOR?u!N#?}DHXlJ-d*QkM)87r+-eu2o+(|Z%mDYzG>fb3mTpA6 z^7zmhMIEuLbBTD{mv!-&ZVpJ$aQBn?Er9Xb3wF9PZ)>^@mrX$`mVyE8zyZt_l=e#i z531n=buQJ_QhNBeVMTzsR-ZLpeV!omHG+>YFH}hFz~Zm(Q?el z0DBoA=?|IRBtCj7IvwNH-&B`FK}hT<*l9=@-Aw5`Q3@%Hq+e>|)*!`O9eo|7yG4vO zb!hUQvCp0gd=WJ1g=#;Bn%e@kA9x2*UrGsssP1U$VQb2iIG8&>@Pc74-_f6N8apf10zpjqfL=8NoM={-9~L`Z4ig(s3CEb5ejy@yOw%v{*b6J9solrB;&cKLCq3lpQVzJ@ zC!%J9?jP1ey*V1fi)IjXbsDOKt6Y*tiY$&b?a`TAOG}(F8sE>u4;}M6E<7AXx9pc4 z2PVe~uV$y!zkd>qAKZg|>zciaM5cgjaEmomCx627W1pa%n_$da_Qmj-O=YS=c;KS%O39HtuK&? z%ngw$-Q2GS*gJmro0Ahd7*f9x7Xx=*p~?9YiuZe1UF@n}o6$vaYRdkrJ4;uJj==3s zDJVqaH~YUfpoLP2!;{3w^dQGFiXYiW~zlf5S@D ztcF`L1_u=kpBW1fMu^=c15eMEbV84*hx|z00a4>7KFTHhl1AUKZ?YW}S`!K(QN@`8 zJ^3^Dk02?J4-=)YV|`R=UMG|G>t+4+5J*LkvG>6}Y6$9y zcuwM4FN^mBhO~NTzg5Vu>pbo?xI%Q*M5-=RaB(Hzt@p}Jh!R;Y_uis9Kl~oQF}&S% zMPusN79}t_m2xjG=}!aQN6p$C&YVj-D$RsrG+<|2io~}Y^A3%!w+(WlRj8<&BC7;? zV?g6e+U*sz5gd4r;lv_T>^zNg5C!9=%05#|egab_?$A;B^T6vU{t#IK5agXNR`7(b zuFK!(ZXW{$oKG1mtZz^_4NkW$zTSJM?q1uH?7-Phugy)m zyKB9}WcK_xW)$nzvKmkrTB})Q4|?EK%ku1XCNb{@kX{UN6!&;y#gRxpbJB;`Bscqy zDbPVi!biY)noYm{SwQbo3JR6Irz)q>?$bBXVye;o4l?0XC8kXCpGn`EUDyVawO`UR zLi;_<^^3FSO&^0+1JOSzLz}*qJC2Z19mP%Uj$B{>Rf)fqC|A1t!I>boIQh!A^_}aQ zI_YA13DoV`&Y?k!zlBN{V?W* zq@~6MBoVjm>r)g6A))!Y2b{kE0Ol0 za-&w5V7@lBs5w78!fjBth{~r@7QO!s!g4N9F zPn^MLdy!EiMU4m>pxnk8=}N~oB)WFALTRQYR`{aq5lV~7KbRt @SM-T7;Eg*$VDi;aTxr8{aD+lV(L>IkG6a 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 z zyfF-hYJ$@u_?3E0OBnV@T2=`ctSo_=qEeD>4nVU(M)c{hm4Oe!X8&u6`68;deo-mU zBYJzd(ITH|u8K4?PFgaCGQQlo$PpSHuvB{k#yPto2n?3YmvIkCSywUbux9g~<`Og+ zCv=4AW)4d2pa^#lF~{F0>NH`-6D~=q`p9&pe6~1MdxYcL{~*5hCP$CM#f`p(kDY7R z@(FAwuDb~NIX4Z9?pYEpi);?d!O!`U;!J!-?RW(_pZS9srgx?L7hl0V2u6QCF~V1f z;M&y&TrcpLp9(6ou#ErX9!$OkgL`sZmUYp*;ITXW($PHPQ%@dGOboPIT{ji?1)fRt z2Hxfe8j9;He*NH{vsGUkXEqfLm6HJyt>)4VEmts^g!R)j@xQT1)y32AVcd6FtyeT=OGy-5z%HwXk z&ESQ857%i(gmE$3$VWFx&CPe#@3glw0zL%0K6KQEDv6*ialMiLvn1#tqlvLn8Yj91 CG8$9> diff --git a/services/home-assistant.nix b/services/home-assistant.nix index 53c6919..4c06461 100644 --- a/services/home-assistant.nix +++ b/services/home-assistant.nix @@ -1,7 +1,6 @@ -{ config, my, pkgs, secrets, ... }: +{ config, lib, my, pkgs, secrets, ... }: let - trimNewlines = builtins.replaceStrings [ "\n" ] [ "" ]; hassCfg = config.services.home-assistant.config; mosquittoSecret = { sopsFile = ../secrets/sops/home-assistant.yaml; @@ -55,7 +54,7 @@ in { recorder.db_url = "postgresql://@/hass"; scene = { }; schedule = { }; - shell_command.poweroff_zero = trimNewlines '' + shell_command.poweroff_zero = lib.trimNewlines '' ${pkgs.openssh}/bin/ssh -i ${secrets."home-assistant/automation-sshkey".path} -o BatchMode=yes