Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Upgrade to 23.11 #7

Merged
Toast merged 6 commits from upgrade-to-23.11 into main 2023-12-03 18:47:39 +01:00
Conversation 0 Commits 6 Files changed 11 +33 -33
5 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7d9ec83e15 - Show all commits

58
roles/common/services/syncthing.nix
View file

@ -5,39 +5,39 @@
overrideDevices = true;
overrideFolders = true;
openDefaultPorts = true;
extraOptions = {
settings = {
options = {
urAccepted = 3;
};
};
# Set up devices and folders common to every device
devices = {
"phone" = {
name = "Xiaomi Redmi Note 10 Pro";
id = "K7KNZ5V-XREUADL-CROQXPV-6AA4H65-2VUD34Z-VQWKJ6S-LWWW4EE-XPNEZQ6";
# Set up devices and folders common to every device
devices = {
"phone" = {
name = "Xiaomi Redmi Note 10 Pro";
id = "K7KNZ5V-XREUADL-CROQXPV-6AA4H65-2VUD34Z-VQWKJ6S-LWWW4EE-XPNEZQ6";
};
"pc" = {
name = "Archie";
id = "NJPX754-64AQNP3-7GZFIRZ-W2EDRJQ-27ORWYM-X5YXEXQ-ERRTRTQ-BSYD4AY";
};
"steamdeck" = {
name = "Steam Deck";
id = "DNFEGEA-PDEVW5A-O5VBVQK-IUXI7J5-MAHCQAG-2JLEFFM-DSXB6AS-TX6ZHAN";
};
"server" = {
name = "Everest";
id = "BVJBCAZ-WDIWBFR-CK3WB3N-TWH3UXX-EPZXVWE-BLQ3IDU-U7MHVVB-WO4BKAJ";
};
"surface" = {
name = "Surface Go";
id = "HTVSF3O-AHY3TNH-BLVSEGK-HRRSMHC-H5LJWVF-NDKGM6O-ATWZALC-YXNV2Q4";
};
};
"pc" = {
name = "Archie";
id = "NJPX754-64AQNP3-7GZFIRZ-W2EDRJQ-27ORWYM-X5YXEXQ-ERRTRTQ-BSYD4AY";
};
"steamdeck" = {
name = "Steam Deck";
id = "DNFEGEA-PDEVW5A-O5VBVQK-IUXI7J5-MAHCQAG-2JLEFFM-DSXB6AS-TX6ZHAN";
};
"server" = {
name = "Everest";
id = "BVJBCAZ-WDIWBFR-CK3WB3N-TWH3UXX-EPZXVWE-BLQ3IDU-U7MHVVB-WO4BKAJ";
};
"surface" = {
name = "Surface Go";
id = "HTVSF3O-AHY3TNH-BLVSEGK-HRRSMHC-H5LJWVF-NDKGM6O-ATWZALC-YXNV2Q4";
};
};
folders = {
"passwords" = {
label = "KeePassXC Passwords";
id = "rdyaq-ex659";
devices = [ "phone" "pc" "steamdeck" "server" "surface"];
folders = {
"passwords" = {
label = "KeePassXC Passwords";
id = "rdyaq-ex659";
devices = [ "phone" "pc" "steamdeck" "server" "surface"];
};
};
};
};

2
roles/desktop/services/syncthing.nix
View file

@ -6,7 +6,7 @@
user = "toast";
group = "users";
dataDir = config.users.users.toast.home;
folders."passwords".path = "~/Documents/Passwords";
settings.folders."passwords".path = "~/Documents/Passwords";
};
# Allow regular users to stop syncthing
# https://stackoverflow.com/questions/61480914/using-policykit-to-allow-non-root-users-to-start-and-stop-a-service

2
roles/gaming/services/syncthing.nix
View file

@ -6,7 +6,7 @@
TODO: turn this into a module eventually
*/
services.syncthing.folders = {
services.syncthing.settings.folders = {
"steam-201810" = {
label = "Wolfenstein The New Order Saves";
id = "laxxf-t2wmy";

2
roles/school/services/syncthing.nix
View file

@ -1,7 +1,7 @@
{ config, ... }:
{
services.syncthing.folders = {
services.syncthing.settings.folders = {
"school-things" = {
label = "School things";
id = "z6alc-nfoqr";

2
roles/server/syncthing.nix
View file

@ -11,7 +11,7 @@
key = config.age.secrets.syncthingKey.path;
cert = config.age.secrets.syncthingCert.path;
guiAddress = "0.0.0.0:8384";
folders = {
settings.folders = {
"passwords" = {
path = "${config.services.syncthing.dataDir}/passwords";
};