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.homeModules.catppuccin
+          catppuccin.homeModules.catppuccin
           ./home-manager/shared
           sops-nix.homeManagerModules.sops
         ];

home-manager/desktop/package-configs/foot/default.nix

@@ -4,7 +4,6 @@
     # catppuccin.enable = true;
     settings = {
       main = {
-        font = "Atkinson Monolegible:size=12";
       };
 
       mouse = {

home-manager/desktop/package-configs/plasma-desktop.nix

@@ -13,33 +13,33 @@
   programs.plasma = {
     enable = true;
     desktop.mouseActions.verticalScroll = "switchVirtualDesktop";
-    kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}";
+    # kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}";
-    fonts = {
+    # fonts = {
-      fixedWidth = {
+    #   fixedWidth = {
-        pointSize = 11;
+    #     pointSize = 11;
-        family = "${osConfig.stylix.fonts.monospace.name}";
+    #     family = "${osConfig.stylix.fonts.monospace.name}";
-      };
+    #   };
-      general = {
+    #   general = {
-        pointSize = 11;
+    #     pointSize = 11;
-        family = "${osConfig.stylix.fonts.serif.name}";
+    #     family = "${osConfig.stylix.fonts.serif.name}";
-      };
+    #   };
-      menu = {
+    #   menu = {
-        pointSize = 11;
+    #     pointSize = 11;
-        family = "${osConfig.stylix.fonts.sansSerif.name}";
+    #     family = "${osConfig.stylix.fonts.sansSerif.name}";
-      };
+    #   };
-      small = {
+    #   small = {
-        pointSize = 11;
+    #     pointSize = 11;
-        family = "${osConfig.stylix.fonts.sansSerif.name}";
+    #     family = "${osConfig.stylix.fonts.sansSerif.name}";
-      };
+    #   };
-      toolbar = {
+    #   toolbar = {
-        pointSize = 11;
+    #     pointSize = 11;
-        family = "${osConfig.stylix.fonts.sansSerif.name}";
+    #     family = "${osConfig.stylix.fonts.sansSerif.name}";
-      };
+    #   };
-      windowTitle = {
+    #   windowTitle = {
-        pointSize = 11;
+    #     pointSize = 11;
-        family = "${osConfig.stylix.fonts.sansSerif.name}";
+    #     family = "${osConfig.stylix.fonts.sansSerif.name}";
-      };
+    #   };
-    };
+    # };
     panels = [
       {
         alignment = "left";
@@ -82,7 +82,6 @@
                 "qBittorrent"
                 "vlc"
                 "steam"
-                "Thunderbird Daily"
               ];
             };
           }

home-manager/shared/default.nix

@@ -54,33 +54,36 @@
       # };
     };
   };
+  # stylix.enable = true;
+  # qt.platformTheme.name = lib.mkForce "kvantum";
+  # qt.style.name = lib.mkForce "kvantum";
 
-  stylix = {
+  # stylix = {
-    enable = true;
+  #   enable = true;
-    autoEnable = true;
+  #   autoEnable = true;
-    base16Scheme = {
+  #   base16Scheme = {
-      scheme = "Catppuccin Macchiato";
+  #     scheme = "Catppuccin Macchiato";
-      author = "https://github.com/catppuccin/catppuccin";
+  #     author = "https://github.com/catppuccin/catppuccin";
-      base00 = "24273a";
+  #     base00 = "24273a";
-      base01 = "1e2030";
+  #     base01 = "1e2030";
-      base02 = "363a4f";
+  #     base02 = "363a4f";
-      base03 = "494d64";
+  #     base03 = "494d64";
-      base04 = "5b6078";
+  #     base04 = "5b6078";
-      base05 = "cad3f5";
+  #     base05 = "cad3f5";
-      base06 = "f4dbd6";
+  #     base06 = "f4dbd6";
-      base07 = "b7bdf8";
+  #     base07 = "b7bdf8";
-      base08 = "ed8796";
+  #     base08 = "ed8796";
-      base09 = "f5a97f";
+  #     base09 = "f5a97f";
-      base0A = "eed49f";
+  #     base0A = "eed49f";
-      base0B = "a6da95";
+  #     base0B = "a6da95";
-      base0C = "8bd5ca";
+  #     base0C = "8bd5ca";
-      base0D = "8aadf4";
+  #     base0D = "8aadf4";
-      base0E = "c6a0f6";
+  #     base0E = "c6a0f6";
-      base0F = "f0c6c6";
+  #     base0F = "f0c6c6";
-    };
+  #   };
-    image = ./background.jpg;
+  #   image = ./background.jpg;
-    cursor.package = pkgs.catppuccin-cursors;
+  #   cursor.package = pkgs.catppuccin-cursors;
-    cursor.name = "catppuccin-macchiato-mauve-cursors";
+  #   cursor.name = "catppuccin-macchiato-mauve-cursors";
-    cursor.size = 16;
+  #   cursor.size = 16;
-  };
+  # };
 }

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/default.nix

@@ -70,8 +70,8 @@
   catppuccin = {
     flavor = "macchiato";
     tty.enable = true;
-    sddm.enable = true;
+    # sddm.enable = true;
-    sddm.flavor = "macchiato";
+    # sddm.flavor = "macchiato";
     forgejo.enable = true;
     forgejo.flavor = "macchiato";
     # plymouth.enable = false;
@@ -87,70 +87,70 @@
     enableBrowserSocket = true;
   };
 
-  stylix = {
+  # stylix = {
-    enable = true;
+  #   enable = true;
-    autoEnable = true;
+  #   # targets.qt.platform = "kde6";
-    base16Scheme = {
+  #   autoEnable = true;
-      scheme = "Catppuccin Macchiato";
+  #   base16Scheme = {
-      author = "https://github.com/catppuccin/catppuccin";
+  #     scheme = "Catppuccin Macchiato";
-      base00 = "24273a";
+  #     author = "https://github.com/catppuccin/catppuccin";
-      base01 = "1e2030";
+  #     base00 = "24273a";
-      base02 = "363a4f";
+  #     base01 = "1e2030";
-      base03 = "494d64";
+  #     base02 = "363a4f";
-      base04 = "5b6078";
+  #     base03 = "494d64";
-      base05 = "cad3f5";
+  #     base04 = "5b6078";
-      base06 = "f4dbd6";
+  #     base05 = "cad3f5";
-      base07 = "b7bdf8";
+  #     base06 = "f4dbd6";
-      base08 = "ed8796";
+  #     base07 = "b7bdf8";
-      base09 = "f5a97f";
+  #     base08 = "ed8796";
-      base0A = "eed49f";
+  #     base09 = "f5a97f";
-      base0B = "a6da95";
+  #     base0A = "eed49f";
-      base0C = "8bd5ca";
+  #     base0B = "a6da95";
-      base0D = "8aadf4";
+  #     base0C = "8bd5ca";
-      base0E = "c6a0f6";
+  #     base0D = "8aadf4";
-      base0F = "f0c6c6";
+  #     base0E = "c6a0f6";
-    };
+  #     base0F = "f0c6c6";
-    image = ./background.jpg;
+  #   };
-    cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
+  #   image = ./background.jpg;
-    cursor.name = "catppuccin-macchiato-mauve-cursors";
+  #   cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
-    cursor.size = 16;
+  #   cursor.name = "catppuccin-macchiato-mauve-cursors";
-    homeManagerIntegration.followSystem = true;
+  #   cursor.size = 16;
-    fonts = {
+  #   homeManagerIntegration.followSystem = true;
-      serif = {
+  #   fonts = {
-        package = pkgs.atkinson-hyperlegible;
+  #     serif = {
-        name = "Atkinson Hyperlegible";
+  #       package = pkgs.dejavu_fonts;
-      };
+  #       name = "DejaVu Serif";
+  #     };
 
-      monospace = {
+  #     monospace = {
-        package = pkgs.atkinson-monolegible;
+  #       package = pkgs.dejavu_fonts;
-        name = "Atkinson Monolegible";
+  #       name = "DejaVu Sans Mono";
-      };
+  #     };
 
-      sansSerif = {
+  #     sansSerif = {
-        package = pkgs.atkinson-hyperlegible;
+  #       package = pkgs.dejavu_fonts;
-        name = "Atkinson Hyperlegible";
+  #       name = "DejaVu Sans";
-      };
+  #     };
 
-      emoji = {
+  #     emoji = {
-        package = pkgs.noto-fonts-emoji-blob-bin;
+  #       package = pkgs.noto-fonts-emoji-blob-bin;
-        name = "Blobmoji";
+  #       name = "Blobmoji";
-      };
+  #     };
-    };
+  #   };
-  };
+  # };
 
   fonts.packages = [
     pkgs.atkinson-hyperlegible
     pkgs.atkinson-monolegible
-    pkgs.noto-fonts-emoji-blob-bin
     pkgs.noto-fonts
     pkgs.nerd-fonts.fira-mono
   ];
 
-  # fonts.fontconfig.defaultFonts = {
+  fonts.fontconfig.defaultFonts = {
-  #   emoji = ["Blobmoji"];
+    emoji = ["Blobmoji"];
-  #   monospace = ["Atkinson Monolegible"];
+    monospace = ["Atkinson Monolegible"];
-  #   sansSerif = ["Atkinson Hyperlegible"];
+    sansSerif = ["Atkinson Hyperlegible"];
-  # };
+  };
 
   networking =
     if config.services.vpn-ip.enable

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/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";