flake.lock

@@ -398,11 +398,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711391819,
+        "lastModified": 1709309729,
-        "narHash": "sha256-sNI0PLFXvFM5M6h9PYrbF+IfL199OYLRz875lNZ9Y0Q=",
+        "narHash": "sha256-W6RjXe2/LGFnNGfY9ML4YCDasmqksUWKoMRVPHkIguM=",
         "owner": "rouven0",
         "repo": "purge",
-        "rev": "e82088390a446b6ad1f4df92d62478ea557d98de",
+        "rev": "0d083d35316101755d2ecb9bba32fefc42df914d",
         "type": "github"
       },
       "original": {
@@ -414,11 +414,11 @@
     "river": {
       "flake": false,
       "locked": {
-        "lastModified": 1711393006,
+        "lastModified": 1711277167,
-        "narHash": "sha256-vwOJIc2gUUa8MuiEzV/phB2sAl5pWdC6mnivNimmXqk=",
+        "narHash": "sha256-i+5wQkGsiyN/LaGfuj306tdiv+7vcbgahL9JvscM4iw=",
         "ref": "refs/heads/master",
-        "rev": "4d0315b56596868d5ae39d18fe74d8be5c4ac50d",
+        "rev": "12de175e115f08d1a77b438910ba6dc58a3d80af",
-        "revCount": 1220,
+        "revCount": 1216,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/riverwm/river"
@@ -507,11 +507,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711395032,
+        "lastModified": 1710096282,
-        "narHash": "sha256-2fH6TXdPKZaTx6NXucFn7HaFDZ9vC1ebTql5XkdkWTI=",
+        "narHash": "sha256-t4190TfQUJoqaFEUX4DNGMDaQ+rJJxffwir0EEwnfDY=",
         "owner": "rouven0",
         "repo": "TruckSimulatorBot",
-        "rev": "4776a2235fffb96aa8fcc8e33d39af17907754ae",
+        "rev": "da4e4e1908aebc93744cbbe9a7867a9b60da02e9",
         "type": "github"
       },
       "original": {

hosts/falkenstein/modules/mail/rspamd.nix

@@ -39,6 +39,8 @@
       };
     };
     nginx.virtualHosts."rspamd.${config.networking.domain}" = {
+      enableACME = true;
+      forceSSL = true;
       locations = {
         "/" = {
           proxyPass = "http://127.0.0.1:11334";

hosts/falkenstein/modules/nginx/default.nix

@@ -5,8 +5,6 @@
     services.nginx.virtualHosts = mkOption {
       type = types.attrsOf (types.submodule
         ({ name, ... }: {
-          enableACME = true;
-          forceSSL = true;
           # enable http3 for all hosts
           quic = true;
           http3 = true;
@@ -52,6 +50,8 @@
         recommendedGzipSettings = true;
         recommendedOptimisation = true;
         virtualHosts."${config.networking.domain}" = {
+          enableACME = true;
+          forceSSL = true;
           root = "/srv/web/${config.networking.domain}";
           locations = {
             "/.well-known/matrix/client".extraConfig = mkWellKnown clientConfig;

hosts/falkenstein/modules/purge/default.nix

@@ -7,7 +7,6 @@ in
     file = ../../../../secrets/falkenstein/purge.age;
   };
   services.purge = {
-    inherit domain;
     enable = true;
     discord = {
       clientId = "941041925216157746";
@@ -15,4 +14,11 @@ in
       tokenFile = config.age.secrets.purge.path;
     };
   };
+  services.nginx.virtualHosts."${domain}" = {
+    enableACME = true;
+    forceSSL = true;
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:${toString config.services.purge.listenPort}";
+    };
+  };
 }

hosts/falkenstein/modules/trucksimulatorbot/default.nix

@@ -1,10 +1,9 @@
-{ config, pkgs, ... }:
+{ config, pkgs, trucksimulatorbot, ... }:
 let
   domain = "trucks.${config.networking.domain}";
 in
 {
   services.trucksimulatorbot = {
-    inherit domain;
     enable = true;
     discord = {
       clientId = "831052837353816066";
@@ -24,4 +23,20 @@ in
     ];
     ensureDatabases = [ "trucksimulator" ];
   };
+  services.nginx.virtualHosts = {
+    "${domain}" = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/invite".return = "301 https://discord.com/api/oauth2/authorize?client_id=831052837353816066&permissions=262144&scope=bot%20applications.commands";
+      locations."/" = {
+        proxyPass = "http://127.0.0.1:${toString config.services.trucksimulatorbot.listenPort}";
+      };
+      locations."/images/" = {
+        proxyPass = "http://127.0.0.1:${toString config.services.trucksimulatorbot.images.listenPort}/";
+      };
+      locations."/docs" = {
+        root = "${trucksimulatorbot.packages.x86_64-linux.docs}";
+      };
+    };
+  };
 }

hosts/nuc/modules/cache/default.nix

@@ -11,6 +11,8 @@ in
     secretKeyFile = config.age.secrets.cache.path;
   };
   services.nginx.virtualHosts."${domain}" = {
+    enableACME = true;
+    forceSSL = true;
     locations."/" = {
       proxyPass = "http://127.0.0.1:${toString config.services.nix-serve.port}";
     };

hosts/nuc/modules/matrix/default.nix

@@ -67,6 +67,10 @@ in
       virtualHosts = {
         # synapse
         "${domain}" = {
+          enableACME = true;
+          forceSSL = true;
+
+
           # locations."/".extraConfig = "return 404;";
 
           # # proxy to synapse
@@ -79,6 +83,9 @@ in
 
         # element
         "${domainClient}" = {
+          enableACME = true;
+          forceSSL = true;
+
           root = pkgs.element-web.override {
             conf = {
               default_server_config = {

hosts/nuc/modules/nginx/default.nix

@@ -6,8 +6,6 @@
       type = types.attrsOf (types.submodule
         ({ name, ... }: {
           # split up nginx access logs per vhost
-          enableACME = true;
-          forceSSL = true;
           extraConfig = ''
             access_log /var/log/nginx/${name}_access.log;
             error_log /var/log/nginx/${name}_error.log;

hosts/nuc/modules/seafile/default.nix

@@ -12,6 +12,8 @@ in
     seafileSettings.fileserver.port = 8083;
   };
   services.nginx.virtualHosts."${domain}" = {
+    enableACME = true;
+    forceSSL = true;
     locations."/" = {
       proxyPass = "http://unix:/run/seahub/gunicorn.sock";
     };

hosts/nuc/modules/vaultwarden/default.nix

@@ -30,6 +30,8 @@ in
     ensureDatabases = [ "vaultwarden" ];
   };
   services.nginx.virtualHosts."${domain}" = {
+    enableACME = true;
+    forceSSL = true;
     locations."/" = {
       proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.rocketPort}";
     };

hosts/thinkpad/hardware-configuration.nix

@@ -9,7 +9,6 @@
   environment.systemPackages = with pkgs; [
     nvme-cli
     intel-gpu-tools
-    nvtopPackages.intel
     lm_sensors
     pciutils
   ];
@@ -36,36 +35,32 @@
   };
 
 
-  #  fileSystems."/" =
+#  fileSystems."/" =
-  #    { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
+#    { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
-  #      fsType = "btrfs";
+#      fsType = "btrfs";
-  #      options = [ "subvol=root" ];
+#      options = [ "subvol=root" ];
  #   };
 
   fileSystems."/home" =
-    {
+    { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
-      device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
       fsType = "btrfs";
       options = [ "subvol=home" "compress=zstd" ];
     };
 
   fileSystems."/nix" =
-    {
+    { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
-      device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
       fsType = "btrfs";
-      options = [ "subvol=nix" "compress=zstd" "noatime" ];
+      options = [ "subvol=nix" "compress=zstd" "noatime"];
     };
 
   fileSystems."/var/log" =
-    {
+    { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
-      device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
       fsType = "btrfs";
       options = [ "subvol=log" "compress=zstd" ];
     };
 
   fileSystems."/var/lib" =
-    {
+    { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
-      device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
       fsType = "btrfs";
       options = [ "subvol=lib" "compress=zstd" ];
     };

shared/activation.nix

@@ -1,16 +1,9 @@
-{ pkgs, config, ... }:
+{ config, ... }:
 {
   system.activationScripts.report-nixos-changes = ''
     if [ -e /run/current-system ] && [ -e $systemConfig ]; then
       echo System package diff:
       ${config.nix.package}/bin/nix store diff-closures /run/current-system $systemConfig || true
     fi
-    NO_FORMAT="\033[0m"
-    F_BOLD="\033[1m"
-    C_RED="\033[38;5;9m"
-    ${pkgs.diffutils}/bin/cmp --silent \
-      <(readlink /run/current-system/{initrd,kernel,kernel-modules}) \
-      <(readlink $systemConfig/{initrd,kernel,kernel-modules}) \
-      || echo -e "''${F_BOLD}''${C_RED}Kernel version changed, reboot is advised.''${NO_FORMAT}"
   '';
 }