diff --git a/nix/application/containers.nix b/nix/application/containers.nix index d205109..73664a0 100644 --- a/nix/application/containers.nix +++ b/nix/application/containers.nix @@ -21,7 +21,7 @@ }; }; - # gitlab-runner = a service definition in this file. + # gitlab-runner = a service definition at the bottom of this file. jellyfin = { image = "linuxserver/jellyfin"; @@ -42,13 +42,30 @@ }; }; + mealie = { + image = "hkotel/mealie:omni-nightly"; + ports = [ "52230:3000" ]; + volumes = [ + "/home/sezycei/srv/containerdata/mealie/data:/app/data" + "/home/sezycei/srv/containerdata/mealie/hosts:/etc/hosts" + ]; + environment = { + ALLOW_SIGNUP = "false"; + PGID = "1000"; + PUID = "1000"; + TZ = "America/Chicago"; + BASE_URL = "https://food.eversole.co"; + }; + extraOptions = [ "--network=slirp4netns:enable_ipv6=false" ]; + }; + murmur = { image = "goofball222/murmur"; ports = [ "64738:64738" "64738:64738/udp" ]; volumes = [ - "/home/sezycei/srv/containerdata/murmur/murmur/config:/opt/murmur/config" - "/home/sezycei/srv/containerdata/murmur/murmur/data:/opt/murmur/data" - "/home/sezycei/srv/containerdata/murmur/murmur/log:/opt/murmur/log" + "/home/sezycei/srv/containerdata/murmur/murmur/config:/opt/murmur/config" + "/home/sezycei/srv/containerdata/murmur/murmur/data:/opt/murmur/data" + "/home/sezycei/srv/containerdata/murmur/murmur/log:/opt/murmur/log" ]; environment = { }; }; diff --git a/nix/application/nginx.nix b/nix/application/nginx.nix index 5d5d110..17214b7 100644 --- a/nix/application/nginx.nix +++ b/nix/application/nginx.nix @@ -54,7 +54,10 @@ target = "http://127.0.0.1:3001"; }; "eversole.co" = static { dir = "/var/www/jame.su"; }; - "git.eversole.co" = base { + "food.eversole.co" = proxied { + target = "http://127.0.0.1:52230"; + }; + "git.eversole.co" = base { "/".proxyPass = "http://127.0.0.1:26616"; "/purr".return = "301 https://git.eversole.co/James/purr"; }; diff --git a/nix/system/dns.nix b/nix/system/dns.nix index ce59d46..40acfff 100644 --- a/nix/system/dns.nix +++ b/nix/system/dns.nix @@ -4,54 +4,72 @@ # https://coredns.io/manual/configuration/ # https://github.com/coredns/coredns.io/blob/master/content/manual/configuration.md coredns.config = '' - matri.cx { - template IN A { - answer "{{ .Name }} 0 IN A 192.168.0.130" - } - } + matri.cx { + template IN A { + answer "{{ .Name }} 0 IN A 192.168.0.130" + } + } - mail.matri.cx { - template IN A { - answer "{{ .Name }} 0 IN A 149.28.112.101" - } - } + mail.matri.cx { + template IN A { + answer "{{ .Name }} 0 IN A 149.28.112.101" + } + } - mc.caitlynncox.com { - template IN A { - answer "{{ .Name }} 0 IN A 192.168.0.131" - } - } + mc.caitlynncox.com { + template IN A { + answer "{{ .Name }} 0 IN A 192.168.0.131" + } + } - *.matri.cx { - template IN A { - answer "{{ .Name }} 0 IN A 192.168.0.130" - } - } + *.matri.cx { + template IN A { + answer "{{ .Name }} 0 IN A 192.168.0.130" + } + } - eversole.co { - template IN A { - answer "{{ .Name }} 0 IN A 192.168.0.130" - } - } + eversole.co { + template IN A { + answer "{{ .Name }} 0 IN A 192.168.0.130" + } + } - box.eversole.co { - template IN A { - answer "{{ .Name }} 0 IN A 149.28.112.101" - } - } + box.eversole.co { + template IN A { + answer "{{ .Name }} 0 IN A 149.28.112.101" + } + } - *.eversole.co { - template IN A { - answer "{{ .Name }} 0 IN A 192.168.0.130" - } - } + *.eversole.co { + template IN A { + answer "{{ .Name }} 0 IN A 192.168.0.130" + } + } - . { - forward . 9.9.9.9 149.112.112.112 84.200.69.80 84.200.70.40 - cache - } + . { + forward . 9.9.9.9 149.112.112.112 84.200.69.80 84.200.70.40 + cache + } - ''; + # Stop unblocking these sites. Seriously. + lobste.rs { + template IN A { + answer "{{ .Name }} 0 IN A 127.0.0.1" + } + } + + ycombinator.com { + template IN A { + answer "{{ .Name }} 0 IN A 127.0.0.1" + } + } + + *.ycombinator.com { + template IN A { + answer "{{ .Name }} 0 IN A 127.0.0.1" + } + } + ''; }; } diff --git a/nix/user/users.nix b/nix/user/users.nix index 4142980..f8f3faa 100644 --- a/nix/user/users.nix +++ b/nix/user/users.nix @@ -17,6 +17,9 @@ packages = with pkgs; [ ]; }; - torrent.isNormalUser = true; + torrent = { + isNormalUser = true; + homeMode = "770"; + }; }; }