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 = [
|
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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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" ];
|
|
||||||
#};
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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" ];
|
|
||||||
#};
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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" ];
|
|
||||||
#};
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue