diff --git a/home-manager/nixvim/default.nix b/home-manager/nixvim/default.nix index 98b8f48..43da8c4 100644 --- a/home-manager/nixvim/default.nix +++ b/home-manager/nixvim/default.nix @@ -7,7 +7,7 @@ let importFile = file: let config = import file; in if builtins.isFunction config then config args else config; - configs = map importFile [ + configs = map importFile ([ ./config.nix ] ++ lib.optionals cfg [ ./auto-pairs.nix @@ -29,7 +29,7 @@ let ./trouble.nix ./which_key.nix ./wilder.nix - ]; + ]); merged = builtins.foldl' (acc: elem: lib.recursiveUpdate acc elem) { } configs; in diff --git a/modules/work/vpn.nix b/modules/work/vpn.nix index 1ba7d80..0f07eb3 100644 --- a/modules/work/vpn.nix +++ b/modules/work/vpn.nix @@ -1,4 +1,6 @@ { pkgs, ... }: { services.resolved.enable = true; programs.openvpn3.enable = true; + #mdns resolves to ipv6 address idk why + #networking.firewall.allowedUDPPorts = [ 5353 ]; }