From f375dfea65577a32df0ebce08d2ebcb464106a24 Mon Sep 17 00:00:00 2001 From: Nickiel12 Date: Thu, 21 Sep 2023 08:42:04 -0700 Subject: [PATCH] realized aliasing the vpn host to a local ip was a bad idea --- hosts/laptop/default.nix | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index d33e637..cc6da9d 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -1,42 +1,34 @@ { config, ... }: -{ - imports = [ +{ imports = [ ./hardware-configuration.nix ]; hardware.bluetooth.enable = true; - networking.hosts = { - "10.0.0.183" = [ "headscale.nickiel.net" ]; - "100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ]; + networking.hosts = { + #"10.0.0.183" = [ "headscale.nickiel.net" ]; + "100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" + "jellyfin.nickiel.net" ]; }; # tailscale set --exit-node to route through an exit node - services.tailscale.enable = true; - networking.firewall = { - checkReversePath = "loose"; - trustedInterfaces = [ "tailscale0" ]; + services.tailscale.enable = true; networking.firewall = { + checkReversePath = "loose"; trustedInterfaces = [ "tailscale0" ]; allowedUDPPorts = [ config.services.tailscale.port ]; }; time.hardwareClockInLocalTime = true; - boot.loader = { - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; + boot.loader = { efi = { + canTouchEfiVariables = true; efiSysMountPoint = "/boot"; }; - grub = { - devices = [ "nodev" ]; - efiSupport = true; - enable = true; - useOSProber = false; - extraEntries = '' -menuentry 'Windows Boot Manager (on /dev/nvme0n1p1)' --class windows --class os $menuentry_id_option 'osprober-efi-364F-BE7A' { - insmod part_gpt - insmod fat - search --no-floppy --fs-uuid --set=root 364F-BE7A - chainloader /efi/Microsoft/Boot/bootmgfw.efi + grub = { devices = [ "nodev" ]; efiSupport = true; enable = true; + useOSProber = false; extraEntries = '' +menuentry 'Windows Boot Manager (on /dev/nvme0n1p1)' --class windows + --class os $menuentry_id_option 'osprober-efi-364F-BE7A' { + insmod part_gpt insmod fat search --no-floppy --fs-uuid + --set=root 364F-BE7A chainloader + /efi/Microsoft/Boot/bootmgfw.efi } ''; };