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

fix(syncthing): use new declarative options

Browse Source
This commit is contained in:
Kierán Meinhardt
2019-10-24 09:07:49 +02:00
parent 6471e43d60
commit a0661ef34b
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
configs/cloud.nix
View File

@@ -4,7 +4,6 @@
<modules/seafile.nix>
<modules/google-drive.nix>
<modules/dropbox.nix>
<stockholm/krebs/3modules/syncthing.nix>
];
niveum.dropbox = {
@@ -29,20 +28,20 @@
openDefaultPorts = true;
configDir = "/home/kfm/.config/syncthing";
dataDir = "/home/kfm/.config/syncthing";
};
krebs.syncthing = rec {
enable = true;
key = toString <secrets/syncthing/key.pem>;
cert = toString <secrets/syncthing/cert.pem>;
peers = {
homeros.id = "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA";
scardanelli.id = "7CZYHEX-3CSFDQU-PEEMYHG-6XGQ2ZD-KGVUWH5-GFRB2XK-FP57ERX-7APZUQU";
rilke.id = "NYNNHXP-7JMSTXG-SVNOPWD-RWXCCCL-CBOVBEI-X4QPLF4-NJA5G2P-RSGYRQQ";
wilde.id = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF";
declarative = rec {
cert = toString <secrets/syncthing/cert.pem>;
key = toString <secrets/syncthing/key.pem>;
devices = {
homeros.id = "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA";
scardanelli.id = "7CZYHEX-3CSFDQU-PEEMYHG-6XGQ2ZD-KGVUWH5-GFRB2XK-FP57ERX-7APZUQU";
rilke.id = "NYNNHXP-7JMSTXG-SVNOPWD-RWXCCCL-CBOVBEI-X4QPLF4-NJA5G2P-RSGYRQQ";
wilde.id = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF";
};
folders = let syncthing-dir = "${config.users.users.me.home}/cloud/syncthing"; in {
"${syncthing-dir}/common".devices = [ "homeros" "scardanelli" "wilde" ];
"${syncthing-dir}/library".devices = lib.attrNames devices;
"${syncthing-dir}/mundoiu".devices = lib.attrNames devices;
};
};
folders."${config.users.users.me.home}/cloud/syncthing/common".peers = [ "homeros" "scardanelli" "wilde" ];
folders."${config.users.users.me.home}/cloud/syncthing/library".peers = lib.attrNames peers;
folders."${config.users.users.me.home}/cloud/syncthing/mundoiu".peers = lib.attrNames peers;
};
}

5
todo.txt
View File

@@ -1,12 +1,7 @@
(C) 2019-07-09 @package fzf wrappers
x (C) 2019-08-26 2019-08-24 @package dirmir
(C) 2019-08-25 environment.etc."sshd/banner-line".text = config.networking.hostName;
(C) 2019-08-25 fix man-pdf: man-pdf 1p env, man-pdf env: man $options -t $command | ps2pdf - $command.pdf
x (C) 2019-08-26 2019-08-25 @package tolino-screensaver
(C) 2019-08-25 @package wallpapers
(B) 2019-08-27 host something on @catullus (with nginx)
(A) 2019-08-27 @package gourmet
(A) 2019-08-27 fix offlineimap password
x (B) 2019-08-26 2019-08-26 environment.shellAliases.cat = "bat --style=plain"
x (B) 2019-08-26 2019-08-26 environment.shellAliases.tree = "exa --tree"
(A) 2019-08-26 run services as their own @users