gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: minor cleanup

Browse source
This commit is contained in:
arcnmx 2024-04-07 16:08:33 -07:00
parent 3a2927a12f
commit 3c19a00aaa
4 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/dnsmasq.nix
View file

@ -4,7 +4,6 @@
inputs, inputs,
... ...
}: let }: let
inherit (inputs.self.lib) generate;
inherit (lib.options) mkOption; inherit (lib.options) mkOption;
inherit (lib.modules) mkIf mkBefore mkDefault mkForce; inherit (lib.modules) mkIf mkBefore mkDefault mkForce;
inherit (lib.attrsets) filterAttrs mapAttrsToList nameValuePair listToAttrs; inherit (lib.attrsets) filterAttrs mapAttrsToList nameValuePair listToAttrs;

4
nixos/reisen-ct/network.nix
View file

@ -18,11 +18,11 @@ in {
#services.resolved.enable = mkIf enableDns false; #services.resolved.enable = mkIf enableDns false;
systemd.services.avahi-daemon = mkIf (options ? proxmoxLXC && config.services.avahi.enable) { systemd.services.avahi-daemon = mkIf (options ? proxmoxLXC && config.services.avahi.enable) {
serviceConfig.ExecStartPre = mkIf config.services.resolved.enable [ serviceConfig.ExecStartPre = mkIf config.services.resolved.enable [
"+-${config.systemd.package}/bin/resolvectl mdns eth0 yes" "+-${config.systemd.package}/bin/resolvectl mdns ${config.systemd.network.networks.eth0.name or "eth0"} yes"
]; ];
}; };
systemd.network.networks.eth0 = mkIf (! options ? proxmoxLXC) { systemd.network.networks.eth0 = mkIf (! options ? proxmoxLXC) {
matchConfig.Name = "eth0"; name = "eth0";
linkConfig.Multicast = true; linkConfig.Multicast = true;
networkConfig.MulticastDNS = true; networkConfig.MulticastDNS = true;
}; };

7
nixos/sops.nix
View file

@ -1,13 +1,8 @@
{ {
lib,
inputs, inputs,
... ...
}: }: {
with lib; {
imports = [ imports = [
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
]; ];
sops = {
age.sshKeyPaths = mkDefault ["/etc/ssh/ssh_host_ed25519_key"];
};
} }

2
nixos/tailscale.nix
View file

@ -48,7 +48,7 @@ in {
''; '';
# https://tailscale.com/kb/1320/performance-best-practices#ethtool-configuration # https://tailscale.com/kb/1320/performance-best-practices#ethtool-configuration
exitNodeRouting = optionalString cfg.advertiseExitNode '' exitNodeRouting = optionalString cfg.advertiseExitNode ''
netdev=$(${pkgs.iproute2}/bin/ip route show 0/0 | ${pkgs.coreutils}/bin/cut -f5 -d' ' || echo eth0) netdev=$(${pkgs.iproute2}/bin/ip route show 0/0 | ${pkgs.coreutils}/bin/cut -f5 -d' ' || echo ${config.systemd.network.networks.eth0.name or "eth0"})
${getExe pkgs.ethtool} -K "$netdev" rx-udp-gro-forwarding on rx-gro-list off || true ${getExe pkgs.ethtool} -K "$netdev" rx-udp-gro-forwarding on rx-gro-list off || true
''; '';
advertiseExitNode = "--advertise-exit-node" + optionalString (!cfg.advertiseExitNode) "=false"; advertiseExitNode = "--advertise-exit-node" + optionalString (!cfg.advertiseExitNode) "=false";