vskilet
/
nixos-config
forked from nyanloutre/nixos-config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

maj 20.03

This commit is contained in:
nyanloutre 2020-03-02 22:38:36 +01:00
parent 72d0802b67
commit ec60e54c9a
4 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
overlays/riot-web.nix
View File

@ -1,17 +1,15 @@
self: super: self: super:
{ {
riot-web = super.riot-web.override { riot-web = super.riot-web.override {
conf = '' conf = {
{ default_hs_url = "https://matrix.nyanlout.re";
"default_hs_url": "https://matrix.nyanlout.re", default_is_url = "https://vector.im";
"default_is_url": "https://vector.im", brand = "Nyanloutre";
"brand": "Nyanloutre", default_theme = "dark";
"default_theme": "dark", integrations_ui_url = "https://dimension.t2bot.io/riot";
"integrations_ui_url": "https://dimension.t2bot.io/riot", integrations_rest_url = "https://dimension.t2bot.io/api/v1/scalar";
"integrations_rest_url": "https://dimension.t2bot.io/api/v1/scalar", integrations_widgets_urls = ["https://dimension.t2bot.io/widgets"];
"integrations_widgets_urls": ["https://dimension.t2bot.io/widgets"], integrations_jitsi_widget_url = "https://dimension.t2bot.io/widgets/jitsi";
"integrations_jitsi_widget_url": "https://dimension.t2bot.io/widgets/jitsi" };
}
'';
}; };
} }

1
services/haproxy-acme.nix
View File

@ -126,6 +126,7 @@ in
}; };
}; };
security.acme.acceptTerms = true;
security.acme.certs = { security.acme.certs = {
${cfg.domaine} = { ${cfg.domaine} = {
extraDomains = mapAttrs' (name: value: extraDomains = mapAttrs' (name: value:

2
systems/LoutreOS/configuration.nix
View File

@ -33,7 +33,7 @@ in
]; ];
nixpkgs.config.allowUnfree = false; nixpkgs.config.allowUnfree = false;
nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.pname).name [ "factorio-headless" "perl5.30.0-slimserver" "minecraft-server" ]); nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.pname).name [ "factorio-headless" "perl5.30.1-slimserver" "minecraft-server" ]);
services.zfs = { services.zfs = {
autoSnapshot.enable = true; autoSnapshot.enable = true;

58
systems/LoutreOS/services.nix
View File

@ -262,36 +262,36 @@ in
}; };
}; };
systemd.services.minecraft-overviewer = # systemd.services.minecraft-overviewer =
let # let
clientJar = pkgs.fetchurl { # clientJar = pkgs.fetchurl {
url = "https://overviewer.org/textures/1.14"; # url = "https://overviewer.org/textures/1.14";
sha256 = "0fij9wac7vj6h0kd3mfhqpn0w9gl8pbs9vs9s085zajm0szpr44k"; # sha256 = "0fij9wac7vj6h0kd3mfhqpn0w9gl8pbs9vs9s085zajm0szpr44k";
name = "client.jar"; # name = "client.jar";
}; # };
configFile = pkgs.runCommand "overviewer-config" { CLIENT_JAR = clientJar; } '' # configFile = pkgs.runCommand "overviewer-config" { CLIENT_JAR = clientJar; } ''
substitute ${./config-overviewer.py} $out \ # substitute ${./config-overviewer.py} $out \
--subst-var CLIENT_JAR # --subst-var CLIENT_JAR
''; # '';
in # in
{ # {
script = '' # script = ''
${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile} # ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile}
${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile} --genpoi # ${pkgs.minecraft-overviewer}/bin/overviewer.py --config ${configFile} --genpoi
rm /var/www/minecraft-overviewer/progress.json # rm /var/www/minecraft-overviewer/progress.json
''; # '';
serviceConfig = { # serviceConfig = {
User = "nginx"; # User = "nginx";
Group = "nginx"; # Group = "nginx";
}; # };
}; # };
systemd.timers.minecraft-overviewer = { # systemd.timers.minecraft-overviewer = {
wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];
timerConfig = { # timerConfig = {
OnCalendar = "*-*-* 04:00:00"; # OnCalendar = "*-*-* 04:00:00";
}; # };
}; # };
systemd.packages = with pkgs; [ systemd.packages = with pkgs; [
tgt tgt