dala/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dala:76701149bdb9f23256a79973a4368ffae5a5c9bd
Branches Tags
dala:main
..
compare: dala:2ee4bb31904e225df0a16f124e4237f1fa0090f8
Branches Tags
dala:main

No commits in common. "76701149bdb9f23256a79973a4368ffae5a5c9bd" and "2ee4bb31904e225df0a16f124e4237f1fa0090f8" have entirely different histories.
76701149bd ... 2ee4bb3190

5 changed files with 8 additions and 51 deletions
Show stats Expand all files Collapse all files

2
configurations/camelot/default.nix
View file

@ -53,8 +53,6 @@
}; };
}; };
my.server.mollysocket.enable = true;
my.users = { my.users = {
dala = { dala = {
description = "Dala"; description = "Dala";

2
configurations/camelot/nextcloud.nix
View file

@ -18,7 +18,7 @@
hostName = extraInfo.nextcloudURI; hostName = extraInfo.nextcloudURI;
extraAppsEnable = true; extraAppsEnable = true;
appstoreEnable = true; appstoreEnable = false;
extraApps = { extraApps = {
inherit (config.services.nextcloud.package.packages.apps) inherit (config.services.nextcloud.package.packages.apps)
calendar calendar

14
flake.lock
View file

@ -23,11 +23,11 @@
}, },
"extra-config": { "extra-config": {
"locked": { "locked": {
"lastModified": 1725174688, "lastModified": 1725089963,
"narHash": "sha256-URQT2Vf8d3mAdP8ffbZ4j0fBtpXHyrD6rp4d3cSa0X8=", "narHash": "sha256-lUPSW3t46rJQThatY2nP/JoKZ9SSfeaIGfBh8srh4MU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "41882ca7e4c0368af424f7bd98ab4b584228090f", "rev": "68fdf50688fed8fa37c2f28c279cdb22920b0afb",
"revCount": 7, "revCount": 6,
"type": "git", "type": "git",
"url": "ssh://forgejo@git.dalaran.fr/dala/nixos-config-extra.git" "url": "ssh://forgejo@git.dalaran.fr/dala/nixos-config-extra.git"
}, },
@ -346,11 +346,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1725001927, "lastModified": 1724855419,
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
modules/server/default.nix
View file

@ -3,6 +3,5 @@
../common ../common
./network.nix ./network.nix
./nginx.nix ./nginx.nix
./mollysocket.nix
]; ];
} }

40
modules/server/mollysocket.nix
View file

@ -1,40 +0,0 @@
{
lib,
config,
extraInfo,
...
}:
let
msConfig = config.services.mollysocket.settings;
in
with lib;
{
options.my.server.mollysocket.enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable the mollysocket server, allowing UnifiedPush notifications for te Molly app.
'';
};
config = mkIf config.my.server.mollysocket.enable {
services.mollysocket = {
enable = true;
settings = {
allowed_uuids = [
extraInfo.signal.clientUuid
];
};
};
services.nginx.virtualHosts.${extraInfo.signal.notificationServerUri} = {
enableACME = true;
forceSSL = true;
locations."/" = {
recommendedProxySettings = true;
proxyPass = "http://${msConfig.host}:${builtins.toString msConfig.port}";
};
};
};
}