ElnuDev/nix-config
ElnuDev/nix-config
1
1
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: ElnuDev:25cb4f70ece4f41bb41b97587f8f9f2c0bc3f045
Branches Tags
ElnuDev:main
ElnuDev:inky
...
compare: ElnuDev:793eec3ec42179da5618d7637e29ed0e5081baf2
Branches Tags
ElnuDev:main
ElnuDev:inky

3 commits
25cb4f70ec ... 793eec3ec4

Author SHA1 Message Date
ElnuDev
793eec3ec4 Remove unnecessary assignment to networking.search 2023-08-07 19:23:38 -07:00
ElnuDev
91a3b262c5 Use MagicDNS 2023-08-07 17:01:35 -07:00
ElnuDev
d4bb4e7ad9 Make MagicDNS fully qualified hostnames work 2023-08-07 15:02:42 -07:00
5 changed files with 12 additions and 24 deletions
Show stats Expand all files Collapse all files

12
hosts/desktop.nix
View file

@ -34,7 +34,6 @@ in
networking = { networking = {
networkmanager.enable = true; networkmanager.enable = true;
resolvconf.enable = false; # prevent default nameservers
nameservers = [ "1.1.1.1" "1.0.0.1" ]; nameservers = [ "1.1.1.1" "1.0.0.1" ];
}; };
@ -57,13 +56,10 @@ in
# To prevent `Unit dconf.service not found.` after theming GTK in HM # To prevent `Unit dconf.service not found.` after theming GTK in HM
programs.dconf.enable = true; programs.dconf.enable = true;
networking.extraHosts = '' networking.hosts = {
192.168.0.26 elnuhub "192.168.0.26" = [ "elnuhub.local" ];
192.168.0.26 elnuhub.local "24.199.72.8" = [ "elnudrop.local" ];
24.199.72.8 elnudrop };
24.199.72.8 elnudrop.local
${tailscale.hosts}
'';
#sound.enable = true; #sound.enable = true;
#hardware.pulseaudio.enable = true; #hardware.pulseaudio.enable = true;

7
hosts/elnudrop/hosts/jichan.org/default.nix
View file

@ -1,4 +1,3 @@
with import ../../../../modules/tailscale/default.nix;
let host = "jichan.org"; in { let host = "jichan.org"; in {
services.nginx.virtualHosts."www.${host}" = { services.nginx.virtualHosts."www.${host}" = {
forceSSL = true; forceSSL = true;
@ -12,7 +11,7 @@ let host = "jichan.org"; in {
error_page 502 /502.html; error_page 502 /502.html;
''; '';
locations = { locations = {
"/".proxyPass = "http://${elnuhub}:3334"; "/".proxyPass = "http://elnuhub:3334";
"/502.html".root = "${./502}"; "/502.html".root = "${./502}";
"/logo.svg".root = "${./502}"; "/logo.svg".root = "${./502}";
"/missing.min.css".root = "${../shared/502}"; "/missing.min.css".root = "${../shared/502}";
@ -20,7 +19,7 @@ let host = "jichan.org"; in {
# Formerly tatoeba.elnu.com # Formerly tatoeba.elnu.com
# https://git.elnu.com/ElnuDev/tatoeba-api # https://git.elnu.com/ElnuDev/tatoeba-api
"/api/tatoeba/" = { "/api/tatoeba/" = {
proxyPass = "http://${elnuhub}:3001"; proxyPass = "http://elnuhub:3001";
extraConfig = '' extraConfig = ''
rewrite ^/api/tatoeba/(.*) /$1 break; rewrite ^/api/tatoeba/(.*) /$1 break;
''; '';
@ -29,7 +28,7 @@ let host = "jichan.org"; in {
# Formerly images.elnu.com # Formerly images.elnu.com
# https://git.elnu.com/ElnuDev/image-api # https://git.elnu.com/ElnuDev/image-api
"/api/images/" = { "/api/images/" = {
proxyPass = "http://${elnuhub}:3002"; proxyPass = "http://elnuhub:3002";
extraConfig = '' extraConfig = ''
rewrite ^/api/images/(.*) /$1 break; rewrite ^/api/images/(.*) /$1 break;
''; '';

2
hosts/elnudrop/hosts/tegakituesday.com/default.nix
View file

@ -12,7 +12,7 @@ let host = "tegakituesday.com"; in {
error_page 502 /502.html; error_page 502 /502.html;
''; '';
locations = { locations = {
"/".proxyPass = "http://${elnuhub}:3335"; "/".proxyPass = "http://elnuhub:3335";
"/502.html".root = "${./502}"; "/502.html".root = "${./502}";
"/mascot.png".root = "${./502}"; "/mascot.png".root = "${./502}";
"/missing.min.css".root = "${../shared/502}"; "/missing.min.css".root = "${../shared/502}";

5
hosts/elnudrop/modules/headscale.nix
View file

@ -10,7 +10,10 @@ in {
port = 8080; port = 8080;
settings = { settings = {
server_url = "https://${domain}"; server_url = "https://${domain}";
dns_config.base_domain = baseDomain; dns_config = {
base_domain = baseDomain;
domains = [ baseDomain ];
};
}; };
}; };
environment.systemPackages = [ config.services.headscale.package ]; environment.systemPackages = [ config.services.headscale.package ];

10
modules/tailscale/default.nix
View file

@ -1,10 +0,0 @@
rec {
elnu = "100.64.0.1";
elnudrop = "100.64.0.2";
elnuhub = "100.64.0.3";
hosts = ''
${elnu} elnu.elnu.com
${elnudrop} elnudrop.elnu.com
${elnuhub} elnuhub.elnu.com
'';
}