diff --git a/common/constants.nix b/common/constants.nix index 4d33922..999696e 100644 --- a/common/constants.nix +++ b/common/constants.nix @@ -32,6 +32,7 @@ with lib; { http = 80; https = 443; jellyfin = 8096; + jellyseerr = 52660; vault = 25487; writefreely = 61116; }; diff --git a/flake.lock b/flake.lock index bf86a70..1dc1d5a 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1712765858, - "narHash": "sha256-gWRdIXmNsgOKFNiFOAzo4hleJsl03vu9nLPrkmwmTwY=", + "lastModified": 1712798444, + "narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=", "owner": "nix-community", "repo": "disko", - "rev": "53c4cc48b71bbd98d65fb4c7bc0e2ea22d9a6672", + "rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "hardware": { "locked": { - "lastModified": 1712760404, - "narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=", + "lastModified": 1712909959, + "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e1c4bac14beb8c409d0534382cf967171706b9d9", + "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1712521891, - "narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=", + "lastModified": 1712909442, + "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398", + "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", "type": "github" }, "original": { @@ -206,11 +206,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1712757991, + "narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712122226, - "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 9282eae..0687b4f 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -106,15 +106,15 @@ let usr = config.constants.userName; in { services = { colord.enable = true; desktopManager.plasma6.enable = true; + displayManager = { + autoLogin.user = usr; + sddm = { + enable = true; + wayland.enable = true; + }; + }; xserver = { enable = true; - displayManager = { - autoLogin.user = usr; - sddm = { - enable = true; - wayland.enable = true; - }; - }; videoDrivers = [ "amdgpu" ]; }; }; diff --git a/linux/nebula/jellyfin.nix b/linux/nebula/jellyfin.nix index 2dc4e20..190523a 100644 --- a/linux/nebula/jellyfin.nix +++ b/linux/nebula/jellyfin.nix @@ -3,8 +3,14 @@ { hardware.opengl.enable = true; - services.jellyfin = { - enable = true; - user = config.constants.userName; + services = let const = config.constants; in { + jellyfin = { + enable = true; + user = const.userName; + }; + jellyseerr = { + enable = true; + port = const.port.jellyseerr; + }; }; } diff --git a/linux/singularity/caddy.nix b/linux/singularity/caddy.nix index ed184d5..cbadf9c 100644 --- a/linux/singularity/caddy.nix +++ b/linux/singularity/caddy.nix @@ -7,8 +7,8 @@ virtualHosts = let dn = config.constants.domain; - home = "100.64.0.3"; - local = config.constants.localhost; + homeSrv = s: "nebula:${portStr.${s}}"; + localSrv = s: "${config.constants.localhost}:${portStr.${s}}"; msfqdn = config.mailserver.fqdn; mtfqdn = "matrix.${dn}"; portStr = builtins.mapAttrs (n: v: toString v) config.constants.port; @@ -25,13 +25,13 @@ }` ''; "forgejo.${dn}".extraConfig = '' - reverse_proxy ${home}:${portStr.forgejo} + reverse_proxy ${homeSrv "forgejo"} ''; "headscale.${dn}".extraConfig = '' - reverse_proxy ${local}:${portStr.headscale} + reverse_proxy ${localSrv "headscale"} ''; "jellyfin.${dn}".extraConfig = '' - reverse_proxy ${home}:${portStr.jellyfin} + reverse_proxy ${homeSrv "jellyfin"} ''; ${msfqdn} = { extraConfig = '' @@ -42,18 +42,18 @@ useACMEHost = msfqdn; }; "matrix.${dn}".extraConfig = '' - reverse_proxy /_matrix/* ${home}:${portStr.conduit} + reverse_proxy /_matrix/* ${homeSrv "conduit"} file_server { root ${pkgs.cinny} } ''; "vault.${dn}".extraConfig = '' - reverse_proxy ${local}:${portStr.vault} { + reverse_proxy ${localSrv "vault"} { header_up X-Real-IP {remote_host} } ''; "writefreely.${dn}".extraConfig = '' - reverse_proxy ${home}:${portStr.writefreely} + reverse_proxy ${homeSrv "writefreely"} ''; }; };