diff --git a/config/basic/default.nix b/config/basic/default.nix index 4116fcd..ae7f99c 100644 --- a/config/basic/default.nix +++ b/config/basic/default.nix @@ -38,4 +38,5 @@ ]; age.identityPaths = [ "/state/etc/ssh/ssh_host_ed25519_key" ]; boot.mode = lib.mkDefault "efi"; + documentation.enable = lib.mkDefault false; } diff --git a/config/services/samba.nix b/config/services/samba.nix index c0d3f18..1f0b4bf 100644 --- a/config/services/samba.nix +++ b/config/services/samba.nix @@ -39,19 +39,6 @@ in ##]; }; }; - wireguard.samba-patrick.server = { - host = config.secrets.secrets.global.domains.web; - port = 51830; - reservedAddresses = [ - "10.43.0.0/20" - "fd00:1765::/112" - ]; - openFirewall = true; - }; - - networking.nftables.firewall.zones.untrusted.interfaces = [ - "samba-patrick" - ]; services.samba = { enable = true; diff --git a/hosts/desktopnix/net.nix b/hosts/desktopnix/net.nix index 7bb24d0..c26c8e3 100644 --- a/hosts/desktopnix/net.nix +++ b/hosts/desktopnix/net.nix @@ -26,7 +26,6 @@ }; }; networking.nftables.firewall.zones.untrusted.interfaces = [ "lan01" ]; - wireguard.samba-patrick.client.via = "elisabeth-samba"; services.mullvad-vpn = { enable = true; package = pkgs.mullvad-vpn; @@ -35,7 +34,7 @@ "/etc/mullvad-vpn" { directory = "/var/lib/netbird-main"; - owner = "netbird-main"; + user = "netbird-main"; } ]; services.netbird = { diff --git a/hosts/elisabeth/default.nix b/hosts/elisabeth/default.nix index 9245ce1..1e41cf9 100644 --- a/hosts/elisabeth/default.nix +++ b/hosts/elisabeth/default.nix @@ -27,5 +27,4 @@ }; }; nixpkgs.hostPlatform = "x86_64-linux"; - documentation.enable = false; } diff --git a/hosts/patricknix/net.nix b/hosts/patricknix/net.nix index 9615851..3932e0e 100644 --- a/hosts/patricknix/net.nix +++ b/hosts/patricknix/net.nix @@ -14,7 +14,6 @@ devoloog-sae19.rekeyFile = ./secrets/iwd/devoloog-sae19.age; devoloog-sae20.rekeyFile = ./secrets/iwd/devoloog-sae20.age; }; - wireguard.samba-patrick.client.via = "elisabeth-samba"; networking.nftables.firewall.zones.untrusted.interfaces = [ "lan01" "lan02" diff --git a/users/patrick/smb.nix b/users/patrick/smb.nix index 4dfed5a..894b52f 100644 --- a/users/patrick/smb.nix +++ b/users/patrick/smb.nix @@ -1,8 +1,8 @@ -{ config, nodes, ... }: +{ config, ... }: { hm.home.smb = let - address = nodes.elisabeth-samba.config.wireguard.samba-patrick.ipv4; + address = "smb.${config.secrets.secrets.global.domains.web}"; credentials = config.age.secrets.smb-creds.path; in [