update to nixpkgs-unstable
This commit is contained in:
@@ -38,20 +38,20 @@
|
|||||||
in {
|
in {
|
||||||
overlays = import ./overlays.nix {inherit inputs;};
|
overlays = import ./overlays.nix {inherit inputs;};
|
||||||
|
|
||||||
nixosConfigurations.server = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.server = nixpkgs-unstable.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
./users/anon
|
./users/anon
|
||||||
./modules/collections/server.nix
|
./modules/collections/server.nix
|
||||||
./systems/server/configuration.nix
|
./systems/server/configuration.nix
|
||||||
({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
|
({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
|
||||||
home-manager.nixosModules.home-manager
|
home-manager-unstable.nixosModules.home-manager
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
];
|
];
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
## Custom variables (e.g. ip, interface, etc)
|
## Custom variables (e.g. ip, interface, etc)
|
||||||
vars = import ./systems/userdata-default.nix // import ./systems/server/userdata.nix;
|
vars = import ./systems/userdata-default.nix // import ./systems/server/userdata.nix;
|
||||||
pkgsVersion = nixpkgs;
|
pkgsVersion = nixpkgs-unstable;
|
||||||
inherit inputs outputs;
|
inherit inputs outputs;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
"d /data 0770 github-actions-runner nginx -"
|
"d /data 0770 github-actions-runner nginx -"
|
||||||
"d /data/website 0770 github-actions-runner nginx -"
|
"d /data/website 0770 github-actions-runner nginx -"
|
||||||
];
|
];
|
||||||
services.github-runner = {
|
services.github-runners.oberprofis = {
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "nixos-server";
|
name = "nixos-server";
|
||||||
tokenFile = config.age.secrets.github-runner-token.path;
|
tokenFile = config.age.secrets.github-runner-token.path;
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ in
|
|||||||
services.kavita = {
|
services.kavita = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "kavita";
|
user = "kavita";
|
||||||
port = 5000;
|
settings.Port = 5000;
|
||||||
dataDir = baseDir;
|
dataDir = baseDir;
|
||||||
tokenKeyFile = config.age.secrets.kavita.path;
|
tokenKeyFile = config.age.secrets.kavita.path;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -39,21 +39,16 @@ in
|
|||||||
};
|
};
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nextcloud27;
|
package = pkgs.nextcloud28;
|
||||||
https = true;
|
https = true;
|
||||||
hostName = "nextcloud.home.arpa";
|
hostName = "nextcloud.home.arpa";
|
||||||
config.adminpassFile = config.age.secrets.nextcloud-admin.path;
|
config.adminpassFile = config.age.secrets.nextcloud-admin.path;
|
||||||
config.dbtype = "pgsql";
|
config.dbtype = "pgsql";
|
||||||
database.createLocally = true;
|
database.createLocally = true;
|
||||||
config.extraTrustedDomains = [ wireguardIp "nextcloud.home.arpa" ];
|
settings.trusted_domains = [ wireguardIp "nextcloud.home.arpa" ];
|
||||||
home = "/mnt/250ssd/nextcloud";
|
home = "/mnt/250ssd/nextcloud";
|
||||||
extraApps = with config.services.nextcloud.package.packages.apps; {
|
extraApps = with config.services.nextcloud.package.packages.apps; {
|
||||||
inherit onlyoffice calendar mail;
|
inherit onlyoffice calendar mail;
|
||||||
spreed = pkgs.fetchNextcloudApp rec {
|
|
||||||
url = "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz";
|
|
||||||
sha256 = "sha256-LaUG0maatc2YtWQjff7J54vadQ2RE4X6FcW8vFefBh8=";
|
|
||||||
license = "agpl3";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
phpOptions = {
|
phpOptions = {
|
||||||
@@ -61,7 +56,7 @@ in
|
|||||||
post_max_size = lib.mkForce "20G";
|
post_max_size = lib.mkForce "20G";
|
||||||
};
|
};
|
||||||
extraAppsEnable = true;
|
extraAppsEnable = true;
|
||||||
extraOptions.enabledPreviewProviders = [
|
settings.enabledPreviewProviders = [
|
||||||
"OC\\Preview\\BMP"
|
"OC\\Preview\\BMP"
|
||||||
"OC\\Preview\\GIF"
|
"OC\\Preview\\GIF"
|
||||||
"OC\\Preview\\JPEG"
|
"OC\\Preview\\JPEG"
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user