deduped some syncthing options
This commit is contained in:
parent
c716794070
commit
a89d4aa586
7 changed files with 94 additions and 171 deletions
|
|
@ -5,6 +5,7 @@
|
|||
imports = [
|
||||
|
||||
## Semi-modularised config
|
||||
./sync.nix # syncthing settings
|
||||
./misc.nix # stuff that doesn't work in `/home` :(
|
||||
./audio.nix # musnix and ... audio ... config
|
||||
./display.nix # declarations for display management
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
## Selected host modules for import
|
||||
./hardware.nix # hardware configuration
|
||||
./network.nix # network configuration
|
||||
./sync.nix # syncthing & gitwatch
|
||||
./zfs.nix # zfs configuration
|
||||
|
||||
## Additional core modules to import
|
||||
|
|
|
|||
|
|
@ -15,37 +15,37 @@
|
|||
};
|
||||
|
||||
#nameservers = [
|
||||
#"1.1.1.1"
|
||||
#"1.1.1.1"
|
||||
#];
|
||||
|
||||
#proxy = {
|
||||
#default = "https://user:password@proxy:port/";
|
||||
#noProxy = "127.0.0.1, localhost, internal.domain";
|
||||
#default = "https://user:password@proxy:port/";
|
||||
#noProxy = "127.0.0.1, localhost, internal.domain";
|
||||
#};
|
||||
|
||||
|
||||
};
|
||||
|
||||
## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy
|
||||
networking.firewall = {
|
||||
enable = true;
|
||||
#checkReversePath = "loose";
|
||||
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
|
||||
#allowedUDPPortRanges = allowedTCPPortRanges;
|
||||
#interfaces."DEVICENAME".allowedTCPPorts = [
|
||||
#22999
|
||||
#]
|
||||
allowedTCPPorts = [
|
||||
2234 # soulseek/nicotine-plus
|
||||
8384 # syncthing
|
||||
#21027
|
||||
#25565
|
||||
];
|
||||
allowedUDPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#41641
|
||||
#51820
|
||||
];
|
||||
#checkReversePath = "loose";
|
||||
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
|
||||
#allowedUDPPortRanges = allowedTCPPortRanges;
|
||||
#interfaces."DEVICENAME".allowedTCPPorts = [
|
||||
#22999
|
||||
#]
|
||||
allowedTCPPorts = [
|
||||
2234 # soulseek/nicotine-plus
|
||||
8384 # syncthing
|
||||
#21027
|
||||
#25565
|
||||
];
|
||||
allowedUDPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#41641
|
||||
#51820
|
||||
];
|
||||
};
|
||||
|
||||
services.dnscrypt-proxy2 = {
|
||||
|
|
@ -60,7 +60,8 @@
|
|||
"https://download.dnscrypt.info/resolvers-list/v3/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
|
||||
|
|
|
|||
|
|
@ -15,36 +15,36 @@
|
|||
};
|
||||
|
||||
#nameservers = [
|
||||
#"1.1.1.1"
|
||||
#"1.1.1.1"
|
||||
#];
|
||||
|
||||
#proxy = {
|
||||
#default = "https://user:password@proxy:port/";
|
||||
#noProxy = "127.0.0.1, localhost, internal.domain";
|
||||
#default = "https://user:password@proxy:port/";
|
||||
#noProxy = "127.0.0.1, localhost, internal.domain";
|
||||
#};
|
||||
|
||||
|
||||
};
|
||||
|
||||
## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy
|
||||
networking.firewall = {
|
||||
enable = true;
|
||||
#checkReversePath = "loose";
|
||||
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
|
||||
#allowedUDPPortRanges = allowedTCPPortRanges;
|
||||
#interfaces."DEVICENAME".allowedTCPPorts = [
|
||||
#22999
|
||||
#]
|
||||
#allowedTCPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#25565
|
||||
#];
|
||||
#allowedUDPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#41641
|
||||
#51820
|
||||
#];
|
||||
#checkReversePath = "loose";
|
||||
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
|
||||
#allowedUDPPortRanges = allowedTCPPortRanges;
|
||||
#interfaces."DEVICENAME".allowedTCPPorts = [
|
||||
#22999
|
||||
#]
|
||||
#allowedTCPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#25565
|
||||
#];
|
||||
#allowedUDPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#41641
|
||||
#51820
|
||||
#];
|
||||
};
|
||||
|
||||
services.dnscrypt-proxy2 = {
|
||||
|
|
@ -59,7 +59,8 @@
|
|||
"https://download.dnscrypt.info/resolvers-list/v3/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
|
||||
|
|
@ -78,31 +79,4 @@
|
|||
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" ];
|
||||
#};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,36 +15,36 @@
|
|||
};
|
||||
|
||||
#nameservers = [
|
||||
#"1.1.1.1"
|
||||
#"1.1.1.1"
|
||||
#];
|
||||
|
||||
#proxy = {
|
||||
#default = "https://user:password@proxy:port/";
|
||||
#noProxy = "127.0.0.1, localhost, internal.domain";
|
||||
#default = "https://user:password@proxy:port/";
|
||||
#noProxy = "127.0.0.1, localhost, internal.domain";
|
||||
#};
|
||||
|
||||
|
||||
};
|
||||
|
||||
## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy
|
||||
networking.firewall = {
|
||||
enable = true;
|
||||
#checkReversePath = "loose";
|
||||
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
|
||||
#allowedUDPPortRanges = allowedTCPPortRanges;
|
||||
#interfaces."DEVICENAME".allowedTCPPorts = [
|
||||
#22999
|
||||
#]
|
||||
#allowedTCPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#25565
|
||||
#];
|
||||
#allowedUDPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#41641
|
||||
#51820
|
||||
#];
|
||||
#checkReversePath = "loose";
|
||||
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
|
||||
#allowedUDPPortRanges = allowedTCPPortRanges;
|
||||
#interfaces."DEVICENAME".allowedTCPPorts = [
|
||||
#22999
|
||||
#]
|
||||
#allowedTCPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#25565
|
||||
#];
|
||||
#allowedUDPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#41641
|
||||
#51820
|
||||
#];
|
||||
};
|
||||
|
||||
services.dnscrypt-proxy2 = {
|
||||
|
|
@ -59,7 +59,8 @@
|
|||
"https://download.dnscrypt.info/resolvers-list/v3/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
|
||||
|
|
@ -78,31 +79,4 @@
|
|||
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" ];
|
||||
#};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,36 +15,36 @@
|
|||
};
|
||||
|
||||
#nameservers = [
|
||||
#"1.1.1.1"
|
||||
#"1.1.1.1"
|
||||
#];
|
||||
|
||||
#proxy = {
|
||||
#default = "https://user:password@proxy:port/";
|
||||
#noProxy = "127.0.0.1, localhost, internal.domain";
|
||||
#default = "https://user:password@proxy:port/";
|
||||
#noProxy = "127.0.0.1, localhost, internal.domain";
|
||||
#};
|
||||
|
||||
|
||||
};
|
||||
|
||||
## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy
|
||||
networking.firewall = {
|
||||
enable = true;
|
||||
#checkReversePath = "loose";
|
||||
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
|
||||
#allowedUDPPortRanges = allowedTCPPortRanges;
|
||||
#interfaces."DEVICENAME".allowedTCPPorts = [
|
||||
#22999
|
||||
#]
|
||||
#allowedTCPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#25565
|
||||
#];
|
||||
#allowedUDPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#41641
|
||||
#51820
|
||||
#];
|
||||
#checkReversePath = "loose";
|
||||
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
|
||||
#allowedUDPPortRanges = allowedTCPPortRanges;
|
||||
#interfaces."DEVICENAME".allowedTCPPorts = [
|
||||
#22999
|
||||
#]
|
||||
#allowedTCPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#25565
|
||||
#];
|
||||
#allowedUDPPorts = [
|
||||
#22000
|
||||
#21027
|
||||
#41641
|
||||
#51820
|
||||
#];
|
||||
};
|
||||
|
||||
services.dnscrypt-proxy2 = {
|
||||
|
|
@ -59,7 +59,8 @@
|
|||
"https://download.dnscrypt.info/resolvers-list/v3/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
|
||||
|
|
@ -78,31 +79,4 @@
|
|||
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" ];
|
||||
#};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue