diff --git a/flake.lock b/flake.lock index 8a1b5f8..2d9e0db 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728308049, - "narHash": "sha256-wjAkG8f5orZ4+wgXmEaFAJkVJS6ORqfgM0zzLEvbUNw=", + "lastModified": 1732727306, + "narHash": "sha256-4R+OVEmJ8yR7/gsxMQtC39b9f61SvELYQwKeXGAyFfo=", "owner": "Mic92", "repo": "nixos-shell", - "rev": "9373ca9522f844a3b8029720c74f340e560e4462", + "rev": "c61dce7cf5dc263d237ba8a7fc175b09642f96eb", "type": "github" }, "original": { @@ -51,16 +51,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730825790, - "narHash": "sha256-3mg9ETbJWsXrF4iMaIACVfiiZe8I/+E9Wxet7C78d1I=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec3d46cd68eff268ed54793ab909d700117f6a66", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "master", + "ref": "nixos-24.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index e88529c..9f621fd 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,7 @@ description = "Spawns lightweight nixos vm in a shell"; inputs = { - # FIXME - #nixpkgs.url = "nixpkgs/nixos-24.11"; - nixpkgs.url = "nixpkgs/master"; + nixpkgs.url = "nixpkgs/nixos-24.11"; nixos-shell.url = "github:Mic92/nixos-shell"; keycloak-realms.url = "github:rorosen/nixpkgs/keycloak-realm-import"; }; diff --git a/nextcloud-extras.nix b/nextcloud-extras.nix index 5f7d708..7edd130 100644 --- a/nextcloud-extras.nix +++ b/nextcloud-extras.nix @@ -127,7 +127,7 @@ in { services.caddy = lib.mkIf (cfg.webserver == "caddy") { enable = mkDefault true; - virtualHosts."${if cfg.https then "https" else "http"}://${cfg.hostName}" = { + virtualHosts."${cfg.hostName}" = { extraConfig = '' encode zstd gzip diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix index f8e8bcb..93f8f9e 100644 --- a/vm-nextcloud.nix +++ b/vm-nextcloud.nix @@ -45,7 +45,7 @@ package = pkgs.nextcloud30; hostName = "localhost"; extraApps = with config.services.nextcloud.package.packages.apps; { - inherit contacts calendar user_oidc hmr_enabler; # files_mindmap; + inherit contacts calendar user_oidc hmr_enabler files_mindmap; }; extraAppsEnable = true; config = { @@ -83,7 +83,6 @@ configureRedis = true; extraOCCCommands = '' ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable cleanup - ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable files_mindmap2 ${config.services.nextcloud.occ}/bin/nextcloud-occ user_oidc:provider Keycloak \ --clientid="nextcloud" \ --clientsecret="4KoWtOWtg8xpRdAoorNan4PdfFMATo91" \ @@ -117,10 +116,6 @@ target = /home/onny/projects/nixos-nextcloud-testumgebung/cleanup; cache = "none"; }; - #"/var/lib/nextcloud/store-apps/files_mindmap2" = { - # target = /home/onny/projects/files_mindmap2; - # cache = "none"; - #}; #"/var/lib/nextcloud/server" = { # target = /home/onny/projects/nixos-nextcloud-testumgebung/server; # cache = "none";