diff --git a/flake.nix b/flake.nix index e9ef1840b..d6de1f256 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,13 @@ { inputs = { - nixpkgs.url = "flake:nixpkgs/nixos-22.11"; + nixpkgs.url = "flake:nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1"; simple-nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05"; inputs = { nixpkgs.follows = "nixpkgs-unstable"; - nixpkgs-22_11.follows = "nixpkgs"; + nixpkgs-23_05.follows = "nixpkgs"; }; }; dogetipbot-telegram = { @@ -46,7 +46,6 @@ ]; hosts.loutreos.modules = [ - "${nixpkgs-unstable}/nixos/modules/services/web-apps/photoprism.nix" simple-nixos-mailserver.nixosModule dogetipbot-telegram.nixosModule ipmihddtemp.nixosModule diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index e292f440a..49da3b01f 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -22,7 +22,7 @@ supportedFilesystems = [ "zfs" ]; - tmpOnTmpfs = true; + tmp.useTmpfs = true; }; documentation.nixos.enable = false; @@ -168,9 +168,11 @@ services.openssh = { enable = true; - permitRootLogin = "no"; - passwordAuthentication = false; - forwardX11 = true; + settings = { + PermitRootLogin = "no"; + PasswordAuthentication = false; + X11Forwarding = true; + }; }; users = { diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index e02810492..39d1e2a2e 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -62,7 +62,7 @@ in }; # Certificate setup - certificateScheme = 1; + certificateScheme = "manual"; certificateFile = "/var/lib/acme/${domaine}/fullchain.pem"; keyFile = "/var/lib/acme/${domaine}/key.pem"; diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index 243d4d7be..52bf00912 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -262,7 +262,7 @@ in }; }; "ci.nyanlout.re" = simpleReverse 52350; - "gitea.nyanlout.re" = simpleReverse config.services.gitea.httpPort; + "gitea.nyanlout.re" = simpleReverse config.services.gitea.settings.server.HTTP_PORT; "musique.nyanlout.re" = simpleReverse config.services.navidrome.settings.Port; "photo.nyanlout.re" = recursiveUpdate (simpleReverse config.services.photoprism.port) { locations."/" = { @@ -350,14 +350,16 @@ in gitea = { enable = true; - httpPort = 3001; - rootUrl = "https://gitea.nyanlout.re/"; database = { type = "postgres"; port = 5432; passwordFile = "/var/lib/gitea/custom/conf/database_password"; }; settings = { + server = { + HTTP_PORT = 3001; + ROOT_URL = "https://gitea.nyanlout.re/"; + }; ui.DEFAULT_THEME = "arc-green"; log.LEVEL = "Warn"; service.DISABLE_REGISTRATION = true;