From abcf5f9151fd05f08e931b2d7f63fe4ca88403a6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 26 Dec 2022 20:03:16 +0100 Subject: [PATCH] fix mounting local dev repo --- Makefile | 2 +- vm-nextcloud.nix | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 77a564a..5fda076 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,2 @@ all: - QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::5877-:587" NIX_PATH=nixpkgs=/home/onny/projects/nixpkgs nixos-shell vm-nextcloud.nix + QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::5877-:587" nixos-shell vm-nextcloud.nix diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix index dc25ec0..b853e8b 100644 --- a/vm-nextcloud.nix +++ b/vm-nextcloud.nix @@ -1,6 +1,4 @@ -{ pkgs, config, lib, options, ... }: - with import {}; -{ +{ pkgs, config, lib, options, ... }:{ nixpkgs = { overlays = [ @@ -31,20 +29,23 @@ url = "https://github.com/nextcloud-releases/circles/releases/download/0.21.4/circles-0.21.4.tar.gz"; sha256 = "sha256-gkW9jZvXS86ScuM434mUbvQajYKwHVjm9PfTMNgHL/Q="; }; - calendar = pkgs.stdenvNoCC.mkDerivation rec { - name = "calendar"; - src = /home/onny/projects/calendar; - unpackPhase = ''cp -r --no-preserve=mode $src/* .''; - dontBuild = true; - installPhase = ''cp -r --no-preserve=mode . $out/''; - }; mail = pkgs.nextcloud25Packages.apps.mail; }; extraOptions = { mail_smtpmode = "sendmail"; mail_sendmailmode = "pipe"; + debug = true; + trusted_domains = [ "10.100.100.1" ]; }; }; + # Mount our local development app repository into the VM + nixos-shell.mounts.extraMounts = { + "/var/lib/nextcloud/store-apps/calendar" = { + target = /home/onny/projects/calendar; + cache = "none"; + }; + }; + # Setup mail server services.maddy = { @@ -98,6 +99,8 @@ ${config.services.nextcloud.occ}/bin/nextcloud-occ user:add --password-from-env user2 ${config.services.nextcloud.occ}/bin/nextcloud-occ user:setting user2 settings email "user2@localhost" ${config.services.nextcloud.occ}/bin/nextcloud-occ user:setting admin settings email "admin@localhost" + + ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable calendar ''; serviceConfig = { Type = "oneshot"; @@ -107,6 +110,11 @@ wantedBy = [ "multi-user.target" ]; }; + # FIXME debugging + environment.systemPackages = [ pkgs.php82 ]; + + system.stateVersion = "21.11"; + documentation.info.enable = false; documentation.man.enable = false; documentation.nixos.enable = false;