Zynh0722
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Zynh0722:1b3ce49ffa87c9dd4c38c7c3ba502848a529d182
Branches Tags
Zynh0722:main
Zynh0722:sh-initrd-on-root
Zynh0722:aarch64
Zynh0722:archive/x86
..
compare: Zynh0722:c7283f4314229804a832f1f73b91216843d285a0
Branches Tags
Zynh0722:main
Zynh0722:sh-initrd-on-root
Zynh0722:aarch64
Zynh0722:archive/x86

6 Commits
1b3ce49ffa ... c7283f4314

Author SHA1 Message Date
Zynh Ludwig c7283f4314 secrets: string latlon keys 2024-07-24 01:57:11 -07:00
Zynh Ludwig c534fe8fc6 redshift: bash wrapper 2024-07-24 01:57:11 -07:00
Zynh Ludwig 4e41b079e4 redshift: escape dollar sign 2024-07-24 01:52:43 -07:00
Zynh Ludwig 4f33cd310d redshift: only use secrets if sops is enabled 2024-07-24 01:17:05 -07:00
Zynh Ludwig 9d67cf3d60 redshift: wait for decryption 2024-07-24 01:16:17 -07:00
Zynh Ludwig c96fbbb91e secrets: update latlon 2024-07-24 01:16:17 -07:00
2 changed files with 10 additions and 7 deletions
Show Stats Expand all files Collapse all files

9
home/modules/redshift.nix
View File

@ -3,6 +3,8 @@
let let
cfg = config.snowhawk.redshift; cfg = config.snowhawk.redshift;
cfgDir = config.xdg.configHome + "/redshift"; cfgDir = config.xdg.configHome + "/redshift";
sops = config.snowhawk.sops.enable;
in in
{ {
options.snowhawk.redshift = { options.snowhawk.redshift = {
@ -14,12 +16,13 @@ in
Unit = { Unit = {
Description = "redshift service"; Description = "redshift service";
PartOf = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ];
After = lib.mkIf sops [ "sops-nix.service" ];
}; };
Service = { Service = {
Type = "exec"; Type = "exec";
ExecStart = ExecStart =
let let
catFile = file: "$(${pkgs.coreutils}/bin/cat ${file})"; catFile = file: "\$(${pkgs.coreutils}/bin/cat ${file})";
toPaths = deg: "${cfgDir}/${deg}"; toPaths = deg: "${cfgDir}/${deg}";
fetchLatLon = lib.right fetchLatLon = lib.right
(lib.strings.concatStringsSep ":") (lib.strings.concatStringsSep ":")
@ -27,14 +30,14 @@ in
(map toPaths) (map toPaths)
[ "lat" "lon" ]; [ "lat" "lon" ];
in in
"${pkgs.redshift}/bin/redshift -l ${fetchLatLon}"; ''${pkgs.bash}/bin/bash -c "${pkgs.redshift}/bin/redshift -l ${fetchLatLon}"'';
}; };
Install = { Install = {
WantedBy = [ "graphical-session.target" ]; WantedBy = [ "graphical-session.target" ];
}; };
}; };
sops.secrets = { sops.secrets = lib.mkIf sops {
"locations/snowhawk/lat".path = "${cfgDir}/lat"; "locations/snowhawk/lat".path = "${cfgDir}/lat";
"locations/snowhawk/lon".path = "${cfgDir}/lon"; "locations/snowhawk/lon".path = "${cfgDir}/lon";
}; };

8
secrets.yaml
View File

@ -6,8 +6,8 @@ ssh_hosts:
caveserver: ENC[AES256_GCM,data:Fm86oJgeHD/dVqYRKny2/GC7nr3UuR54W46RbS7qgb0UhDsoUkoorIFw+orNhVvHouCc//WtGPCzRFca8u/pkQ9uauCtX/JlSxgHB6Ks08FOTSg=,iv:nGGJo64mEcUQgO9no8uLrws6AtRNUd7nEsYVFVIXkno=,tag:roNPGw39YNEBb2NWllbtHA==,type:str] caveserver: ENC[AES256_GCM,data:Fm86oJgeHD/dVqYRKny2/GC7nr3UuR54W46RbS7qgb0UhDsoUkoorIFw+orNhVvHouCc//WtGPCzRFca8u/pkQ9uauCtX/JlSxgHB6Ks08FOTSg=,iv:nGGJo64mEcUQgO9no8uLrws6AtRNUd7nEsYVFVIXkno=,tag:roNPGw39YNEBb2NWllbtHA==,type:str]
locations: locations:
snowhawk: snowhawk:
lat: ENC[AES256_GCM,data:tDaccQ==,iv:l59sQXCNgXTLRJG7ialO9MJU1zgNXOMiN71Hr6ZWl5Y=,tag:uQaMPsrfHhO1C3hJ7ZJXJQ==,type:float] lat: ENC[AES256_GCM,data:N7CsvQ==,iv:BfSp2jXBZDEEyNHhpo3SAwEVIWI0timAT2S1l76ODn0=,tag:Mf99+rM/m3Wh8BmmITKjpg==,type:str]
lon: ENC[AES256_GCM,data:+3gfq/VyzQ==,iv:tJT8D+wTPj9jZ9xATfUiDqI9Fg+Z9imtQoEY3OzHzXk=,tag:PP4Yad45yscRS4aBFjOqEA==,type:float] lon: ENC[AES256_GCM,data:dITeYwVzSA==,iv:s+St+As7wgAaUf8/qnAdCM932WY5c9S0qUFhUlzx3W0=,tag:iqqPhmHZ+t+CRZPdZxYVxA==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -23,8 +23,8 @@ sops:
SjZNOWNndEIrMDFZRnV3QlRheklvMncK5n4lzgSrEDQ0M8m4SAslQvl2vq39owY9 SjZNOWNndEIrMDFZRnV3QlRheklvMncK5n4lzgSrEDQ0M8m4SAslQvl2vq39owY9
s3SrXYCvQo6nsKKJMgaN0fnrSqxdSLbnrDYFchaF2fhdXozR8508PA== s3SrXYCvQo6nsKKJMgaN0fnrSqxdSLbnrDYFchaF2fhdXozR8508PA==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-07-24T06:51:29Z" lastmodified: "2024-07-24T08:39:41Z"
mac: ENC[AES256_GCM,data:bBkRAhqN6dFAFUppG/qjuivvoMlpvwk2nox89DbntGCu/pj8BcdVRDbE7jN3gAYBbLiA/sw7BrwoBPhOgtYTL0qmH3ZEcvvhcsf0I2UQ8meTJMDDqqOI3f1AcHK2oqrqflkbnndsx8h48/wwza84WjORRVLibkclwueI1WvxhBc=,iv:sPKO51qkZyoYmtoR5CQw72gxGGkiWdgQdByLOHI5ySs=,tag:XcknL4zeg9pA7tbwHbnhvg==,type:str] mac: ENC[AES256_GCM,data:Rg/rkbSyCkVJfISTfHDdNAfwN8cygYya5zqfJg9ZfaVSmbUBoxkWInaEoXcvRLj7GbJl/ZE1coi7/wj4sIECAfUU56MRObxNFa29YPAhBGLb+mwuDDD8Sp9HssnqBbMQXgjUu+JNPRhXkNQJ8vE0UkGjAKjtu9BB4GzKs8GXQ2A=,iv:mkAqcQCIQl4uEn91MxavLY8yS5zjR+1/5BMWgNsK5Jo=,tag:fCyUVItQqbUBUwbCo3rNYA==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.9.0 version: 3.9.0