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

Compare commits

base: coolneng:4493b8aa7041a1aa518d304f11679fee1b97e829
Branches Tags
coolneng:master
...
compare: coolneng:e8e0758417aa4542b85bd4b66245e09d6f4d5ca2
Branches Tags
coolneng:master

3 Commits
4493b8aa70 ... e8e0758417

Author SHA1 Message Date
coolneng e8e0758417
Adapt Syncthing to upstream changes 2023-12-05 10:33:48 +01:00
coolneng 378916ed35
Change DNS resolver excepting for loopback needs 2023-12-05 10:32:35 +01:00
coolneng ea7dfca0db
Upgrade to Nixos 23.11 2023-12-05 10:31:43 +01:00
5 changed files with 71 additions and 66 deletions
Show Stats Expand all files Collapse all files

8
flake.lock
View File

@ -151,16 +151,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701540982, "lastModified": 1701539137,
"narHash": "sha256-5ajSy6ODgGmAbmymRdHnjfVnuVrACjI8wXoGVvrtvww=", "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6386d8aafc28b3a7ed03880a57bdc6eb4465491d", "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"type": "indirect" "type": "indirect"
} }
}, },

2
flake.nix
View File

@ -2,7 +2,7 @@
description = "System configuration for zion"; description = "System configuration for zion";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-23.05"; nixpkgs.url = "nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";

120
modules/datasync.nix
View File

@ -7,80 +7,82 @@
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 = {
panacea.id =
"NF4SYEJ-RSGPDEF-CDEYC3A-JWZMKNC-KG4FVQP-CZ5HRFY-XM22BZD-N7B6VAH";
caravanserai.id =
"MIRF73R-S7AV47R-VLWZUK2-TFCVQPV-FRYCPND-Y4VR3W2-ZAIQXZD-JAEQCAD";
};
extraOptions = { extraOptions = {
options = { options = {
maxFolderConcurrency = 4; maxFolderConcurrency = 4;
progressUpdateIntervalS = -1; progressUpdateIntervalS = -1;
}; };
}; };
folders = { settings = {
Documents = { devices = {
id = "wusdj-bfjkr"; panacea.id =
type = "receiveonly"; "NF4SYEJ-RSGPDEF-CDEYC3A-JWZMKNC-KG4FVQP-CZ5HRFY-XM22BZD-N7B6VAH";
path = "/vault/syncthing/Documents"; caravanserai.id =
devices = [ "panacea" "caravanserai" ]; "MIRF73R-S7AV47R-VLWZUK2-TFCVQPV-FRYCPND-Y4VR3W2-ZAIQXZD-JAEQCAD";
}; };
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" ];
};
}; };
}; };
}; };

2
modules/networking.nix
View File

@ -29,7 +29,7 @@ in {
matchConfig.Name = "end0"; matchConfig.Name = "end0";
address = [ "192.168.13.2/24" ]; address = [ "192.168.13.2/24" ];
gateway = [ "192.168.13.1" ]; gateway = [ "192.168.13.1" ];
dns = [ "192.168.13.2" ]; dns = [ "1.1.1.1" "9.9.9.9" ];
networkConfig.DNSSEC = "no"; networkConfig.DNSSEC = "no";
}; };

5
modules/webstack.nix
View File

@ -187,7 +187,10 @@
# ACME certs configuration # ACME certs configuration
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults.email = "akasroua@gmail.com"; defaults = {
email = "akasroua@disroot.org";
dnsResolver = "127.0.0.1:53";
};
}; };
# Generate dhparams # Generate dhparams