Compare commits
3 commits
e0010827ab
...
50afa7ce40
Author | SHA1 | Date | |
---|---|---|---|
50afa7ce40 | |||
3f68b25133 | |||
a1c82ab6f3 |
6 changed files with 82 additions and 29 deletions
56
flake.lock
generated
56
flake.lock
generated
|
@ -120,11 +120,11 @@
|
||||||
"rocksdb": "rocksdb"
|
"rocksdb": "rocksdb"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738740720,
|
"lastModified": 1738969258,
|
||||||
"narHash": "sha256-rE0+UOEfFEGzjjIFdfs1Q4MR/UjVh8Dy6T137Z+ySgo=",
|
"narHash": "sha256-LM2ZVeuqOH0YtIExyOCnwGLPQJhQqiuovBmjiMuvMUo=",
|
||||||
"owner": "girlbossceo",
|
"owner": "girlbossceo",
|
||||||
"repo": "conduwuit",
|
"repo": "conduwuit",
|
||||||
"rev": "fda8b3680986dc8e038d51b93f7d36bf5c991ef6",
|
"rev": "cfcd6eb1a6a117db94e6f9e631a0d881a62d3299",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -562,11 +562,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738753876,
|
"lastModified": 1739002622,
|
||||||
"narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=",
|
"narHash": "sha256-PtJV5OYQF7XO6XkDYypsYJS3+OsgYaYSmkO3I/A7lZo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599",
|
"rev": "947eef9e99c42346cf0aac2bebe1cd94924c173b",
|
||||||
"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": 1738690832,
|
"lastModified": 1739016888,
|
||||||
"narHash": "sha256-gHJkxfk4ePMx5lhcF12r28lX6WdaH+a4y6GZhlaRQ1I=",
|
"narHash": "sha256-JUOvTAYx+/bAec9H7C/nnpT1NRm/6tdy5EZ/XuUGHlA=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "8553adbb414167d969ba720cae02ab0694f38bd4",
|
"rev": "72326c404487bbf8dc6ee069930c6c2a0319857e",
|
||||||
"revCount": 17359,
|
"revCount": 17371,
|
||||||
"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": 1738770770,
|
"lastModified": 1738999284,
|
||||||
"narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=",
|
"narHash": "sha256-6xp1jVRoj3bRS6ULQgrjSdts6s0JC9bBq0PAhjdMrPM=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816",
|
"rev": "712618918a8c0ef7997f45e135b0544021a3a6be",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -770,11 +770,11 @@
|
||||||
"niri-unstable": {
|
"niri-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738768006,
|
"lastModified": 1738911818,
|
||||||
"narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=",
|
"narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "690d6355057ebeba03cbd8ce4905145b834c72f8",
|
"rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1065,11 +1065,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738758495,
|
"lastModified": 1739011474,
|
||||||
"narHash": "sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU=",
|
"narHash": "sha256-Kw8za62P1hazJCErDrGdhDMcg+Vr9UPS3YdzswcSBsk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b",
|
"rev": "477ea709554fe06543c1c7f4efac469ede9bc5fc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1102,11 +1102,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738780056,
|
"lastModified": 1738966895,
|
||||||
"narHash": "sha256-YFzhEMT77o//oQoUivd+huCj6f2L/LmrSfV75+6CCq8=",
|
"narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "2061a9ad95ca320a2bca00de6a9e30dbc5f52d74",
|
"rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1285,11 +1285,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738722444,
|
"lastModified": 1738981474,
|
||||||
"narHash": "sha256-DHVyKCiIQVDqjYoVU2j7UaLNIlOnpB9sP1cPRNRpqvY=",
|
"narHash": "sha256-YIELTXxfATG0g1wXjyaOWA4qrlubds3MG4FvMPCxSGg=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "347fb01821c3cd8d54e563d244a599c1e27a393d",
|
"rev": "5c571e5ff246d8fc5f76ba6e38dc8edb6e4002fe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1355,11 +1355,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738680491,
|
"lastModified": 1738953846,
|
||||||
"narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
|
"narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
|
"rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -111,7 +111,7 @@
|
||||||
nixpkgs-review
|
nixpkgs-review
|
||||||
just
|
just
|
||||||
hugo
|
hugo
|
||||||
ghidra-bin
|
ghidra
|
||||||
sequoia
|
sequoia
|
||||||
sccache
|
sccache
|
||||||
awscli2
|
awscli2
|
||||||
|
|
|
@ -205,4 +205,6 @@
|
||||||
};
|
};
|
||||||
virtualisation.oci-containers.backend = "podman";
|
virtualisation.oci-containers.backend = "podman";
|
||||||
environment.enableAllTerminfo = true;
|
environment.enableAllTerminfo = true;
|
||||||
|
|
||||||
|
my.roundcube.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -177,6 +177,7 @@
|
||||||
sbctl # secure boot
|
sbctl # secure boot
|
||||||
wine-wayland
|
wine-wayland
|
||||||
wine64
|
wine64
|
||||||
|
solaar
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
|
|
|
@ -3,5 +3,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
./backup.nix
|
./backup.nix
|
||||||
./caddy.nix
|
./caddy.nix
|
||||||
|
./roundcube.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
49
modules/roundcube.nix
Normal file
49
modules/roundcube.nix
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
{ 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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue