update system, packages and dependencies
This commit is contained in:
parent
fa6f062830
commit
3e30171637
4 changed files with 15 additions and 15 deletions
2
calendar
2
calendar
|
|
@ -1 +1 @@
|
|||
Subproject commit df2d51b66631c5149e5a4d7db73c0ccad60bb6fc
|
||||
Subproject commit 3b327433c648c7089b3c82ca19c81ad351c8462b
|
||||
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -35,16 +35,16 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1711460390,
|
||||
"narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
|
||||
"lastModified": 1718835956,
|
||||
"narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
|
||||
"rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-23.11",
|
||||
"ref": "nixos-24.05",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
description = "Spawns lightweight nixos vm in a shell";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-23.11";
|
||||
nixpkgs.url = "nixpkgs/nixos-24.05";
|
||||
nixos-shell.url = "github:Mic92/nixos-shell";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
(self: super: {
|
||||
# Remove first run wizard and password policy check from Nextcloud
|
||||
# package
|
||||
nextcloud28 = super.nextcloud28.overrideAttrs (oldAttrs: rec {
|
||||
nextcloud29 = super.nextcloud29.overrideAttrs (oldAttrs: rec {
|
||||
installPhase = oldAttrs.installPhase + ''
|
||||
mkdir -p $out/
|
||||
cp -R . $out/
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
# Setup Nextcloud including apps
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
package = pkgs.nextcloud28;
|
||||
package = pkgs.nextcloud29;
|
||||
hostName = "localhost";
|
||||
extraApps = with config.services.nextcloud.package.packages.apps; {
|
||||
inherit contacts calendar;
|
||||
|
|
@ -82,8 +82,7 @@
|
|||
};
|
||||
appstoreEnable = true;
|
||||
configureRedis = true;
|
||||
# FIXME rename to settings with 24.05
|
||||
extraOptions = {
|
||||
settings = {
|
||||
mail_smtpmode = "sendmail";
|
||||
mail_sendmailmode = "pipe";
|
||||
trusted_domains = [ "10.100.100.1" ];
|
||||
|
|
@ -100,10 +99,10 @@
|
|||
};
|
||||
|
||||
nixos-shell.mounts.extraMounts = {
|
||||
#"/var/lib/nextcloud/store-apps/cleanup" = {
|
||||
# target = /home/onny/projects/nixos-nextcloud-testumgebung/cleanup;
|
||||
# cache = "none";
|
||||
#};
|
||||
"/var/lib/nextcloud/store-apps/cleanup" = {
|
||||
target = /home/onny/projects/nixos-nextcloud-testumgebung/cleanup;
|
||||
cache = "none";
|
||||
};
|
||||
#"/var/lib/nextcloud/server" = {
|
||||
# target = /home/onny/projects/nixos-nextcloud-testumgebung/server;
|
||||
# cache = "none";
|
||||
|
|
@ -113,6 +112,7 @@
|
|||
#services.nginx.virtualHosts."localhost".root = lib.mkForce "/var/lib/nextcloud/server";
|
||||
|
||||
# Setup mail server
|
||||
# FIXME maybe switchto stalwart
|
||||
services.maddy = {
|
||||
enable = true;
|
||||
hostname = "localhost";
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
system.stateVersion = "23.11";
|
||||
system.stateVersion = "24.05";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
sqlite sqldiff
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue