Format everything with alejandra
This commit is contained in:
parent
82bbd7ce87
commit
7888103b1e
100 changed files with 2827 additions and 2756 deletions
|
|
@ -1,19 +1,23 @@
|
|||
{ config, ... }:
|
||||
let
|
||||
old = {
|
||||
nssmdns = true;
|
||||
};
|
||||
new = {
|
||||
nssmdns4 = true;
|
||||
};
|
||||
in
|
||||
{
|
||||
/*
|
||||
NixOS 24.05 changed the option for mnds to be able to turn on/off IPv6
|
||||
23.11 doesn't support this, so I need to use the conditional to be able to
|
||||
use the same config for both
|
||||
*/
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
} // (if config.system.nixos.release == "23.11" then old else new);
|
||||
{config, ...}: let
|
||||
old = {
|
||||
nssmdns = true;
|
||||
};
|
||||
new = {
|
||||
nssmdns4 = true;
|
||||
};
|
||||
in {
|
||||
/*
|
||||
NixOS 24.05 changed the option for mnds to be able to turn on/off IPv6
|
||||
23.11 doesn't support this, so I need to use the conditional to be able to
|
||||
use the same config for both
|
||||
*/
|
||||
services.avahi =
|
||||
{
|
||||
enable = true;
|
||||
}
|
||||
// (
|
||||
if config.system.nixos.release == "23.11"
|
||||
then old
|
||||
else new
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./avahi.nix
|
||||
./tailscale.nix
|
||||
./syncthing.nix
|
||||
];
|
||||
{...}: {
|
||||
imports = [
|
||||
./avahi.nix
|
||||
./tailscale.nix
|
||||
./syncthing.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,60 +1,60 @@
|
|||
{ config, flakeSelf, ... }:
|
||||
|
||||
let
|
||||
hostSecrets = "${flakeSelf.inputs.secrets}/" + config.networking.hostName;
|
||||
in
|
||||
|
||||
{
|
||||
# Get secrets
|
||||
age.secrets = {
|
||||
syncthingKey.file = hostSecrets + "/syncthingKey.age";
|
||||
syncthingCert.file = hostSecrets + "/syncthingCert.age";
|
||||
};
|
||||
config,
|
||||
flakeSelf,
|
||||
...
|
||||
}: let
|
||||
hostSecrets = "${flakeSelf.inputs.secrets}/" + config.networking.hostName;
|
||||
in {
|
||||
# Get secrets
|
||||
age.secrets = {
|
||||
syncthingKey.file = hostSecrets + "/syncthingKey.age";
|
||||
syncthingCert.file = hostSecrets + "/syncthingCert.age";
|
||||
};
|
||||
|
||||
services.syncthing = {
|
||||
key = config.age.secrets.syncthingKey.path;
|
||||
cert = config.age.secrets.syncthingCert.path;
|
||||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
openDefaultPorts = true;
|
||||
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";
|
||||
};
|
||||
"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 = "2GXFZJZ-CF56ER2-SISBGOF-VNXJIG5-GQC6ECA-NHCHAPX-677RSJT-RI5POAZ";
|
||||
};
|
||||
"surface" = {
|
||||
name = "Surface Go";
|
||||
id = "HTVSF3O-AHY3TNH-BLVSEGK-HRRSMHC-H5LJWVF-NDKGM6O-ATWZALC-YXNV2Q4";
|
||||
};
|
||||
"winmax2" = {
|
||||
name = "Win Max 2";
|
||||
id = "X2NILRM-ADRBQ23-AFREAZA-62GVFDF-UVMPR4L-KGHMUNY-BJ2C3CQ-RBT43QS";
|
||||
};
|
||||
};
|
||||
folders = {
|
||||
"passwords" = {
|
||||
label = "KeePassXC Passwords";
|
||||
id = "rdyaq-ex659";
|
||||
devices = [ "phone" "pc" "steamdeck" "server" "surface" "winmax2"];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
services.syncthing = {
|
||||
key = config.age.secrets.syncthingKey.path;
|
||||
cert = config.age.secrets.syncthingCert.path;
|
||||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
openDefaultPorts = true;
|
||||
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";
|
||||
};
|
||||
"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 = "2GXFZJZ-CF56ER2-SISBGOF-VNXJIG5-GQC6ECA-NHCHAPX-677RSJT-RI5POAZ";
|
||||
};
|
||||
"surface" = {
|
||||
name = "Surface Go";
|
||||
id = "HTVSF3O-AHY3TNH-BLVSEGK-HRRSMHC-H5LJWVF-NDKGM6O-ATWZALC-YXNV2Q4";
|
||||
};
|
||||
"winmax2" = {
|
||||
name = "Win Max 2";
|
||||
id = "X2NILRM-ADRBQ23-AFREAZA-62GVFDF-UVMPR4L-KGHMUNY-BJ2C3CQ-RBT43QS";
|
||||
};
|
||||
};
|
||||
folders = {
|
||||
"passwords" = {
|
||||
label = "KeePassXC Passwords";
|
||||
id = "rdyaq-ex659";
|
||||
devices = ["phone" "pc" "steamdeck" "server" "surface" "winmax2"];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
{
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
useRoutingFeatures = lib.mkDefault "client";
|
||||
};
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
useRoutingFeatures = lib.mkDefault "client";
|
||||
};
|
||||
|
||||
systemd.services.tailscaled.environment = {
|
||||
TS_NO_LOGS_NO_SUPPORT = "true";
|
||||
};
|
||||
systemd.services.tailscaled.environment = {
|
||||
TS_NO_LOGS_NO_SUPPORT = "true";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue