Compare commits

..

1 commit

Author SHA1 Message Date
cy
e0010827ab
flake update
Signed-off-by: cy <cy@cy7.sh>
2025-02-07 20:33:15 -05:00
6 changed files with 17 additions and 70 deletions

32
flake.lock generated
View file

@ -562,11 +562,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739002622, "lastModified": 1738878603,
"narHash": "sha256-PtJV5OYQF7XO6XkDYypsYJS3+OsgYaYSmkO3I/A7lZo=", "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "947eef9e99c42346cf0aac2bebe1cd94924c173b", "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -683,11 +683,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1739016888, "lastModified": 1738941053,
"narHash": "sha256-JUOvTAYx+/bAec9H7C/nnpT1NRm/6tdy5EZ/XuUGHlA=", "narHash": "sha256-9xhDUs6BKrVAgR0FZtoOQRLW6rJI2djoCKODO8lvJ+M=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "72326c404487bbf8dc6ee069930c6c2a0319857e", "rev": "00a1afe022a0e4eee38759ccfba945c3eb74472e",
"revCount": 17371, "revCount": 17368,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/lix" "url": "https://git.lix.systems/lix-project/lix"
}, },
@ -737,11 +737,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1738999284, "lastModified": 1738958180,
"narHash": "sha256-6xp1jVRoj3bRS6ULQgrjSdts6s0JC9bBq0PAhjdMrPM=", "narHash": "sha256-I1BUQ6qbXg0vZMffrdD/dV/1R+YMBVySgSk3fA9snf8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "712618918a8c0ef7997f45e135b0544021a3a6be", "rev": "eaf57f2dbdd448d541bda6049ce99aab070f0db1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1065,11 +1065,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1739011474, "lastModified": 1738923654,
"narHash": "sha256-Kw8za62P1hazJCErDrGdhDMcg+Vr9UPS3YdzswcSBsk=", "narHash": "sha256-ozZdT3iS0GKhvwJtoPxvCKmMHKFkAf7clkGlDn9WbQ0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "477ea709554fe06543c1c7f4efac469ede9bc5fc", "rev": "f59e5367f7449f906bdd01b3286750ce00fef306",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1285,11 +1285,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738981474, "lastModified": 1738895285,
"narHash": "sha256-YIELTXxfATG0g1wXjyaOWA4qrlubds3MG4FvMPCxSGg=", "narHash": "sha256-4Ukr4reJfQ67c6QqIxbX47wnPIGxE8BXCAEPu1C3MFM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5c571e5ff246d8fc5f76ba6e38dc8edb6e4002fe", "rev": "85f3aed5f4b8eb312c6e8fe8c476bac248aed75f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -111,7 +111,7 @@
nixpkgs-review nixpkgs-review
just just
hugo hugo
ghidra ghidra-bin
sequoia sequoia
sccache sccache
awscli2 awscli2

View file

@ -205,6 +205,4 @@
}; };
virtualisation.oci-containers.backend = "podman"; virtualisation.oci-containers.backend = "podman";
environment.enableAllTerminfo = true; environment.enableAllTerminfo = true;
my.roundcube.enable = true;
} }

View file

@ -177,7 +177,6 @@
sbctl # secure boot sbctl # secure boot
wine-wayland wine-wayland
wine64 wine64
solaar
]; ];
environment.sessionVariables = { environment.sessionVariables = {

View file

@ -3,6 +3,5 @@
imports = [ imports = [
./backup.nix ./backup.nix
./caddy.nix ./caddy.nix
./roundcube.nix
]; ];
} }

View file

@ -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
'';
};
}