deduped some syncthing options

This commit is contained in:
serenity-F 2025-01-09 13:06:07 +10:00
parent c716794070
commit a89d4aa586
7 changed files with 94 additions and 171 deletions

View file

@ -5,6 +5,7 @@
imports = [ imports = [
## Semi-modularised config ## Semi-modularised config
./sync.nix # syncthing settings
./misc.nix # stuff that doesn't work in `/home` :( ./misc.nix # stuff that doesn't work in `/home` :(
./audio.nix # musnix and ... audio ... config ./audio.nix # musnix and ... audio ... config
./display.nix # declarations for display management ./display.nix # declarations for display management

View file

@ -7,7 +7,6 @@
## Selected host modules for import ## Selected host modules for import
./hardware.nix # hardware configuration ./hardware.nix # hardware configuration
./network.nix # network configuration ./network.nix # network configuration
./sync.nix # syncthing & gitwatch
./zfs.nix # zfs configuration ./zfs.nix # zfs configuration
## Additional core modules to import ## Additional core modules to import

View file

@ -15,12 +15,12 @@
}; };
#nameservers = [ #nameservers = [
#"1.1.1.1" #"1.1.1.1"
#]; #];
#proxy = { #proxy = {
#default = "https://user:password@proxy:port/"; #default = "https://user:password@proxy:port/";
#noProxy = "127.0.0.1, localhost, internal.domain"; #noProxy = "127.0.0.1, localhost, internal.domain";
#}; #};
}; };
@ -28,24 +28,24 @@
## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy ## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy
networking.firewall = { networking.firewall = {
enable = true; enable = true;
#checkReversePath = "loose"; #checkReversePath = "loose";
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ]; #allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
#allowedUDPPortRanges = allowedTCPPortRanges; #allowedUDPPortRanges = allowedTCPPortRanges;
#interfaces."DEVICENAME".allowedTCPPorts = [ #interfaces."DEVICENAME".allowedTCPPorts = [
#22999 #22999
#] #]
allowedTCPPorts = [ allowedTCPPorts = [
2234 # soulseek/nicotine-plus 2234 # soulseek/nicotine-plus
8384 # syncthing 8384 # syncthing
#21027 #21027
#25565 #25565
]; ];
allowedUDPPorts = [ allowedUDPPorts = [
#22000 #22000
#21027 #21027
#41641 #41641
#51820 #51820
]; ];
}; };
services.dnscrypt-proxy2 = { services.dnscrypt-proxy2 = {
@ -60,7 +60,8 @@
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
]; ];
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md"; cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"; minisign_key =
"RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
}; };
# You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md # You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md

View file

@ -15,12 +15,12 @@
}; };
#nameservers = [ #nameservers = [
#"1.1.1.1" #"1.1.1.1"
#]; #];
#proxy = { #proxy = {
#default = "https://user:password@proxy:port/"; #default = "https://user:password@proxy:port/";
#noProxy = "127.0.0.1, localhost, internal.domain"; #noProxy = "127.0.0.1, localhost, internal.domain";
#}; #};
}; };
@ -28,23 +28,23 @@
## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy ## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy
networking.firewall = { networking.firewall = {
enable = true; enable = true;
#checkReversePath = "loose"; #checkReversePath = "loose";
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ]; #allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
#allowedUDPPortRanges = allowedTCPPortRanges; #allowedUDPPortRanges = allowedTCPPortRanges;
#interfaces."DEVICENAME".allowedTCPPorts = [ #interfaces."DEVICENAME".allowedTCPPorts = [
#22999 #22999
#] #]
#allowedTCPPorts = [ #allowedTCPPorts = [
#22000 #22000
#21027 #21027
#25565 #25565
#]; #];
#allowedUDPPorts = [ #allowedUDPPorts = [
#22000 #22000
#21027 #21027
#41641 #41641
#51820 #51820
#]; #];
}; };
services.dnscrypt-proxy2 = { services.dnscrypt-proxy2 = {
@ -59,7 +59,8 @@
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
]; ];
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md"; cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"; minisign_key =
"RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
}; };
# You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md # You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
@ -78,31 +79,4 @@
StateDirectory = "dnscrypt-proxy"; StateDirectory = "dnscrypt-proxy";
}; };
## syncthing for device <-> device filesharing and,,, syncing
## still not set up, grrrr
services.syncthing = {
enable = false;
user = "serenity";
dataDir = "/home/serenity/sync/";
configDir = "/home/serenity/flakes/nixdots/home/common/dotconfig/syncthing/";
#overrideDevices = true;
#overrideFolder = true;
## these 3 devices are pretty much my entire ecosystem for now
settings.devices = {
#hades.id = "DEVICE_ID";
#proserpina.id = "DEVICE_ID";
#hecate.id = "DEVICE_ID";
};
## plan to have this dir automatically committed and pushed to a git repo daily
settings.folders = {
#"FOLDER_ID" = {
#path = "/home/serenity/Documents/Notes";
#devices = [ "hecate" "hades" "persephone" ];
#};
};
};
} }

View file

@ -15,12 +15,12 @@
}; };
#nameservers = [ #nameservers = [
#"1.1.1.1" #"1.1.1.1"
#]; #];
#proxy = { #proxy = {
#default = "https://user:password@proxy:port/"; #default = "https://user:password@proxy:port/";
#noProxy = "127.0.0.1, localhost, internal.domain"; #noProxy = "127.0.0.1, localhost, internal.domain";
#}; #};
}; };
@ -28,23 +28,23 @@
## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy ## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy
networking.firewall = { networking.firewall = {
enable = true; enable = true;
#checkReversePath = "loose"; #checkReversePath = "loose";
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ]; #allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
#allowedUDPPortRanges = allowedTCPPortRanges; #allowedUDPPortRanges = allowedTCPPortRanges;
#interfaces."DEVICENAME".allowedTCPPorts = [ #interfaces."DEVICENAME".allowedTCPPorts = [
#22999 #22999
#] #]
#allowedTCPPorts = [ #allowedTCPPorts = [
#22000 #22000
#21027 #21027
#25565 #25565
#]; #];
#allowedUDPPorts = [ #allowedUDPPorts = [
#22000 #22000
#21027 #21027
#41641 #41641
#51820 #51820
#]; #];
}; };
services.dnscrypt-proxy2 = { services.dnscrypt-proxy2 = {
@ -59,7 +59,8 @@
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
]; ];
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md"; cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"; minisign_key =
"RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
}; };
# You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md # You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
@ -78,31 +79,4 @@
StateDirectory = "dnscrypt-proxy"; StateDirectory = "dnscrypt-proxy";
}; };
## syncthing for device <-> device filesharing and,,, syncing
## still not set up, grrrr
services.syncthing = {
enable = false;
user = "serenity";
dataDir = "/home/serenity/sync/";
configDir = "/home/serenity/flakes/nixdots/home/common/dotconfig/syncthing/";
#overrideDevices = true;
#overrideFolder = true;
## these 3 devices are pretty much my entire ecosystem for now
settings.devices = {
#hades.id = "DEVICE_ID";
#proserpina.id = "DEVICE_ID";
#hecate.id = "DEVICE_ID";
};
## plan to have this dir automatically committed and pushed to a git repo daily
settings.folders = {
#"FOLDER_ID" = {
#path = "/home/serenity/Documents/Notes";
#devices = [ "hecate" "hades" "persephone" ];
#};
};
};
} }

View file

@ -15,12 +15,12 @@
}; };
#nameservers = [ #nameservers = [
#"1.1.1.1" #"1.1.1.1"
#]; #];
#proxy = { #proxy = {
#default = "https://user:password@proxy:port/"; #default = "https://user:password@proxy:port/";
#noProxy = "127.0.0.1, localhost, internal.domain"; #noProxy = "127.0.0.1, localhost, internal.domain";
#}; #};
}; };
@ -28,23 +28,23 @@
## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy ## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy
networking.firewall = { networking.firewall = {
enable = true; enable = true;
#checkReversePath = "loose"; #checkReversePath = "loose";
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ]; #allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
#allowedUDPPortRanges = allowedTCPPortRanges; #allowedUDPPortRanges = allowedTCPPortRanges;
#interfaces."DEVICENAME".allowedTCPPorts = [ #interfaces."DEVICENAME".allowedTCPPorts = [
#22999 #22999
#] #]
#allowedTCPPorts = [ #allowedTCPPorts = [
#22000 #22000
#21027 #21027
#25565 #25565
#]; #];
#allowedUDPPorts = [ #allowedUDPPorts = [
#22000 #22000
#21027 #21027
#41641 #41641
#51820 #51820
#]; #];
}; };
services.dnscrypt-proxy2 = { services.dnscrypt-proxy2 = {
@ -59,7 +59,8 @@
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
]; ];
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md"; cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"; minisign_key =
"RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
}; };
# You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md # You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
@ -78,31 +79,4 @@
StateDirectory = "dnscrypt-proxy"; StateDirectory = "dnscrypt-proxy";
}; };
## syncthing for device <-> device filesharing and,,, syncing
## still not set up, grrrr
services.syncthing = {
enable = false;
user = "serenity";
dataDir = "/home/serenity/sync/";
configDir = "/home/serenity/flakes/nixdots/home/common/dotconfig/syncthing/";
#overrideDevices = true;
#overrideFolder = true;
## these 3 devices are pretty much my entire ecosystem for now
settings.devices = {
#hades.id = "DEVICE_ID";
#proserpina.id = "DEVICE_ID";
#hecate.id = "DEVICE_ID";
};
## plan to have this dir automatically committed and pushed to a git repo daily
settings.folders = {
#"FOLDER_ID" = {
#path = "/home/serenity/Documents/Notes";
#devices = [ "hecate" "hades" "persephone" ];
#};
};
};
} }