tranquil.farm / tranquil-pds
Our Personal Data Server from scratch! tranquil.farm
oauth atproto pds rust postgresql objectstorage fun
fork atom

refactor(nix): update nix module to use the built-in frontend server #33

merged opened by nel.pet targeting main from feat/built-in-frontend-server
STACK 2
#33 refactor(nix): update nix module to use the built-in frontend server
7
#4
#32 feat: add in-backend frontend hosting back
0
#4
Labels

None yet.

Participants 3
AT URI
at://did:plc:h5wsnqetncv6lu2weom35lg2/sh.tangled.repo.pull/3mfywro7v6222
+13 -15
Interdiff #0 → #1
unified split
+13 -15
module.nix
··· 64 ''; 65 }; 66 67 - frontend = { 68 - enable = lib.mkEnabeOption "serving the frontend from the backend. Disable to server the frontend manually" 69 - // { default = true; }; 70 - 71 - package = mkOption { 72 - type = types.nullOr types.package; 73 - default = self.packages.${pkgs.stdenv.hostPlatform.system}.tranquil-frontend; 74 - defaultText = lib.literalExpression "self.packages.\${pkgs.stdenv.hostPlatform.system}.tranquil-frontend"; 75 - description = "Frontend package to be served by the backend"; 76 - }; 77 - }; 78 - 79 settings = mkOption { 80 type = types.submodule { 81 freeformType = settingsFormat.type; ··· 108 }; 109 }; 110 111 storage = { 112 path = mkOption { 113 type = types.path; ··· 175 }; 176 }) 177 178 - { 179 - services.tranquil-pds.settings.frontend.dir = lib.mkDefault cfg.frontend.package; 180 - 181 users.users.${cfg.user} = { 182 isSystemUser = true; 183 inherit (cfg) group;
··· 64 ''; 65 }; 66 67 settings = mkOption { 68 type = types.submodule { 69 freeformType = settingsFormat.type; ··· 96 }; 97 }; 98 99 + frontend = { 100 + enable = lib.mkEnabeOption "serving the frontend from the backend. Disable to server the frontend manually" 101 + // { default = true; }; 102 + 103 + dir = mkOption { 104 + type = types.nullOr types.package; 105 + default = self.packages.${pkgs.stdenv.hostPlatform.system}.tranquil-frontend; 106 + defaultText = lib.literalExpression "self.packages.\${pkgs.stdenv.hostPlatform.system}.tranquil-frontend"; 107 + description = "Frontend package to be served by the backend"; 108 + }; 109 + }; 110 + 111 storage = { 112 path = mkOption { 113 type = types.path; ··· 175 }; 176 }) 177 178 + { 179 users.users.${cfg.user} = { 180 isSystemUser = true; 181 inherit (cfg) group;

History

5 rounds 7 comments
sign up or login to add to the discussion
nel.pet submitted #4
diff interdiff
1 commit
expand
ff77ae87
refactor(nix): update nix module to use the built-in frontend server
expand 0 comments
pull request successfully merged
nel.pet submitted #3
diff interdiff
1 commit
expand
1a2d8927
refactor(nix): update nix module to use the built-in frontend server
expand 4 comments
isabelroses.com

still looks great :D

nel.pet

pfff only resubmitted for a rebase heh

isabelroses.com

hehe

lewis.moe

el geetee em

nel.pet submitted #2
diff interdiff
1 commit
expand
58d9b8ae
refactor(nix): update nix module to use the built-in frontend server
expand 1 comment
nel.pet submitted #1
diff
1 commit
expand
e2b33959
refactor(nix): update nix module to use the built-in frontend server
expand 0 comments
nel.pet submitted #0
diff
1 commit
expand
b6ff0295
refactor(nix): update nix module to use the built-in frontend server
expand 2 comments
isabelroses.com

im just thinking whats the point of the separate frontend options when we now have similar options under settings?

nel.pet

oh true. can probably just slap them together under settings.frontend. enable still being enable but dir being what is now package?