diff --git a/flake.nix b/flake.nix
index 636bff9..2c06f4e 100755
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,6 @@
inputs = {
# Different nixpkgs versions
nixpkgs = {
- #url = "github:NixOS/nixpkgs?rev=18536bf04cd71abd345f9579158841376fdd0c5a";
url = "github:NixOS/nixpkgs/nixos-unstable";
};
@@ -37,9 +36,8 @@
flake-utils.url = "github:numtide/flake-utils";
# Packages
- grapevine.url = "gitlab:matrix/grapevine-fork?host=gitlab.computer.surgery"; # &ref=benjamin/debug-emma-kde-room";
+ grapevine.url = "gitlab:matrix/grapevine-fork?host=gitlab.computer.surgery";
conduit.url = "gitlab:famedly/conduit/next";
- #conduwuit.url = "github:girlbossceo/conduwuit";
# - AUR imports
# aur-visual-paradigm = {
# url = "git+https://aur.archlinux.org/visual-paradigm.git";
@@ -54,7 +52,6 @@
# Own projects/custom modules
botcore-v4 = {
url = "gitlab:BotCore-Devs/BotCore-v4/staging";
- #inputs.nixpkgs.follows = "nixpkgs-RoryNix"; # We need this to avoid a LIBC error.
};
ooye = {
@@ -112,14 +109,8 @@
home-manager.nixosModules.home-manager
lix-module.nixosModules.default
grapevine.nixosModules.default
- #MatrixContentFilter.modules.default
ooye.modules.default
- # these arent really modules...
- #botcore-v4.modules.bots
- #botcore-v4.modules.frontend
- #botcore-v4.modules.dataupdater
- #botcore-v4.modules.users
(
{ pkgs, ... }:
@@ -146,7 +137,6 @@
inherit conduit;
inherit nixpkgs-Draupnir;
inherit cgit-magenta;
- #inherit conduwuit;
inherit (inputs) draupnirSrc;
};
@@ -161,7 +151,6 @@
home-manager.nixosModules.home-manager
lix-module.nixosModules.default
grapevine.nixosModules.default
- #MatrixContentFilter.modules.default
ooye.modules.default
# these arent really modules...
@@ -169,51 +158,12 @@
botcore-v4.modules.frontend
botcore-v4.modules.dataupdater
botcore-v4.modules.users
-
- (
- { pkgs, lib, ... }:
- {
- disabledModules = [ "services/matrix/synapse.nix" ];
- imports = [
- "${nixpkgs-master}/nixos/modules/services/matrix/synapse.nix"
- "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
- ];
- nixpkgs.overlays = [
- (final: prev: {
- matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped.overrideAttrs (old: {
- patches = [
- ./private/synapse-fast-links.patch
- #./private/0001-Hotfix-ignore-rejected-events-in-delayed_events.patch
- ];
- #doCheck = false;
- #checkPhase = "";
- });
- draupnir = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
- # .overrideAttrs (old: {
- # src = draupnirSrc;
- # packageJSON = draupnirSrc + "/package.json";
- # offlineCache = pkgs.fetchYarnDeps {
- # pname = "${old.pname}-yarn-offline-cache";
- # yarnLock = draupnirSrc + "/yarn.lock";
- # hash = "sha256-vXCSN7kdbtqzIbVu6S0SoI7GXoZPIV4Ag399dbLaY1g=";
- #
- ## };
- # });
- keydb = inputs.nixpkgs-keydb.legacyPackages.${pkgs.stdenv.hostPlatform.system}.keydb;
- })
- ];
- }
- )
];
specialArgs = {
inherit botcore-v4;
inherit home-manager;
inherit grapevine;
inherit conduit;
- inherit nixpkgs-Draupnir;
- #inherit conduwuit;
-
- inherit (inputs) draupnirSrc;
};
};
@@ -325,12 +275,6 @@
};
}
)
- # ... add this line to the rest of your configuration modules
- #nix-ld.nixosModules.nix-ld
-
- # The module in this repository defines a new module under (programs.nix-ld.dev) instead of (programs.nix-ld)
- # to not collide with the nixpkgs version.
- #{ programs.nix-ld.dev.enable = true; }
];
specialArgs = {
inherit home-manager;
@@ -354,12 +298,6 @@
};
}
)
- # ... add this line to the rest of your configuration modules
- #nix-ld.nixosModules.nix-ld
-
- # The module in this repository defines a new module under (programs.nix-ld.dev) instead of (programs.nix-ld)
- # to not collide with the nixpkgs version.
- #{ programs.nix-ld.dev.enable = true; }
];
specialArgs = {
inherit home-manager;
|
