diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2023-12-11 17:49:16 -0700 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2023-12-11 17:49:16 -0700 |
| commit | 356ff18cb9386c5612c02511fcef532cc0f13e22 (patch) | |
| tree | 77e42123789f69356404a325e22a84c93eae5021 | |
| parent | ef1459a50e3959ef98b792a0e912ebcfea233c13 (diff) | |
| parent | 2293a621bf8e47cc4d35bba11e1e740a529dc2f0 (diff) | |
Merge branch 'master' of ssh://git.wormcar.gay:2200/devinf/nix-config
| -rw-r--r-- | modules/home-manager/shell.nix | 3 | ||||
| -rw-r--r-- | modules/nixos/environment.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/headscale.nix | 19 |
3 files changed, 10 insertions, 13 deletions
diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index ad435da..9378034 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -14,9 +14,6 @@ cat = "bat -f # --paging never"; }; configFile.source = ../../resources/nushell/config.nu; - environmentVariables = { - MANROFFOPT = "-c"; - }; extraConfig = '' source ~/.cache/starship/init.nu diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix index ab259a2..8b9c328 100644 --- a/modules/nixos/environment.nix +++ b/modules/nixos/environment.nix @@ -15,6 +15,7 @@ EDITOR = "hx"; ZEIT_DB = "/home/defin/Documents/zeit"; NIXPKGS_ALLOW_INSECURE="1"; + MANROFFOPT = "-c"; }; }; } diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix index 5eff02b..e3e6f5a 100644 --- a/modules/nixos/headscale.nix +++ b/modules/nixos/headscale.nix @@ -1,7 +1,7 @@ {config, pkgs, ...}: let domain = "myrmexia.xyz"; - subDomain = "bosco." + "${domain}"; + subDomain = "bosco.${domain}"; in { services = { headscale = { @@ -15,16 +15,15 @@ in { }; }; - nginx.virtualHosts.${subDomain} = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = - "http://localhost:${toString config.services.headscale.port}"; - proxyWebsockets = true; - }; + caddy = { + enable = true; + email = "devin.finlinson@pm.me"; + virtualHosts.${subDomain}.extraConfig = '' + reverse_proxy http://localhost:${toString config.services.headscale.port} + ''; }; }; - environment.systemPackages = [ config.services.headscale.package ]; + networking.firewall.allowedTCPPorts = [ 80 443 ]; } + |