nix flake update + website

flake.lock

@@ -265,11 +265,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771132481,
-        "narHash": "sha256-Tc+YqZ/Q1K35vJK4ji4RbLB/qKGcEq6yh7p4CKoZF60=",
+        "lastModified": 1772164835,
+        "narHash": "sha256-zRcwrZDeBfYipqv/7K7TqsfPb87LFU6b7JhoNUGSnvQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1e53254671f36cb7d0e2dcca08730f066d5e69b4",
+        "rev": "2a39b0828bbffce0d73769a61e46e780488d098b",
         "type": "github"
       },
       "original": {
@@ -325,11 +325,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1770882871,
-        "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=",
+        "lastModified": 1771969195,
+        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b",
+        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
         "type": "github"
       },
       "original": {
@@ -341,11 +341,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771008912,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "lastModified": 1771848320,
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
         "type": "github"
       },
       "original": {
@@ -454,11 +454,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1770659507,
-        "narHash": "sha256-RVZno9CypFN3eHxfULKN1K7mb/Cq0HkznnWqnshxpWY=",
+        "lastModified": 1772064816,
+        "narHash": "sha256-ks1D9Rtmopd5F/8ENjEUJpSYYMxv603/v6TRen9Hq54=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "781e833633ebc0873d251772a74e4400a73f5d78",
+        "rev": "ea4dc17f4bc0f65eed082fa394509e4543072b56",
         "type": "gitlab"
       },
       "original": {
@@ -520,11 +520,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771124033,
-        "narHash": "sha256-nXrWf0EiHfy3Nl3mLeQNwsxGYkr/IAyg61IU7IwrtJ4=",
+        "lastModified": 1772160053,
+        "narHash": "sha256-ZA8B+3MPfHmpZqzEzyjV8j3qQKq8LQitu5qEjSyZ+dQ=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "4605fab73c36235bfdbea1212fab94b728fcbc08",
+        "rev": "104487aa06fdff228f52fc05f12808ea69c7daab",
         "type": "github"
       },
       "original": {

host/roam/default.nix

@@ -36,6 +36,7 @@
     acme = {
       acceptTerms = true;
       defaults.email = "acme@henri-dohmen.de";
+
     };
   };
 

host/roam/services.nix

@@ -20,10 +20,35 @@
       privateVirtualHosts."roam.lan" = {
         locations."/" = { };
       };
-      virtualHosts."roam.hdohmen.de" = {
-        enableACME = true;
-        forceSSL = true;
-        locations."/" = { };
+      virtualHosts = {
+        "www.henri-dohmen.de" = {
+          enableACME = true;
+          forceSSL = true;
+          globalRedirect = "https://hdohmen.de";
+        };
+        "henri-dohmen.de" = {
+          enableACME = true;
+          forceSSL = true;
+          globalRedirect = "https://hdohmen.de";
+        };
+        "www.hdohmen.de" = {
+          enableACME = true;
+          forceSSL = true;
+          globalRedirect = "https://hdohmen.de";
+        };
+        "hdohmen.de" = {
+          enableACME = true;
+          forceSSL = true;
+          locations."/" = { };
+          extraConfig = ''
+            access_log off;
+          '';
+        };
+        "roam.hdohmen.de" = {
+          enableACME = true;
+          forceSSL = true;
+          locations."/" = { };
+        };
       };
     };
 

mod/common/shell.nix

@@ -52,7 +52,7 @@ with lib;
     # Enabled by fish but takes soooo long.
     # This is apparently used by some of fish's
     # autocomplete features.
-    documentation.man.generateCaches = false;
+    documentation.man.cache.enable = false;
 
     # To stop the annoying error on entering wrong commands
     programs.command-not-found.enable = false;

mod/desktop/software/default.nix

@@ -15,7 +15,7 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       bitwarden-desktop
-      calibre
+      # calibre FIXME: broken atm
       colmena
       fuzzel
       gh

mod/desktop/software/development.nix

@@ -22,7 +22,7 @@ in
       gnumake
       man-pages
       man-pages-posix
-      nixfmt-rfc-style
+      nixfmt
       python313
       python313Packages.mypy
       rustup