diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 48796e8..24b1d53 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -4,5 +4,6 @@ ./index.nix ./ld.nix ./settings.nix + ./latest.nix ]; } diff --git a/modules/nix/latest.nix b/modules/nix/latest.nix new file mode 100644 index 0000000..12b685a --- /dev/null +++ b/modules/nix/latest.nix @@ -0,0 +1,14 @@ +{ lib, inputs, config, pkgs, ... }: +with lib; +let + cfg = config.custom.nix; +in +{ + options.custom.nix = { + useLatest = mkEnableOption "Use latest nix versions"; + }; + + config = mkIf cfg.useLatest { + nix.package = pkgs.nixVersions.latest; + }; +} diff --git a/modules/services/wireguard.nix b/modules/services/wireguard.nix index c657347..598a268 100644 --- a/modules/services/wireguard.nix +++ b/modules/services/wireguard.nix @@ -37,6 +37,14 @@ in networking.nat.internalInterfaces = [ "wg0" ]; networking.firewall.allowedUDPPorts = [ 51820 ]; + #[Interface] + #PrivateKey = + #Address = 192.168.2.20/24 + #[Peer] + #PublicKey = vyHNUy97R1cvqEvElznPpFQtoqm7WUHnT96UP6Dquwc= + #AllowedIPs = 192.168.2.0/24 + #Endpoint = kopatz.dev:51820 + #PersistentKeepalive = 25 networking.wg-quick.interfaces = { wg0 = { autostart = true; @@ -117,6 +125,14 @@ in ]; publicKey = "AGBWzMeSTxmB3jwNdROYHbyiqhhAVyofMV5Ku5JIE1A="; } + # more keys + # unused + { + allowedIPs = [ + "192.168.2.100/32" + ]; + publicKey = "Oj2IYrHgPhIvN+s2oi9kpqN48BXjkYMr4J/z6Baqv0Q="; + } ]; privateKeyFile = config.age.secrets.wireguard-private.path; }; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 3a8d451..dcce5c5 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -29,6 +29,7 @@ cli-tools.enable = true; nixvimPlugins = true; nix = { + useLatest = true; index.enable = true; ld.enable = true; settings.enable = true;