From 2fbe30b57fc2fb96955645851b64c7977cde3d69 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 11 Dec 2023 21:12:04 +0000 Subject: simplified string handling --- modules/nixos/headscale.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix index 5eff02b..b5456ea 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 = { -- cgit v1.2.3 From 349375f1425a73b1e4ee805820d6ac7557e755f8 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 11 Dec 2023 21:16:39 +0000 Subject: hopefully fixed nginx reverse proxy --- modules/nixos/headscale.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix index b5456ea..a4c9308 100644 --- a/modules/nixos/headscale.nix +++ b/modules/nixos/headscale.nix @@ -27,4 +27,15 @@ in { }; environment.systemPackages = [ config.services.headscale.package ]; + + security.acme = { + acceptTerms = true; + email = "devin.finlinson@pm.me"; + }; + + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; } + -- cgit v1.2.3 From 91124b5f7a2687fdba3cba9c8936cc57fcb672ee Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 11 Dec 2023 21:57:07 +0000 Subject: trying cadd reverse proxy, looks easier to configure --- modules/nixos/headscale.nix | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix index a4c9308..bde6fae 100644 --- a/modules/nixos/headscale.nix +++ b/modules/nixos/headscale.nix @@ -15,27 +15,32 @@ in { }; }; - nginx.virtualHosts.${subDomain} = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = - "http://localhost:${toString config.services.headscale.port}"; - proxyWebsockets = true; - }; - }; - }; + # nginx.virtualHosts.${subDomain} = { + # forceSSL = true; + # enableACME = true; + # locations."/" = { + # proxyPass = + # "http://localhost:${toString config.services.headscale.port}"; + # proxyWebsockets = true; + # }; + # }; + # }; + + # environment.systemPackages = [ config.services.headscale.package ]; - environment.systemPackages = [ config.services.headscale.package ]; + # security.acme = { + # acceptTerms = true; + # email = "devin.finlinson@pm.me"; + # }; - security.acme = { - acceptTerms = true; + services.caddy = { + enable = true; email = "devin.finlinson@pm.me"; + virtualHosts.${subDomain}.extraConfig = '' + reverse_proxy http://localhost:${toString config.services.headscale.port} + ''; }; - networking.firewall.allowedTCPPorts = [ - 80 - 443 - ]; + networking.firewall.allowedTCPPorts = [ 80 443 ]; } -- cgit v1.2.3 From c7d10866854bd1b4896d984f82c9a15cdc8bbe32 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 11 Dec 2023 22:01:31 +0000 Subject: missing bracket --- modules/nixos/headscale.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix index bde6fae..04b17d6 100644 --- a/modules/nixos/headscale.nix +++ b/modules/nixos/headscale.nix @@ -33,12 +33,13 @@ in { # email = "devin.finlinson@pm.me"; # }; - services.caddy = { - enable = true; - email = "devin.finlinson@pm.me"; - virtualHosts.${subDomain}.extraConfig = '' - reverse_proxy http://localhost:${toString config.services.headscale.port} - ''; + caddy = { + enable = true; + email = "devin.finlinson@pm.me"; + virtualHosts.${subDomain}.extraConfig = '' + reverse_proxy http://localhost:${toString config.services.headscale.port} + ''; + }; }; networking.firewall.allowedTCPPorts = [ 80 443 ]; -- cgit v1.2.3 From 99a9130869ff0804fabfa20ff03d1328114bebdb Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 11 Dec 2023 22:54:19 +0000 Subject: cleaned comments --- modules/nixos/headscale.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix index 04b17d6..e3e6f5a 100644 --- a/modules/nixos/headscale.nix +++ b/modules/nixos/headscale.nix @@ -15,24 +15,6 @@ in { }; }; - # nginx.virtualHosts.${subDomain} = { - # forceSSL = true; - # enableACME = true; - # locations."/" = { - # proxyPass = - # "http://localhost:${toString config.services.headscale.port}"; - # proxyWebsockets = true; - # }; - # }; - # }; - - # environment.systemPackages = [ config.services.headscale.package ]; - - # security.acme = { - # acceptTerms = true; - # email = "devin.finlinson@pm.me"; - # }; - caddy = { enable = true; email = "devin.finlinson@pm.me"; -- cgit v1.2.3 From 2293a621bf8e47cc4d35bba11e1e740a529dc2f0 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 11 Dec 2023 22:54:45 +0000 Subject: moved env variable to env file --- modules/home-manager/shell.nix | 3 --- modules/nixos/environment.nix | 1 + 2 files changed, 1 insertion(+), 3 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 225ddda..a4a18a8 100644 --- a/modules/nixos/environment.nix +++ b/modules/nixos/environment.nix @@ -13,6 +13,7 @@ MANPAGER = "sh -c 'col -bx | bat -l man -p'"; EDITOR = "hx"; ZEIT_DB = "/home/defin/Documents/zeit"; + MANROFFOPT = "-c"; }; }; } -- cgit v1.2.3