diff options
Diffstat (limited to 'flakes/peertube')
-rw-r--r-- | flakes/peertube/flake.lock | 17 | ||||
-rw-r--r-- | flakes/peertube/flake.nix | 10 |
2 files changed, 11 insertions, 16 deletions
diff --git a/flakes/peertube/flake.lock b/flakes/peertube/flake.lock index 6187115..eeb516a 100644 --- a/flakes/peertube/flake.lock +++ b/flakes/peertube/flake.lock | |||
@@ -17,19 +17,14 @@ | |||
17 | }, | 17 | }, |
18 | "myuids": { | 18 | "myuids": { |
19 | "locked": { | 19 | "locked": { |
20 | "dir": "flakes/myuids", | 20 | "lastModified": 1, |
21 | "lastModified": 1628207001, | 21 | "narHash": "sha256-HkW9YCLQCNBX3Em7J7MjraVEZO3I3PizkVV2QrUdULQ=", |
22 | "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", | 22 | "path": "../myuids", |
23 | "ref": "master", | 23 | "type": "path" |
24 | "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", | ||
25 | "revCount": 865, | ||
26 | "type": "git", | ||
27 | "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" | ||
28 | }, | 24 | }, |
29 | "original": { | 25 | "original": { |
30 | "dir": "flakes/myuids", | 26 | "path": "../myuids", |
31 | "type": "git", | 27 | "type": "path" |
32 | "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" | ||
33 | } | 28 | } |
34 | }, | 29 | }, |
35 | "nixpkgs": { | 30 | "nixpkgs": { |
diff --git a/flakes/peertube/flake.nix b/flakes/peertube/flake.nix index 2f9c8c1..e8153eb 100644 --- a/flakes/peertube/flake.nix +++ b/flakes/peertube/flake.nix | |||
@@ -1,9 +1,7 @@ | |||
1 | { | 1 | { |
2 | description = "A free software to take back control of your videos"; | 2 | description = "A free software to take back control of your videos"; |
3 | inputs.myuids = { | 3 | inputs.myuids = { |
4 | url = "https://git.immae.eu/perso/Immae/Config/Nix.git"; | 4 | url = "path:../myuids"; |
5 | type = "git"; | ||
6 | dir = "flakes/myuids"; | ||
7 | }; | 5 | }; |
8 | inputs.flake-utils.url = "github:numtide/flake-utils"; | 6 | inputs.flake-utils.url = "github:numtide/flake-utils"; |
9 | inputs.nixpkgs.url = "github:NixOS/nixpkgs"; | 7 | inputs.nixpkgs.url = "github:NixOS/nixpkgs"; |
@@ -166,10 +164,10 @@ | |||
166 | nixosModule = { lib, pkgs, config, ... }: | 164 | nixosModule = { lib, pkgs, config, ... }: |
167 | let | 165 | let |
168 | name = "peertube"; | 166 | name = "peertube"; |
169 | cfg = config.services.peertube; | 167 | cfg = config.immaeServices.peertube; |
170 | in | 168 | in |
171 | { | 169 | { |
172 | options.services.peertube = { | 170 | options.immaeServices.peertube = { |
173 | enable = lib.mkEnableOption "Enable Peertube’s service"; | 171 | enable = lib.mkEnableOption "Enable Peertube’s service"; |
174 | user = lib.mkOption { | 172 | user = lib.mkOption { |
175 | type = lib.types.str; | 173 | type = lib.types.str; |
@@ -239,6 +237,8 @@ | |||
239 | 237 | ||
240 | environment.NODE_CONFIG_DIR = "${cfg.dataDir}/config"; | 238 | environment.NODE_CONFIG_DIR = "${cfg.dataDir}/config"; |
241 | environment.NODE_ENV = "production"; | 239 | environment.NODE_ENV = "production"; |
240 | environment.NPM_CONFIG_LOGS_DIR = "${cfg.dataDir}/npm_logs"; | ||
241 | environment.NPM_CONFIG_CACHE = "${cfg.dataDir}/npm_cache"; | ||
242 | environment.HOME = cfg.package; | 242 | environment.HOME = cfg.package; |
243 | 243 | ||
244 | path = [ pkgs.nodejs pkgs.yarn pkgs.bashInteractive pkgs.ffmpeg pkgs.openssl ]; | 244 | path = [ pkgs.nodejs pkgs.yarn pkgs.bashInteractive pkgs.ffmpeg pkgs.openssl ]; |