use continuwuity from nixpkgs

clients/quadraticserver/matrix/cinny.nix

@@ -6,19 +6,19 @@
         homeserverList = ["federated.nexus"];
         allowCustomHomeservers = false;
       };
-      cinny-unwrapped = pkgs.cinny-unwrapped.overrideAttrs (old: rec {
+      # cinny-unwrapped = pkgs.cinny-unwrapped.overrideAttrs (old: rec {
-        src = pkgs.fetchFromGitHub {
+      #   src = pkgs.fetchFromGitHub {
-          owner = "GigiaJ";
+      #     owner = "GigiaJ";
-          repo = "cinny";
+      #     repo = "cinny";
-          rev = "a299e9c4cb4df1a3b732fdfddb1297170251a10d";
+      #     rev = "a299e9c4cb4df1a3b732fdfddb1297170251a10d";
-          hash = "sha256-EDsDVOlaYT0S30Cml+t71U7OOKkfcE4aJxwE8iTdV3s=";
+      #     hash = "sha256-EDsDVOlaYT0S30Cml+t71U7OOKkfcE4aJxwE8iTdV3s=";
-        };
+      #   };
-        npmDeps = pkgs.fetchNpmDeps {
+      #   npmDeps = pkgs.fetchNpmDeps {
-          inherit src;
+      #     inherit src;
-          name = "${old.pname}-${old.version}-npm-deps";
+      #     name = "${old.pname}-${old.version}-npm-deps";
-          hash = "sha256-k8eCQO1uIpoKpLHO3E3EYWbQSjcAya2AxngA9mvSfns=";
+      #     hash = "sha256-k8eCQO1uIpoKpLHO3E3EYWbQSjcAya2AxngA9mvSfns=";
-        };
+      #   };
-      });
+      # });
     }}
     try_files {path} {path}/ /index.html
     file_server

clients/quadraticserver/matrix/continuwuity.nix

@@ -3,20 +3,17 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   systemd.services.continuwuity.serviceConfig.Restart = lib.mkForce "always";
 
-  services =
+  services = let
-    let
     domain = "federated.nexus";
     subdomain = "matrix.${domain}";
     socket = "/var/run/continuwuity/continuwuity.sock";
-    in
+  in {
-    {
     matrix-continuwuity = {
       enable = true;
-        package = inputs.continuwuity.packages.${pkgs.system}.default;
+      package = inputs.nixpkgs-continuwuity.legacyPackages.${pkgs.system}.matrix-continuwuity;
       group = "caddy";
       settings.global = {
         server_name = domain;

flake.nix

@@ -2,14 +2,10 @@
   inputs = {
     gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-lasuite.url = "github:Henry-Hiles/nixpkgs/bump-lasuite";
+    nixpkgs-continuwuity.url = "github:savyajha/nixpkgs/continuwuity";
     wrapper-manager.url = "github:viperML/wrapper-manager";
     flake-parts.url = "github:hercules-ci/flake-parts";
     nix-maid.url = "github:viperML/nix-maid";
-    continuwuity = {
-      url = "path:/home/quadradical/Documents/Code/continuwuity";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -64,16 +60,13 @@
     };
   };
 
-  outputs =
+  outputs = inputs: let
-    inputs:
-    let
     lib = inputs.nixpkgs.lib;
     dirUtils = {
       opt = lib.optionals;
       dirFiles = type: dir: lib.filter (lib.hasSuffix type) (lib.filesystem.listFilesRecursive dir);
     };
-      system =
+    system = info:
-        info:
       lib.nixosSystem {
         inherit (info) system;
         specialArgs = {
@@ -85,8 +78,7 @@
             localSystem = info.system;
             buildPlatform = "x86_64-linux";
 
-              overlays =
+            overlays = let
-                let
               path = ./cross-overlays/${info.hostname};
             in
               dirUtils.opt (builtins.pathExists path) (
@@ -99,8 +91,7 @@
           };
         };
 
-          modules =
+        modules = let
-            let
           clientPath = ./clients/${info.hostname};
         in
           with dirUtils;
@@ -130,9 +121,7 @@
         "x86_64-linux"
       ];
 
-      perSystem =
+      perSystem = {pkgs, ...}: {
-        { pkgs, ... }:
-        {
         apps.image = {
           type = "app";
           program = pkgs.writeShellApplication {

modules/desktop/packages.nix

@@ -7,6 +7,5 @@
     libreoffice
     authenticator
     prismlauncher
-    # cinny-desktop
   ];
 }

modules/graphical/packages.nix

@@ -8,6 +8,5 @@
     wl-clipboard
     google-cursor
     papirus-icon-theme
-    # crossPkgs.cinny-desktop
   ];
 }