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

LoutreOS: update to 23.05 and rename deprecated options

This commit is contained in:
nyanloutre 2023-06-13 14:05:05 +02:00
parent cacf58c7dd
commit ab08037dc9
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.nix
View File

@ -1,13 +1,13 @@
{ {
inputs = { inputs = {
nixpkgs.url = "flake:nixpkgs/nixos-22.11"; nixpkgs.url = "flake:nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1";
simple-nixos-mailserver = { simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs-unstable"; nixpkgs.follows = "nixpkgs-unstable";
nixpkgs-22_11.follows = "nixpkgs"; nixpkgs-23_05.follows = "nixpkgs";
}; };
}; };
dogetipbot-telegram = { dogetipbot-telegram = {
@ -46,7 +46,6 @@
]; ];
hosts.loutreos.modules = [ hosts.loutreos.modules = [
"${nixpkgs-unstable}/nixos/modules/services/web-apps/photoprism.nix"
simple-nixos-mailserver.nixosModule simple-nixos-mailserver.nixosModule
dogetipbot-telegram.nixosModule dogetipbot-telegram.nixosModule
ipmihddtemp.nixosModule ipmihddtemp.nixosModule

10
systems/LoutreOS/configuration.nix
View File

@ -22,7 +22,7 @@
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
tmpOnTmpfs = true; tmp.useTmpfs = true;
}; };
documentation.nixos.enable = false; documentation.nixos.enable = false;
@ -168,9 +168,11 @@
services.openssh = { services.openssh = {
enable = true; enable = true;
permitRootLogin = "no"; settings = {
passwordAuthentication = false; PermitRootLogin = "no";
forwardX11 = true; PasswordAuthentication = false;
X11Forwarding = true;
};
}; };
users = { users = {

2
systems/LoutreOS/services.nix
View File

@ -62,7 +62,7 @@ in
}; };
# Certificate setup # Certificate setup
certificateScheme = 1; certificateScheme = "manual";
certificateFile = "/var/lib/acme/${domaine}/fullchain.pem"; certificateFile = "/var/lib/acme/${domaine}/fullchain.pem";
keyFile = "/var/lib/acme/${domaine}/key.pem"; keyFile = "/var/lib/acme/${domaine}/key.pem";

8
systems/LoutreOS/web.nix
View File

@ -262,7 +262,7 @@ in
}; };
}; };
"ci.nyanlout.re" = simpleReverse 52350; "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; "musique.nyanlout.re" = simpleReverse config.services.navidrome.settings.Port;
"photo.nyanlout.re" = recursiveUpdate (simpleReverse config.services.photoprism.port) { "photo.nyanlout.re" = recursiveUpdate (simpleReverse config.services.photoprism.port) {
locations."/" = { locations."/" = {
@ -350,14 +350,16 @@ in
gitea = { gitea = {
enable = true; enable = true;
httpPort = 3001;
rootUrl = "https://gitea.nyanlout.re/";
database = { database = {
type = "postgres"; type = "postgres";
port = 5432; port = 5432;
passwordFile = "/var/lib/gitea/custom/conf/database_password"; passwordFile = "/var/lib/gitea/custom/conf/database_password";
}; };
settings = { settings = {
server = {
HTTP_PORT = 3001;
ROOT_URL = "https://gitea.nyanlout.re/";
};
ui.DEFAULT_THEME = "arc-green"; ui.DEFAULT_THEME = "arc-green";
log.LEVEL = "Warn"; log.LEVEL = "Warn";
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;