diff --git a/machines/bakunin/configuration.nix b/machines/bakunin/configuration.nix index 5fc0734..a526f0e 100644 --- a/machines/bakunin/configuration.nix +++ b/machines/bakunin/configuration.nix @@ -53,7 +53,7 @@ in libreoffice gimp inkscape - okular + kdePackages.okular element-desktop chromium mpv diff --git a/machines/louise/configuration.nix b/machines/louise/configuration.nix index bf1272f..85bc856 100644 --- a/machines/louise/configuration.nix +++ b/machines/louise/configuration.nix @@ -36,7 +36,7 @@ libreoffice gimp inkscape - okular + kdePackages.okular element-desktop chromium mpv diff --git a/machines/lucia/configuration.nix b/machines/lucia/configuration.nix index 3688f84..778f186 100644 --- a/machines/lucia/configuration.nix +++ b/machines/lucia/configuration.nix @@ -35,8 +35,7 @@ in services = { dokuwiki.sites."wiki.malobeo.org" = { - enable = true; - #acl = "* @ALL 8"; # everyone can edit using this config + #acl = "* @ALL 8"; # everyone can edit using this config # note there is a users file at # /var/lib/dokuwiki//users.auth.php # makes sense to edit it by hand diff --git a/machines/modules/malobeo/microvm_host.nix b/machines/modules/malobeo/microvm_host.nix index 9b67d63..b11881a 100644 --- a/machines/modules/malobeo/microvm_host.nix +++ b/machines/modules/malobeo/microvm_host.nix @@ -62,7 +62,7 @@ in addresses = if cfg.enableHostBridgeUnstable then [ { Address = "10.0.0.1/24"; } ] else [ - { addressConfig.Address = "10.0.0.1/24"; } + { Address = "10.0.0.1/24"; } ]; }; diff --git a/machines/overwatch/configuration.nix b/machines/overwatch/configuration.nix index 75ed016..aa2d89e 100644 --- a/machines/overwatch/configuration.nix +++ b/machines/overwatch/configuration.nix @@ -66,9 +66,9 @@ with lib; services.nginx = { enable = true; - virtualHosts.${config.services.grafana.domain} = { + virtualHosts.${config.services.grafana.settings.server.domain} = { locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.grafana.port}"; + proxyPass = "http://127.0.0.1:${toString config.services.grafana.settings.server.http_port}"; proxyWebsockets = true; extraConfig = '' diff --git a/outputs.nix b/outputs.nix index 60d04c1..7b3ebd8 100644 --- a/outputs.nix +++ b/outputs.nix @@ -37,7 +37,7 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems sops.sops-init-gpg-key pkgs.sops pkgs.age - pkgs.python310Packages.grip + pkgs.python313Packages.grip pkgs.mdbook pkgs.ssh-to-age microvmpkg.microvm