From 4fbed4b3c8f33c8c98b851075bb76e736931ed86 Mon Sep 17 00:00:00 2001 From: atagen Date: Sun, 25 Sep 2022 18:59:11 +1000 Subject: [PATCH] tidy --- system/adrift.nix | 19 ------------------- system/configuration.nix | 9 +++++++-- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/system/adrift.nix b/system/adrift.nix index 8fd3403..6781460 100644 --- a/system/adrift.nix +++ b/system/adrift.nix @@ -20,25 +20,6 @@ networking.useDHCP = lib.mkDefault true; - networking.wireguard = { - enable = true; - interfaces = { - pond = { - ips = [ "10.4.20.3/32" ]; - listenPort = 51820; - privateKeyFile = "/root/pond.priv"; - peers = [ - { - publicKey = "ll0/+7bbaAFgCuUOj0s0twHalXLxcXOtkxJbtw/egV4="; - allowedIPs = [ "10.4.20.0/24" ]; - endpoint = "141.164.52.106:51821"; - persistentKeepalive = 20; - } - ]; - }; - }; - }; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; networking.hostName = "adrift"; # Define your hostname. diff --git a/system/configuration.nix b/system/configuration.nix index 41fb4e3..ee91444 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -6,7 +6,7 @@ imports = [ # where are we ? - ./wollomi.nix + # ./wollomi.nix # ./adrift.nix # home manager should exist for users @@ -86,6 +86,8 @@ programs.zsh.enable = true; users.defaultUserShell = pkgs.zsh; + services.tailscale.enable = true; + # rust nixpkgs.overlays = [ (import "${fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz"}/overlay.nix") @@ -99,6 +101,8 @@ "rustfmt" ]) + tailscale + cachix helix @@ -116,7 +120,8 @@ networking.firewall = { - allowedUDPPorts = [ 51820 ]; + allowedUDPPorts = [ 41641 ]; + checkReversePath = "loose"; }; system.stateVersion = "22.05"; # Did you read the comment?