From 4402873891edace4b678af537236ff1d81bba585 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sun, 4 Aug 2024 05:08:05 +0200
Subject: Server config cleanup

---
 flake.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index db63713..d34ccc4 100755
--- a/flake.nix
+++ b/flake.nix
@@ -5,11 +5,10 @@
     # Different nixpkgs versions
     nixpkgs = {
       url = "github:NixOS/nixpkgs/nixos-unstable";
-      #url="path:/Rory-Open-Architecture/nixpkgs";
     };
 
     nixpkgs-master = {
-      url = "github:NixOs/nixpkgs/master";
+      url = "github:NixOS/nixpkgs/master";
     };
 
     nixpkgs-RoryNix = {
@@ -17,9 +16,9 @@
       url = "github:NixOS/nixpkgs/nixos-23.11";
     };
 
-    nixpkgs-Draupnir = { # Draupnir module/package
+    # Draupnir module/package
+    nixpkgs-Draupnir = {
       url = "github:TheArcaneBrony/nixpkgs/master";
-      #url = "path:/Rory-Open-Architecture/nixpkgs";
     };
 
     # Base modules
@@ -61,12 +60,16 @@
             home-manager.nixosModules.home-manager
             grapevine.nixosModules.default
 
+            # these arent really modules...
+            botcore-v4.modules.bots
+            botcore-v4.modules.frontend
+            botcore-v4.modules.dataupdater
+            botcore-v4.modules.users
+
             (
-              { pkgs, ... }: 
+              { pkgs, ... }:
               {
-                disabledModules = [
-                  "services/matrix/synapse.nix"
-                ];
+                disabledModules = [ "services/matrix/synapse.nix" ];
                 imports = [
                   "${nixpkgs-master}/nixos/modules/services/matrix/synapse.nix"
                   "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
-- 
cgit 1.4.1