diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 9dccbd4..f925b36 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -111,7 +111,7 @@ nixpkgs-review just hugo - ghidra + ghidra-bin sequoia sccache awscli2 diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 9577771..100486b 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -205,6 +205,4 @@ }; virtualisation.oci-containers.backend = "podman"; environment.enableAllTerminfo = true; - - my.roundcube.enable = true; } diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 270654d..80768b4 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -177,7 +177,6 @@ sbctl # secure boot wine-wayland wine64 - solaar ]; environment.sessionVariables = { diff --git a/modules/default.nix b/modules/default.nix index 810c2f4..070a96e 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,6 +3,5 @@ imports = [ ./backup.nix ./caddy.nix - ./roundcube.nix ]; } diff --git a/modules/roundcube.nix b/modules/roundcube.nix deleted file mode 100644 index 3f2d8cc..0000000 --- a/modules/roundcube.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.my.roundcube; - fpm = config.services.phpfpm.pools.roundcube; - roundcube = config.services.roundcube; -in -{ - options.my.roundcube = { - enable = lib.mkEnableOption "roundcube webmail"; - }; - - config = lib.mkIf cfg.enable { - services.roundcube = { - enable = true; - configureNginx = false; - package = pkgs.roundcube.withPlugins (p: with p; [ - persistent_login - contextmenu - custom_from - thunderbird_labels - ]); - plugins = [ - "persistent_login" - "contextmenu" - "custom_from" - "thunderbird_labels" - ]; - dicts = with pkgs.aspellDicts; [ en ]; - extraConfig = '' - $config['imap_host'] = "ssl://imap.migadu.com:993"; - $config['smtp_host'] = "ssl://smtp.migadu.com:465"; - $config['smtp_user'] = "%u"; - $config['smtp_pass'] = "%p"; - ''; - }; - - services.phpfpm.pools.roundcube.settings = lib.mapAttrs (name: lib.mkForce) { - "listen.owner" = "caddy"; - "listen.group" = "caddy"; - }; - - services.caddy.virtualHosts."mail.cy7.sh".extraConfig = '' - import common - root ${roundcube.package} - php_fastcgi unix/${fpm.socket} - file_server - ''; - }; -}