summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock8
-rw-r--r--flake.nix3
-rw-r--r--machines/overburn-1.nix8
-rw-r--r--services/movim.nix24
4 files changed, 36 insertions, 7 deletions
diff --git a/flake.lock b/flake.lock
index 57b786e..acf4950 100644
--- a/flake.lock
+++ b/flake.lock
@@ -132,16 +132,16 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1747862697,
- "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
+ "lastModified": 1755593991,
+ "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
+ "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.11",
+ "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index f4efdcf..696b91b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
nixinate.url = "github:DarthPJB/nixinate";
secrix.url = "github:platonic-systems/secrix";
nixpkgs_unstable.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
- nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-24.11";
+ nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-25.05";
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
};
@@ -67,6 +67,7 @@
./users/commander.nix
(import ./services/cgit.nix { fqdn = "code.${fqdn}"; })
(import ./services/murmur.nix { fqdn = "mumble.${fqdn}"; })
+ (import ./services/movim.nix { fqdn = "mumble.${fqdn}"; })
(import ./services/website.nix { inherit webroot; })
(import ./services/ejabberd.nix { inherit fqdn; })
(import ./services/mailserver.nix { inherit hashedPasswordFile; })
diff --git a/machines/overburn-1.nix b/machines/overburn-1.nix
index 27fa908..7bed4e3 100644
--- a/machines/overburn-1.nix
+++ b/machines/overburn-1.nix
@@ -1,13 +1,17 @@
-{ webroot, fqdn, pkgs, ... }:
+{ webroot, fqdn, pkgs, ... }:
+let
+ top_level_domain = "crashoverburn.com";
+in
{
networking.hostName = "crashoverburn-1";
security.acme = {
acceptTerms = true;
defaults.email = "postmaster@mail.crashoverburn.com";
};
+
environment.systemPackages = [
pkgs.btop
pkgs.tmux
pkgs.neovim
];
-} \ No newline at end of file
+}
diff --git a/services/movim.nix b/services/movim.nix
new file mode 100644
index 0000000..25759a4
--- /dev/null
+++ b/services/movim.nix
@@ -0,0 +1,24 @@
+{ fqdn }: { config, lib, pkgs, inputs, ... }:
+let
+ certs = config.security.acme.certs;
+ certDirectory = "${certs.${fqdn}.directory}";
+ port = config.services.murmur.port;
+ dbfolder = "/persist/replicable/murmur/murmur.sqlite";
+in
+{
+ users.groups.ejabberd-cert.members = [ "ejabberd" "nginx" ];
+ services.movim = {
+ enable = true;
+ domain = "social.${fqdn}";
+ podConfig = {
+ locale = "en";
+ description = "OverBurnSocial";
+ xmppdomain = fqdn;
+ };
+ serverAliases = [
+ "pics.${config.movim.domain}"
+ ];
+ enableACME = true;
+ forceHttps = true;
+ };
+};