Fix update to nixos 22.11 on hera
This commit is contained in:
parent
8aa46b2c01
commit
f8025f5b84
|
@ -80,9 +80,9 @@
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"nixos-mailserver": {
|
"nixos-mailserver": {
|
||||||
"branch": "master",
|
"branch": "nixos-22.11",
|
||||||
"repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
|
"repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
|
||||||
"rev": "fe36e7ae0db34862e5397544c7b01472b0febc3a",
|
"rev": "70a970f5a02b7febec1c3065e10c4155b99ecf86",
|
||||||
"type": "git"
|
"type": "git"
|
||||||
},
|
},
|
||||||
"nixos-stable": {
|
"nixos-stable": {
|
||||||
|
|
|
@ -14,7 +14,6 @@ in {
|
||||||
../../roles/standalone
|
../../roles/standalone
|
||||||
../../roles/server
|
../../roles/server
|
||||||
../../roles/git.nix
|
../../roles/git.nix
|
||||||
../../roles/element.nix
|
|
||||||
../../roles/mathechor.de.nix
|
../../roles/mathechor.de.nix
|
||||||
../../roles/monitoring
|
../../roles/monitoring
|
||||||
../../roles/blog.nix
|
../../roles/blog.nix
|
||||||
|
@ -60,7 +59,6 @@ in {
|
||||||
programs = {
|
programs = {
|
||||||
java.enable = true;
|
java.enable = true;
|
||||||
};
|
};
|
||||||
nixpkgs.config.android_sdk.accept_license = true;
|
|
||||||
systemd.services =
|
systemd.services =
|
||||||
{
|
{
|
||||||
pg_backup = {
|
pg_backup = {
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
elementConfig = {
|
|
||||||
default_server_config."m.homeserver" = {
|
|
||||||
server_name = "maralorn.de";
|
|
||||||
base_url = "https://matrix.maralorn.de";
|
|
||||||
};
|
|
||||||
integrations_ui_url = "";
|
|
||||||
integgrations_rest_url = "";
|
|
||||||
integrations_widgets_urls = [];
|
|
||||||
roomDirectory.servers = ["matrix.org" "maralorn.de"];
|
|
||||||
branding.welcomeBackgroundUrl = "https://cloud.maralorn.de/apps/theming/image/background";
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
services.nginx = {
|
|
||||||
enable = true;
|
|
||||||
virtualHosts."element.maralorn.de" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
root = pkgs.element-web.override (old: {conf = elementConfig;});
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -37,7 +37,7 @@ with lib; let
|
||||||
user = "syncserver";
|
user = "syncserver";
|
||||||
group = "syncserver";
|
group = "syncserver";
|
||||||
in {
|
in {
|
||||||
disabledModules = ["services/networking/firefox/sync-server.nix"];
|
disabledModules = ["services/networking/firefox-syncserver.nix"];
|
||||||
|
|
||||||
meta.maintainers = with lib.maintainers; [nadrieril];
|
meta.maintainers = with lib.maintainers; [nadrieril];
|
||||||
|
|
||||||
|
|
|
@ -34,15 +34,15 @@ in {
|
||||||
grafana = {
|
grafana = {
|
||||||
enable = true;
|
enable = true;
|
||||||
auth.anonymous.enable = true;
|
auth.anonymous.enable = true;
|
||||||
extraOptions = {
|
settings = {
|
||||||
SECURITY_ALLOW_EMBEDDING = "true";
|
secrutiy.allow_embedding = "true";
|
||||||
USERS_DEFAULT_THEME = "light";
|
users.default_theme = "light";
|
||||||
AUTH_BASIC_ENABLED = "false";
|
"auth.basic".enabled = "false";
|
||||||
DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH = "${dashboards}/health-status.json";
|
dashboards.default_home_dashboard_path = "${dashboards}/health-status.json";
|
||||||
};
|
};
|
||||||
provision = {
|
provision = {
|
||||||
enable = true;
|
enable = true;
|
||||||
datasources = [
|
datasources.settings.datasources = [
|
||||||
{
|
{
|
||||||
access = "proxy";
|
access = "proxy";
|
||||||
name = "prometheus";
|
name = "prometheus";
|
||||||
|
@ -50,7 +50,7 @@ in {
|
||||||
url = "http://localhost:9090";
|
url = "http://localhost:9090";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
dashboards = [
|
dashboards.settings.providers = [
|
||||||
{
|
{
|
||||||
name = "Static dashboards";
|
name = "Static dashboards";
|
||||||
options.path = dashboards;
|
options.path = dashboards;
|
||||||
|
|
|
@ -1,7 +1,12 @@
|
||||||
self: super: let
|
self: super: let
|
||||||
unfree = import self.sources."${self.nixpkgs-channel}" {config.allowUnfree = true;};
|
unfree = import self.sources."${self.nixpkgs-channel}" {
|
||||||
|
config = {
|
||||||
|
allowUnfree = true;
|
||||||
|
android_sdk.accept_license = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
unstableUnfree = import self.sources.nixos-unstable {config.allowUnfree = true;};
|
unstableUnfree = import self.sources.nixos-unstable {config.allowUnfree = true;};
|
||||||
in {
|
in {
|
||||||
inherit (unfree) discord zoom-us minecraft teamviewer steam;
|
inherit (unfree) discord zoom-us minecraft teamviewer steam androidsdk_9_0;
|
||||||
inherit (unstableUnfree) minecraft-server;
|
inherit (unstableUnfree) minecraft-server;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue