From 6a7fa5ae7c243b3dd1f0d5a4221c3b69a4bdbab7 Mon Sep 17 00:00:00 2001
From: polwex <polwex@sortug.com>
Date: Thu, 29 Aug 2024 05:36:51 +0700
Subject: m

---
 hosts/cloud/packages.nix             | 21 +++++++++++----------
 hosts/cloud/sing/mail.nix            | 13 +++++++++----
 hosts/cloud/sortug/configuration.nix |  1 +
 hosts/cloud/sortug/default.nix       |  1 +
 hosts/local/ohira/configuration.nix  |  3 +++
 5 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'hosts')

diff --git a/hosts/cloud/packages.nix b/hosts/cloud/packages.nix
index fe7065b..07ce147 100644
--- a/hosts/cloud/packages.nix
+++ b/hosts/cloud/packages.nix
@@ -1,9 +1,11 @@
-{ config, pkgs, ... }:
-
 {
-   nixpkgs.config = {
-     allowUnfree = true;
-   };
+  config,
+  pkgs,
+  ...
+}: {
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
 
   environment.systemPackages = with pkgs; [
     helix
@@ -42,14 +44,13 @@
     curl
     caddy # simple web server made with go
     innernet
-    
+
     # s3
     minio
     # streaming
-    ffmpeg_5
+    ffmpeg
     # databases
-   # postgresql
-   # sqlite
+    # postgresql
+    # sqlite
   ];
 }
-
diff --git a/hosts/cloud/sing/mail.nix b/hosts/cloud/sing/mail.nix
index 09a070d..1b88877 100644
--- a/hosts/cloud/sing/mail.nix
+++ b/hosts/cloud/sing/mail.nix
@@ -1,8 +1,12 @@
-{   
-    mailserver = {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  mailserver = {
     enable = true;
     fqdn = "mail.sortug.com";
-    domains = [ "sortug.com" ];
+    domains = ["sortug.com"];
 
     # A list of all login accounts. To create the password hashes, use
     # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
@@ -22,7 +26,8 @@
       "info@sortug.com" = {
         hashedPasswordFile = "/home/y/mail.key";
       };
-      "admin@sortug.com" = { # legal and banking
+      "admin@sortug.com" = {
+        # legal and banking
         hashedPasswordFile = "/home/y/mail.key";
       };
       "internal@sortug.com" = {
diff --git a/hosts/cloud/sortug/configuration.nix b/hosts/cloud/sortug/configuration.nix
index 9f75d14..d409f83 100644
--- a/hosts/cloud/sortug/configuration.nix
+++ b/hosts/cloud/sortug/configuration.nix
@@ -17,6 +17,7 @@
       ./minio.nix
       # ./coturn.nix
       ./disk-config.nix
+      ../sing/mail.nix
       # ./mail.nix
     ];
 
diff --git a/hosts/cloud/sortug/default.nix b/hosts/cloud/sortug/default.nix
index 3669483..0666c18 100644
--- a/hosts/cloud/sortug/default.nix
+++ b/hosts/cloud/sortug/default.nix
@@ -1,4 +1,5 @@
 inputs: [
+  inputs.nixos-mailserver.nixosModule
   inputs.disko.nixosModules.disko
   ./configuration.nix
 ]
diff --git a/hosts/local/ohira/configuration.nix b/hosts/local/ohira/configuration.nix
index c4a42b0..08ce794 100644
--- a/hosts/local/ohira/configuration.nix
+++ b/hosts/local/ohira/configuration.nix
@@ -229,6 +229,9 @@
     ports = [4410];
   };
 
+  services.flatpak.enable = true;
+  services.tailscale.enable = true;
+
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
-- 
cgit v1.2.3