Fediversity/simple-nixos-fediverse
Archived
7
1
Fork 2
Code Issues 23 Pull requests 1 Actions Projects Wiki Activity

nixos-test-pixelfed-wip #22

Merged
taeer merged 11 commits from nixos-test-pixelfed-wip into main 2024-09-20 17:47:21 +02:00
Conversation 0 Commits 11 Files changed 13 +5 -8
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2ff8975b6b - Show all commits

13
fediversity/default.nix
View file

@ -2,7 +2,7 @@
let let
inherit (builtins) toString; inherit (builtins) toString;
inherit (lib) mkOption; inherit (lib) mkOption mkEnableOption;
inherit (lib.types) types; inherit (lib.types) types;
in { in {
@ -15,10 +15,7 @@ in {
options = { options = {
fediversity = { fediversity = {
enable = mkOption { enable = mkEnableOption "the collection of services bundled under Fediversity";
type = types.bool;
default = false;
};
garage = mkOption { garage = mkOption {
type = types.anything; type = types.anything;
Niols marked this conversation as resolved Outdated
taeer commented 2024-09-17 22:44:05 +02:00
Outdated
Review
Copy link

This can just be

fediversity = mkEnableOption "the collection of services bundled under fediversity";
This can just be ``` fediversity = mkEnableOption "the collection of services bundled under fediversity"; ```
Niols commented 2024-09-20 16:34:32 +02:00
Outdated
Review
Copy link

Thanks! Done in 2ff8975b6b.

Thanks! Done in 2ff8975b6b2f19d5ffbd7574bd76494bf532d048.
@ -28,9 +25,9 @@ in {
type = types.string; type = types.string;
}; };
mastodon.enable = mkOption { type = types.bool; default = false; }; mastodon.enable = mkEnableOption "default Fediversity Mastodon configuration";
Niols marked this conversation as resolved Outdated
taeer commented 2024-09-17 22:53:40 +02:00
Outdated
Review
Copy link

should be types.str
types.string was being used for too many thing so it got deprecated and now there are several different string types. types.str is the one where you don't want to merge definitions if it's defined in more than one place

should be `types.str` `types.string` was being used for too many thing so it got deprecated and now there are several different string types. `types.str` is the one where you don't want to merge definitions if it's defined in more than one place
Niols commented 2024-09-20 16:36:10 +02:00
Outdated
Review
Copy link

Done in d97772ccc4.

Done in d97772ccc4008417aec2117d62031e9123d8deba.
pixelfed.enable = mkOption { type = types.bool; default = false; }; pixelfed.enable = mkEnableOption "default Fediversity Pixelfed configuration";
peertube.enable = mkOption { type = types.bool; default = false; }; peertube.enable = mkEnableOption "default Fediversity PeerTube configuration";
}; };
}; };
Niols marked this conversation as resolved Outdated
taeer commented 2024-09-17 22:44:39 +02:00
Outdated
Review
Copy link

Similarly, mkEnableOption here

Similarly, `mkEnableOption` here