coolneng
/
zion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: coolneng:e1803a4edd8b427ff312e86cace79574c6b504d9
Branches Tags
coolneng:master
...
compare: coolneng:d208ad22dbf29e3db08378c9492d84b4620ea19f
Branches Tags
coolneng:master

3 Commits
e1803a4edd ... d208ad22db

Author SHA1 Message Date
coolneng d208ad22db
Change username for Openbooks 2023-12-05 11:15:02 +01:00
coolneng 5df1d226c8
Switch to release version of ddclient 2023-12-05 11:14:51 +01:00
coolneng 299e8b3227
Adapt Syncthing to upstream changes 2023-12-05 11:14:40 +01:00
3 changed files with 66 additions and 75 deletions
Show Stats Expand all files Collapse all files

3
modules/containers.nix
View File

@ -18,7 +18,8 @@
image = image =
"evanbuss/openbooks@sha256:16609c3da954715f8f98b5de6c838146914ae700b2a700b4d9aad8b23c9217da"; "evanbuss/openbooks@sha256:16609c3da954715f8f98b5de6c838146914ae700b2a700b4d9aad8b23c9217da";
ports = [ "127.0.0.1:9000:80" ]; ports = [ "127.0.0.1:9000:80" ];
cmd = [ "--name" "bradar" "--searchbot" "searchook" "--persist" ]; cmd =
[ "--name" "john-khrafosta" "--searchbot" "searchook" "--persist" ];
}; };
# Prometheus MQTT integration # Prometheus MQTT integration
mqtt2prometheus = { mqtt2prometheus = {

124
modules/datasync.nix
View File

@ -7,80 +7,80 @@
guiAddress = "0.0.0.0:8384"; guiAddress = "0.0.0.0:8384";
dataDir = "/vault/syncthing"; dataDir = "/vault/syncthing";
key = config.age.secrets.syncthing.path; key = config.age.secrets.syncthing.path;
devices = { settings = {
panacea.id = extraOptions.options = {
"NF4SYEJ-RSGPDEF-CDEYC3A-JWZMKNC-KG4FVQP-CZ5HRFY-XM22BZD-N7B6VAH";
caravanserai.id =
"MIRF73R-S7AV47R-VLWZUK2-TFCVQPV-FRYCPND-Y4VR3W2-ZAIQXZD-JAEQCAD";
};
extraOptions = {
options = {
maxFolderConcurrency = 4; maxFolderConcurrency = 4;
progressUpdateIntervalS = -1; progressUpdateIntervalS = -1;
}; };
}; devices = {
folders = { panacea.id =
Documents = { "NF4SYEJ-RSGPDEF-CDEYC3A-JWZMKNC-KG4FVQP-CZ5HRFY-XM22BZD-N7B6VAH";
id = "wusdj-bfjkr"; caravanserai.id =
type = "receiveonly"; "MIRF73R-S7AV47R-VLWZUK2-TFCVQPV-FRYCPND-Y4VR3W2-ZAIQXZD-JAEQCAD";
path = "/vault/syncthing/Documents";
devices = [ "panacea" "caravanserai" ];
}; };
folders = {
Documents = {
id = "wusdj-bfjkr";
type = "receiveonly";
path = "/vault/syncthing/Documents";
devices = [ "panacea" "caravanserai" ];
};
Notes = { Notes = {
id = "kafhz-bfmzm"; id = "kafhz-bfmzm";
type = "receiveonly"; type = "receiveonly";
path = "/vault/syncthing/Notes"; path = "/vault/syncthing/Notes";
devices = [ "panacea" "caravanserai" ]; devices = [ "panacea" "caravanserai" ];
}; };
Music = { Music = {
id = "2aqt7-vpprc"; id = "2aqt7-vpprc";
type = "receiveonly"; type = "receiveonly";
path = "/vault/syncthing/Music"; path = "/vault/syncthing/Music";
devices = [ "panacea" "caravanserai" ]; devices = [ "panacea" "caravanserai" ];
}; };
Photos = { Photos = {
id = "mjibc-ustcg"; id = "mjibc-ustcg";
type = "receiveonly"; type = "receiveonly";
path = "/vault/syncthing/Photos"; path = "/vault/syncthing/Photos";
devices = [ "panacea" "caravanserai" ]; devices = [ "panacea" "caravanserai" ];
}; };
Projects = { Projects = {
id = "cjhmu-avy9v"; id = "cjhmu-avy9v";
type = "receiveonly"; type = "receiveonly";
path = "/vault/syncthing/Projects"; path = "/vault/syncthing/Projects";
devices = [ "panacea" ]; devices = [ "panacea" ];
}; };
Phone = { Phone = {
id = "m2007j20cg_vc7r-photos"; id = "m2007j20cg_vc7r-photos";
type = "receiveonly"; type = "receiveonly";
path = "/vault/syncthing/Photos/Phone"; path = "/vault/syncthing/Photos/Phone";
devices = [ "panacea" "caravanserai" ]; devices = [ "panacea" "caravanserai" ];
}; };
Files = { Files = {
id = "tsk52-u6rbk"; id = "tsk52-u6rbk";
type = "receiveonly"; type = "receiveonly";
path = "/vault/syncthing/Files"; path = "/vault/syncthing/Files";
devices = [ "panacea" "caravanserai" ]; devices = [ "panacea" "caravanserai" ];
}; };
Phone-screenshots = { Phone-screenshots = {
id = "pp70r-pbr70"; id = "pp70r-pbr70";
type = "receiveonly"; type = "receiveonly";
path = "/vault/syncthing/Photos/Phone-screenshots"; path = "/vault/syncthing/Photos/Phone-screenshots";
devices = [ "panacea" "caravanserai" ]; devices = [ "panacea" "caravanserai" ];
}; };
Audio = { Audio = {
id = "tarrs-5mxck"; id = "tarrs-5mxck";
type = "receiveonly"; type = "receiveonly";
path = "/vault/syncthing/Audio"; path = "/vault/syncthing/Audio";
devices = [ "panacea" "caravanserai" ]; devices = [ "panacea" "caravanserai" ];
};
}; };
}; };
}; };

14
modules/networking.nix
View File

@ -1,16 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let wireguard_port = 1194;
wireguard_port = 1194;
latest-ddclient = pkgs.ddclient.overrideAttrs (old: rec {
src = pkgs.fetchFromGitHub {
owner = "ddclient";
repo = "ddclient";
rev = "3136871720a3c2abf730c9485edc351563765d0e";
sha256 = "sha256-qb1DF0DaVbPgQokGx0t7VVk3pe3KuA8mNRPrBMzhWvU=";
};
});
in { in {
# Enable systemd-networkd # Enable systemd-networkd
@ -38,11 +28,11 @@ in {
enable = true; enable = true;
quiet = true; quiet = true;
use = "web, web=freedns"; use = "web, web=freedns";
package = latest-ddclient;
interval = "30min"; interval = "30min";
protocol = "duckdns"; protocol = "duckdns";
domains = [ "coolneng.duckdns.org" ]; domains = [ "coolneng.duckdns.org" ];
passwordFile = config.age.secrets.ddclient.path; passwordFile = config.age.secrets.ddclient.path;
extraConfig = "";
}; };
# Firewall configuration # Firewall configuration