diff options
author | polwex <polwex@sortug.com> | 2024-08-29 05:36:51 +0700 |
---|---|---|
committer | polwex <polwex@sortug.com> | 2024-08-29 05:36:51 +0700 |
commit | 6a7fa5ae7c243b3dd1f0d5a4221c3b69a4bdbab7 (patch) | |
tree | 92bbcba620a629322e3663c980ed656e339777f7 | |
parent | 77925a0afa7c237e99cd69d2a94c47c140483f84 (diff) |
m
-rw-r--r-- | flake.lock | 110 | ||||
-rw-r--r-- | flake.nix | 5 | ||||
-rw-r--r-- | hosts/cloud/packages.nix | 21 | ||||
-rw-r--r-- | hosts/cloud/sing/mail.nix | 13 | ||||
-rw-r--r-- | hosts/cloud/sortug/configuration.nix | 1 | ||||
-rw-r--r-- | hosts/cloud/sortug/default.nix | 1 | ||||
-rw-r--r-- | hosts/local/ohira/configuration.nix | 3 |
7 files changed, 137 insertions, 17 deletions
@@ -48,6 +48,22 @@ "type": "github" } }, + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -209,6 +225,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "locked": { "lastModified": 1717312683, "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", @@ -223,7 +255,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -861,6 +893,32 @@ "type": "github" } }, + "nixos-mailserver": { + "inputs": { + "blobs": "blobs", + "flake-compat": "flake-compat_3", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", + "utils": "utils" + }, + "locked": { + "lastModified": 1706219574, + "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "ref": "nixos-23.11", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "nixos-rk3588": { "inputs": { "flake-utils": "flake-utils_5", @@ -898,6 +956,36 @@ "type": "github" } }, + "nixpkgs-23_05": { + "locked": { + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "nixpkgs-darwin": { "locked": { "lastModified": 1724196396, @@ -1003,7 +1091,7 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": [ @@ -1292,6 +1380,7 @@ "nixos-cn": "nixos-cn", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", + "nixos-mailserver": "nixos-mailserver", "nixos-rk3588": "nixos-rk3588", "nixpkgs": "nixpkgs_9", "nixpkgs-darwin": "nixpkgs-darwin", @@ -1544,9 +1633,24 @@ "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" } }, + "utils": { + "locked": { + "lastModified": 1605370193, + "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "waybar": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ] @@ -62,6 +62,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-mailserver = { + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + ############# non flakes ############ polybar-themes = { 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 = [ ... ]; |