try again for the nginx configuration

flake.nix

@@ -34,10 +34,10 @@
     catppuccin.url = "github:catppuccin/nix";
 
     # Conduit fork without all the fuss and drama
-    # conduwuit = {
+    conduwuit = {
-    #   url = "github:girlbossceo/conduwuit";
+      url = "github:girlbossceo/conduwuit";
-    #   inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    };
 
     # Nix index database files
     nix-index-database.url = "github:nix-community/nix-index-database";
@@ -99,7 +99,7 @@
     jovian,
     nixos-hardware,
     nix-index-database,
-    # conduwuit,
+    conduwuit,
     stylix,
     ...
   } @ inputs: let
@@ -131,7 +131,7 @@
       nix-index-database.nixosModules.nix-index
       {
         home-manager.sharedModules = [
-          inputs.catppuccin.homeManagerModules.catppuccin
+          catppuccin.homeModules.catppuccin
           ./home-manager/shared
           sops-nix.homeManagerModules.sops
         ];
@@ -164,7 +164,7 @@
     nixosModules = import ./modules/nixos;
     # Reusable home-manager modules you might want to export
     # These are usually stuff you would upstream into home-manager
-    homeManagerModules = import ./modules/home-manager;
+    # homeManagerModules = import ./modules/home-manager;
 
     # Your custom packages and modifications, exported as overlays
     overlays = import ./overlays {inherit inputs;};

home-manager/shared/shell/helix/helix.nix

@@ -7,7 +7,7 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "helix";
-  version = "24.07";
+  version = "25.01.1";
 
   # This release tarball includes source code for the tree-sitter grammars,
   # which is not ordinarily part of the repository.
@@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec {
     stripRoot = false;
   };
 
+  useFetchCargoVendor = true;
   cargoHash = "";
 
   nativeBuildInputs = [git installShellFiles];

nixos/desktop/package-configs/firefox/default.nix

@@ -160,6 +160,8 @@
         "floorp.tabbar.style" = 2;
         "floorp.browser.user.interface" = 8;
         "signon.rememberSignons" = true;
+        "browser.ml.chat.enabled" = false;
+        "browser.ml.chat.shortcuts" = false;
       };
       # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks
       # Bookmarks = [

nixos/server/package-configs/conduit/default.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   pkgs,
   ...
 }: let
@@ -29,17 +30,16 @@
   '';
 in {
   # Configure Conduit itself
-  services.matrix-conduit = {
+  services.conduwuit = {
     enable = true;
 
     # This causes NixOS to use the flake defined in this repository instead of
     # the build of Conduit built into nixpkgs.
-    # package = inputs.conduwuit.packages.${pkgs.system}.default;
+    package = inputs.conduwuit.packages.${pkgs.system}.default;
-    package = pkgs.conduwuit;
+    # package = pkgs.conduwuit;
 
     settings.global = {
       inherit server_name;
-      database_backend = "rocksdb";
       allow_registration = false;
       # emergency_password = "testpassword";
       turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"];
@@ -117,6 +117,7 @@ in {
         locations."=/.well-known/matrix/client" = {
           # Use the contents of the derivation built previously
           alias = "${well_known_client}";
+          return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${server_name}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${server_name}\"}}'";
 
           extraConfig = ''
             # Set the header since by default NGINX thinks it's just bytes
@@ -130,6 +131,7 @@ in {
           proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync";
           proxyWebsockets = true;
           recommendedProxySettings = false;
+          return = "200 '{\"contacts\": [{\"matrix_id\": \"@admin:server.name\", \"email_address\": \"admin@server.name\", \"role\": \"m.role.admin\"}]}'";
           extraConfig = ''
             proxy_set_header Host $host;
             proxy_buffering off;

nixos/server/package-configs/nextcloud/default.nix

@@ -50,7 +50,7 @@
     enable = true;
     hostName = "nextcloud.gladtherescake.eu";
 
-    package = pkgs.nextcloud30;
+    package = pkgs.nextcloud31;
 
     # Use HTTPS for links
     https = true;

nixos/shared/packages/default.nix

@@ -22,7 +22,7 @@
       install-nix-no-inhibit
       update
       upgrade
-      # simple-completion-language-server
+      simple-completion-language-server
 
       # System tools
       age

pkgs/fcast/default.nix

@@ -1,202 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  cargo,
-  copyDesktopItems,
-  dbus,
-  electron_28,
-  fetchFromGitLab,
-  glib,
-  gnome,
-  gtk3,
-  jq,
-  libsecret,
-  makeDesktopItem,
-  makeWrapper,
-  moreutils,
-  napi-rs-cli,
-  nodejs_18,
-  patchutils_0_4_2,
-  pkg-config,
-  python3,
-  runCommand,
-  rustc,
-  rustPlatform,
-}: let
-  description = "A secure and free password manager for all of your devices";
-  icon = "bitwarden";
-  electron = electron_28;
-in
-  buildNpmPackage rec {
-    pname = "bitwarden-desktop";
-    version = "2024.3.0";
-
-    src = fetchFromGitLab {
-      owner = "videostreaming";
-      repo = "fcast";
-      rev = "b13d0f7e8150c279d377a78f89d338b7fc0f5539";
-      hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g=";
-    };
-
-    patches = [
-      ./electron-builder-package-lock.patch
-    ];
-
-    # The nested package-lock.json from upstream is out-of-date, so copy the
-    # lock metadata from the root package-lock.json.
-    postPatch = ''
-      cat {,apps/desktop/src/}package-lock.json \
-        | ${lib.getExe jq} -s '
-          .[1].packages."".dependencies.argon2 = .[0].packages."".dependencies.argon2
-            | .[0].packages."" = .[1].packages.""
-            | .[1].packages = .[0].packages
-            | .[1]
-          ' \
-        | ${moreutils}/bin/sponge apps/desktop/src/package-lock.json
-    '';
-
-    nodejs = nodejs_18;
-
-    makeCacheWritable = true;
-    npmFlags = ["--legacy-peer-deps"];
-    npmWorkspace = "apps/desktop";
-    npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc=";
-
-    cargoDeps = rustPlatform.fetchCargoTarball {
-      name = "${pname}-${version}";
-      inherit src;
-      patches =
-        map
-        (
-          patch:
-            runCommand
-            (builtins.baseNameOf patch)
-            {nativeBuildInputs = [patchutils_0_4_2];}
-            ''
-              < ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out
-            ''
-        )
-        patches;
-      patchFlags = ["-p4"];
-      sourceRoot = "${src.name}/${cargoRoot}";
-      hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI=";
-    };
-    cargoRoot = "apps/desktop/desktop_native";
-
-    env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
-
-    nativeBuildInputs = [
-      cargo
-      copyDesktopItems
-      jq
-      makeWrapper
-      moreutils
-      napi-rs-cli
-      pkg-config
-      python3
-      rustc
-      rustPlatform.cargoCheckHook
-      rustPlatform.cargoSetupHook
-    ];
-
-    buildInputs = [
-      glib
-      gtk3
-      libsecret
-    ];
-
-    preBuild = ''
-      if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
-        echo 'ERROR: electron version mismatch'
-        exit 1
-      fi
-    '';
-
-    postBuild = ''
-      pushd apps/desktop
-
-      # desktop_native/index.js loads a file of that name regarldess of the libc being used
-      mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node
-
-      npm exec electron-builder -- \
-        --dir \
-        -c.electronDist=${electron}/libexec/electron \
-        -c.electronVersion=${electron.version}
-
-      popd
-    '';
-
-    doCheck = true;
-
-    nativeCheckInputs = [
-      dbus
-      (gnome.gnome-keyring.override {useWrappedDaemon = false;})
-    ];
-
-    checkFlags = [
-      "--skip=password::password::tests::test"
-    ];
-
-    checkPhase = ''
-      runHook preCheck
-
-      pushd ${cargoRoot}
-      export HOME=$(mktemp -d)
-      export -f cargoCheckHook runHook _eval _callImplicitHook
-      export cargoCheckType=release
-      dbus-run-session \
-        --config-file=${dbus}/share/dbus-1/session.conf \
-        -- bash -e -c cargoCheckHook
-      popd
-
-      runHook postCheck
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir $out
-
-      pushd apps/desktop/dist/linux-unpacked
-      mkdir -p $out/opt/Bitwarden
-      cp -r locales resources{,.pak} $out/opt/Bitwarden
-      popd
-
-      makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \
-        --add-flags $out/opt/Bitwarden/resources/app.asar \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
-        --set-default ELECTRON_IS_DEV 0 \
-        --inherit-argv0
-
-      pushd apps/desktop/resources/icons
-      for icon in *.png; do
-        dir=$out/share/icons/hicolor/"''${icon%.png}"/apps
-        mkdir -p "$dir"
-        cp "$icon" "$dir"/${icon}.png
-      done
-      popd
-
-      runHook postInstall
-    '';
-
-    desktopItems = [
-      (makeDesktopItem {
-        name = "bitwarden";
-        exec = "bitwarden %U";
-        inherit icon;
-        comment = description;
-        desktopName = "Bitwarden";
-        categories = ["Utility"];
-      })
-    ];
-
-    meta = {
-      changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}";
-      inherit description;
-      homepage = "https://bitwarden.com";
-      license = lib.licenses.gpl3;
-      maintainers = with lib.maintainers; [amarshall kiwi];
-      platforms = ["x86_64-linux"];
-      mainProgram = "bitwarden";
-    };
-  }

pkgs/simple-completion-language-server/default.nix

@@ -5,16 +5,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "simple-completion-language-server";
-  version = "ff9f90bc96c347f284571bc6310bc31f95508d55";
+  version = "6c797949ad5a6e9548b60b5475d1c9977f26c811";
 
   src = fetchFromGitHub {
     owner = "estin";
     repo = pname;
     rev = version;
-    hash = "sha256-qybbZXjKzKcc6UXfAjwmkkB+qEUuGQXABRbMj7bNksM=";
+    hash = "sha256-cITZdlDB03i7gOYbahV99wZOQ7tisnqdT/N2Z12oLFM=";
   };
 
-  cargoHash = "sha256-VTz2Fm+PRUPM5+u9D+2TzGGIEQwb1j0Lz0WRaQ5/Yzo=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-nannF4BKRLCcsS7VznzEHqrhLHYvN4X22t8jud87XEM=";
   meta = with lib; {
     description = "Language server to enable word completion and snippets for Helix editor";
     homepage = "https://github.com/estin/simple-completion-language-server";