moritz/clan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: moritz:fb5c340f5f29dcb898f3c2edf3fa3fcd832259e5
Branches Tags
moritz:main
...
compare: moritz:d4e8bde4cd4c8411989d9e02939413f299f2fc8c
Branches Tags
moritz:main

2 commits
fb5c340f5f ... d4e8bde4cd

Author SHA1 Message Date
Moritz Böhme
d4e8bde4cd
feat: add static website 2025-05-16 10:12:16 +02:00
Moritz Böhme
b714d906d8
feat: switch to smtp2go 2025-05-16 09:11:08 +02:00
11 changed files with 114 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
flake.lock generated
View file

@ -1137,7 +1137,8 @@
"nur": "nur", "nur": "nur",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"stable": "stable", "stable": "stable",
"timers": "timers" "timers": "timers",
"zola-theme": "zola-theme"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -1402,6 +1403,22 @@
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"type": "github" "type": "github"
} }
},
"zola-theme": {
"flake": false,
"locked": {
"lastModified": 1745542545,
"narHash": "sha256-hXNJaz/F5t1ZwbCq61eMxoA8MlKZM8ZXoyMJb27+5QI=",
"owner": "Speyll",
"repo": "anemone",
"rev": "b5ecf8e3063c9e57c2d83b90ffd67b5037bba395",
"type": "github"
},
"original": {
"owner": "Speyll",
"repo": "anemone",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

23
flake.nix
View file

@ -57,6 +57,9 @@
# Firefox user.js # Firefox user.js
arkenfox-userjs.url = "github:arkenfox/user.js"; arkenfox-userjs.url = "github:arkenfox/user.js";
arkenfox-userjs.flake = false; arkenfox-userjs.flake = false;
zola-theme.url = "github:Speyll/anemone";
zola-theme.flake = false;
}; };
outputs = inputs @ {flake-parts, ...}: outputs = inputs @ {flake-parts, ...}:
@ -78,9 +81,23 @@
pkgs, pkgs,
... ...
}: { }: {
devShells.default = pkgs.mkShell { devShells = rec {
inherit (config.pre-commit.devShell) shellHook nativeBuildInputs; default = pkgs.mkShell {
packages = [inputs'.clan-core.packages.clan-cli pkgs.alejandra]; inherit (config.pre-commit.devShell) shellHook nativeBuildInputs;
packages = [inputs'.clan-core.packages.clan-cli pkgs.alejandra];
};
zola = let
theme = inputs.zola-theme;
themeName = (builtins.fromTOML (builtins.readFile "${theme}/theme.toml")).name;
in
pkgs.mkShell {
inputsFrom = [default];
packages = [pkgs.zola];
shellHook = ''
mkdir themes
ln -s ${inputs.zola-theme} themes/${themeName}
'';
};
}; };
pre-commit.settings.hooks = { pre-commit.settings.hooks = {
alejandra.enable = true; alejandra.enable = true;

1
machines/moritz-server/configuration.nix
View file

@ -6,6 +6,7 @@
./reverse-proxy.nix ./reverse-proxy.nix
./ddns.nix ./ddns.nix
./mail-server.nix ./mail-server.nix
./website/root
]; ];
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";

6
machines/moritz-server/mail-server.nix
View file

@ -10,6 +10,8 @@
]; ];
mailserver = { mailserver = {
enable = true; enable = true;
enableSubmission = false;
enableSubmissionSsl = false;
fqdn = "mail.moritz.place"; fqdn = "mail.moritz.place";
domains = ["moritz.place"]; domains = ["moritz.place"];
@ -62,9 +64,7 @@
hostName = "webmail.moritz.place"; hostName = "webmail.moritz.place";
dicts = with pkgs.aspellDicts; [en de]; dicts = with pkgs.aspellDicts; [en de];
extraConfig = '' extraConfig = ''
# starttls needed for authentication, so the fqdn required to match $config['smtp_host'] = "tls://mail.smtp2go.com";
# the certificate
$config['smtp_host'] = "tls://${config.mailserver.fqdn}";
$config['smtp_user'] = "%u"; $config['smtp_user'] = "%u";
$config['smtp_pass'] = "%p"; $config['smtp_pass'] = "%p";
''; '';

18
machines/moritz-server/reverse-proxy.nix
View file

@ -1,4 +1,8 @@
{config, ...}: { {
config,
lib,
...
}: {
services.fail2ban = { services.fail2ban = {
enable = true; enable = true;
bantime-increment.enable = true; bantime-increment.enable = true;
@ -63,17 +67,17 @@
forceSSL = true; forceSSL = true;
useACMEHost = "any.moritz.place"; useACMEHost = "any.moritz.place";
locations."/" = { locations."/" = {
extraConfig = '' return = "301 https://moritz.place";
add_header Content-Type text/html;
'';
return = "200 '<html><body>Hello World</body></html>'";
}; };
}; };
"moritz.place" = { "moritz.place" = {
forceSSL = true; forceSSL = true;
useACMEHost = "moritz.place"; useACMEHost = "moritz.place";
locations."/" = { locations."/" = lib.mkDefault {
return = "301 https://www.moritz.place"; extraConfig = ''
add_header Content-Type text/html;
'';
return = "200 '<html><body>Hello World</body></html>'";
}; };
}; };
"_" = { "_" = {

1
machines/moritz-server/website/root/.envrc Normal file
View file

@ -0,0 +1 @@
use flake .#zola --builders ""

1
machines/moritz-server/website/root/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
themes/

29
machines/moritz-server/website/root/config.toml Normal file
View file

@ -0,0 +1,29 @@
# The URL the site will be built for
base_url = "https://moritz.place"
# The site title and description; used in feeds by default.
title = "Moritz Place on the Internet"
description = "Stay a while :)"
# Whether to automatically compile all Sass files in the sass directory
compile_sass = true
# Whether to build a search index to be used later on by a JavaScript library
build_search_index = true
# The site theme to use.
theme = "anemone"
[markdown]
# Whether to do syntax highlighting
# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
highlight_code = true
[extra]
# Put all your custom variables here
header_nav = [
{ url = "/", name_en = "/home/"},
# { url = "/about", name_en = "/about/"},
# { url = "/journal", name_en = "/journal/"},
# { url = "/blog", name_en = "/blog/"}
]

3
machines/moritz-server/website/root/content/_index.md Normal file
View file

@ -0,0 +1,3 @@
+++
+++
Hello World!

26
machines/moritz-server/website/root/default.nix Normal file
View file

@ -0,0 +1,26 @@
{
pkgs,
inputs,
lib,
...
}: let
theme = inputs.zola-theme;
themeName = (builtins.fromTOML (builtins.readFile "${theme}/theme.toml")).name;
package = pkgs.stdenv.mkDerivation {
name = "static-website";
src = with lib.fileset;
toSource {
root = ./.;
fileset = difference (gitTracked ./.) (unions [./default.nix ./.envrc]);
};
nativeBuildInputs = [pkgs.zola];
configurePhase = ''
mkdir themes
ln -s ${theme} themes/${themeName}
'';
buildPhase = "zola build";
installPhase = "cp -r public $out";
};
in {
services.nginx.virtualHosts."moritz.place".locations."/".root = "${package}";
}

2
modules/moritz/profiles/personal_mail.nix
View file

@ -53,7 +53,7 @@ in {
# gpg.signByDefault = true; # gpg.signByDefault = true;
# gpg.key = "0xE4F362A3F5C338A0"; # gpg.key = "0xE4F362A3F5C338A0";
imap.host = "mail.moritz.place"; imap.host = "mail.moritz.place";
smtp.host = "mail.moritz.place"; smtp.host = "mail.smtp2go.com";
realName = "Moritz Böhme"; realName = "Moritz Böhme";
mbsync.enable = true; mbsync.enable = true;
mbsync.create = "both"; mbsync.create = "both";