flake.lock

@@ -75,11 +75,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1676375384,
+        "lastModified": 1672353432,
-        "narHash": "sha256-6HI3jZiuJX+KLz05cocYy2mBAWlISEKHU84ftYfxHZ8=",
+        "narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c43f676c938662072772339be6269226c77b51b8",
+        "rev": "913a47cd064cc06440ea84e5e0452039a85781f0",
         "type": "github"
       },
       "original": {
@@ -88,13 +88,29 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-photoprism": {
+      "locked": {
+        "lastModified": 1671922246,
+        "narHash": "sha256-Xh/pWG2mdheCtJZFmuuZIsvR9PVgs15Rn6yt/G1lINc=",
+        "owner": "Stunkymonkey",
+        "repo": "nixpkgs",
+        "rev": "6805f176fcc4b3673f23df5ee67caccc24bfba8c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Stunkymonkey",
+        "ref": "photoprism-module-init",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1676300157,
+        "lastModified": 1672262501,
-        "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=",
+        "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462",
+        "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f",
         "type": "github"
       },
       "original": {
@@ -108,6 +124,7 @@
         "dogetipbot-telegram": "dogetipbot-telegram",
         "ipmihddtemp": "ipmihddtemp",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-photoprism": "nixpkgs-photoprism",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "utils": "utils_2"

flake.nix

@@ -2,6 +2,7 @@
   inputs = {
     nixpkgs.url = "flake:nixpkgs/nixos-22.11";
     nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
+    nixpkgs-photoprism.url = "github:Stunkymonkey/nixpkgs/photoprism-module-init";
     utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1";
     simple-nixos-mailserver = {
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11";
@@ -20,7 +21,7 @@
     };
   };
 
-  outputs = inputs@{ self, utils, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: utils.lib.mkFlake {
+  outputs = inputs@{ self, utils, nixpkgs, nixpkgs-unstable, nixpkgs-photoprism, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: utils.lib.mkFlake {
 
     inherit self inputs;
 
@@ -46,7 +47,7 @@
     ];
 
     hosts.loutreos.modules = [
-      "${nixpkgs-unstable}/nixos/modules/services/web-apps/photoprism.nix"
+      "${nixpkgs-photoprism}/nixos/modules/services/web-apps/photoprism.nix"
       simple-nixos-mailserver.nixosModule
       dogetipbot-telegram.nixosModule
       ipmihddtemp.nixosModule

overlays/riot-web.nix

@@ -0,0 +1,15 @@
+self: super:
+{
+  riot-web = super.riot-web.override {
+    conf = {
+      default_hs_url = "https://matrix.nyanlout.re";
+      default_is_url = "https://vector.im";
+      brand = "Nyanloutre";
+      default_theme = "dark";
+      integrations_ui_url = "https://dimension.t2bot.io/riot";
+      integrations_rest_url = "https://dimension.t2bot.io/api/v1/scalar";
+      integrations_widgets_urls = ["https://dimension.t2bot.io/widgets"];
+      integrations_jitsi_widget_url = "https://dimension.t2bot.io/widgets/jitsi";
+    };
+  };
+} 

systems/LoutreOS/configuration.nix

@@ -163,6 +163,7 @@
   };
 
   nixpkgs.overlays = [
+    (import ../../overlays/riot-web.nix)
     (import ../../overlays/transmission.nix)
   ];
 

systems/LoutreOS/hardware-configuration.nix

@@ -123,10 +123,10 @@
       fsType = "zfs";
     };
 
-  # fileSystems."/mnt/backup" =
+  fileSystems."/mnt/backup" =
-  #   { device = "backup";
+    { device = "backup";
-  #     fsType = "zfs";
+      fsType = "zfs";
-  #   };
+    };
 
   fileSystems."/mnt/backup_loutre" =
     { device = "loutrepool/backup";
@@ -158,11 +158,6 @@
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/private/photoprism" =
-    { device = "loutrepool/var/photoprism";
-      fsType = "zfs";
-    };
-
   fileSystems."/mnt/paul-home" =
     { device = "loutrepool/zfs-replicate/paul-fixe/fastaf/home";
       fsType = "zfs";

systems/LoutreOS/services.nix

@@ -549,10 +549,9 @@ in
     photoprism = {
       enable = true;
       originalsPath = "/mnt/backup_loutre/amandoleen/d/Users/Amand/Pictures";
-      settings = {
+      extraConfig = {
         PHOTOPRISM_AUTH_MODE = "public";
         PHOTOPRISM_READONLY = "1";
-        PHOTOPRISM_SITE_URL = "https://photo.nyanlout.re/";
       };
     };
   };

systems/LoutreOS/web.nix

@@ -224,6 +224,7 @@ in
             '';
           };
         } // { default = true; };
+        "riot.nyanlout.re" = base { "/" = { root = pkgs.element-web; }; };
         "factorio.nyanlout.re" = base { "/" = { root = "/var/www/factorio"; }; };
         "minecraft.nyanlout.re" = base { "/" = { root = "/var/www/minecraft-overviewer"; }; };
         "musique-meyenheim.fr" = base {
@@ -237,11 +238,6 @@ in
             alias = "/var/www/site-musique/media/";
           };
         };
-        "www.musique-meyenheim.fr" = {
-          enableACME = true;
-          forceSSL = true;
-          globalRedirect = "musique-meyenheim.fr";
-        };
         # "maxspiegel.fr" = base { "/" = { root = "/run/python-ci/nyanloutre/site-max"; }; };
         "stream.nyanlout.re" = base {
           "/" = {
@@ -327,15 +323,52 @@ in
           }
         ];
         "designyourfuture.amandoline-creations.fr" = base {
-          "/".alias = "/var/www/amandoline-designyourfuture/";
+          "/".alias = "/var/www/amandoleene-designyourfuture/";
-        };
+          # "/" = {
-        "amandoline-creations.fr" = base {
+          #   priority = 200;
-          "/".alias = "/var/www/amandoline-portfolio/";
+          #   extraConfig = ''
-        };
+          #     try_files $uri $uri/ /index.php$is_args$args;
-        "www.amandoline-creations.fr" = {
+          #   '';
-          enableACME = true;
+          # };
-          forceSSL = true;
+          # "~ \\.php$" = {
-          globalRedirect = "amandoline-creations.fr";
+          #   priority = 500;
+          #   extraConfig = ''
+          #     fastcgi_split_path_info ^(.+\.php)(/.+)$;
+          #     fastcgi_pass unix:${config.services.phpfpm.pools."wordpress-designyourfuture".socket};
+          #     fastcgi_index index.php;
+          #     include "${config.services.nginx.package}/conf/fastcgi.conf";
+          #     fastcgi_param PATH_INFO $fastcgi_path_info;
+          #     fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+          #     # Mitigate https://httpoxy.org/ vulnerabilities
+          #     fastcgi_param HTTP_PROXY "";
+          #     fastcgi_intercept_errors off;
+          #     fastcgi_buffer_size 16k;
+          #     fastcgi_buffers 4 16k;
+          #     fastcgi_connect_timeout 300;
+          #     fastcgi_send_timeout 300;
+          #     fastcgi_read_timeout 300;
+          #   '';
+          # };
+          # "~ /\\." = {
+          #   priority = 800;
+          #   extraConfig = "deny all;";
+          # };
+          # "~* /(?:uploads|files)/.*\\.php$" = {
+          #   priority = 900;
+          #   extraConfig = "deny all;";
+          # };
+          # "~* \\.(js|css|png|jpg|jpeg|gif|ico)$" = {
+          #   priority = 1000;
+          #   extraConfig = ''
+          #     expires max;
+          #     log_not_found off;
+          #   '';
+          # };
+        } // {
+          # root = "/var/www/wordpress-designyourfuture";
+          # extraConfig = ''
+          #   index index.php;
+          # '';
         };
       };
     };