fixed tooling

2026-03-24 17:03:02 -05:00
parent 5ccaecf12c
commit b38b514606
9 changed files with 32 additions and 26 deletions
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -1,21 +1,26 @@
 { config, pkgs, lib, ... }:

 {
-  imports =
-    [
-      ./core/roles.nix
-      ./core/role-logic.nix
-      ./php.nix
-      ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix
-    ]
-    ++ lib.optional config.sovran_systemsOS.features.synapse ./synapse.nix
-    ++ lib.optional config.sovran_systemsOS.features.coturn ./coturn.nix
-    ++ lib.optional config.sovran_systemsOS.features.bitcoin ./bitcoinecosystem.nix
-    ++ lib.optional config.sovran_systemsOS.features.vaultwarden ./vaultwarden.nix
-    ++ lib.optional config.sovran_systemsOS.features.haven ./haven.nix
-    ++ lib.optional config.sovran_systemsOS.features.bip110 ./bip110.nix
-    ++ lib.optional config.sovran_systemsOS.features.element-calling ./element-calling.nix
-    ++ lib.optional config.sovran_systemsOS.features.mempool ./mempool.nix
-    ++ lib.optional config.sovran_systemsOS.features.bitcoin-core ./bitcoin-core.nix
-    ++ lib.optional config.sovran_systemsOS.features.rdp ./rdp.nix;
+ 
+  imports = [
+    
+    ./core/roles.nix
+    ./core/role-logic.nix
+    ./php.nix
+    ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix
+
+    # Always imported feature modules
+    ./synapse.nix
+    ./coturn.nix
+    ./bitcoinecosystem.nix
+    ./vaultwarden.nix
+    ./haven.nix
+    ./bip110.nix
+    ./element-calling.nix
+    ./mempool.nix
+    ./bitcoin-core.nix
+    ./rdp.nix
+
+  ];
+
 }