From b38b514606b2a5709492c1562afe4214f7373939 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Tue, 24 Mar 2026 17:03:02 -0500
Subject: [PATCH] fixed tooling

---
 modules/bip110.nix           |  2 +-
 modules/bitcoin-core.nix     |  4 ++--
 modules/bitcoinecosystem.nix |  2 +-
 modules/core/roles.nix       |  2 +-
 modules/element-calling.nix  |  2 +-
 modules/haven.nix            |  2 +-
 modules/mempool.nix          |  2 +-
 modules/modules.nix          | 39 ++++++++++++++++++++----------------
 modules/rdp.nix              |  3 ++-
 9 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/modules/bip110.nix b/modules/bip110.nix
index 5e07e9c..a79b5a1 100755
--- a/modules/bip110.nix
+++ b/modules/bip110.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, bip110, ... }:
 
-{
+lib.mkIf config.sovran_systemsOS.features.bip110 {
 
 services.bitcoind.packages = lib.mkForce bip110.packages.x86_64-linux.bitcoind-knots-bip-110;
 
diff --git a/modules/bitcoin-core.nix b/modules/bitcoin-core.nix
index a4951d1..609c8f3 100755
--- a/modules/bitcoin-core.nix
+++ b/modules/bitcoin-core.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
-{
-
+lib.mkIf config.sovran_systemsOS.features.bitcoin-core {
+  
   services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind;
 
 }
diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix
index b50959c..dc447f8 100755
--- a/modules/bitcoinecosystem.nix
+++ b/modules/bitcoinecosystem.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, bip110, ... }:
 
-{
+lib.mkIf config.sovran_systemsOS.features.bitcoin {
 	
 	## Bitcoind
 	
diff --git a/modules/core/roles.nix b/modules/core/roles.nix
index fd0c4eb..6b4e732 100755
--- a/modules/core/roles.nix
+++ b/modules/core/roles.nix
@@ -5,7 +5,7 @@
     roles = {
       server-desktop = lib.mkOption {
         type = lib.types.bool;
-        default = !config.sovran_sovransystemsOS.roles.desktop && !config.sovran_systemsOS.roles.node;
+        default = !config.sovran_systemsOS.roles.desktop && !config.sovran_systemsOS.roles.node;
       };
       desktop = lib.mkEnableOption "Desktop Role";
       node = lib.mkEnableOption "Bitcoin Node Only Role";
diff --git a/modules/element-calling.nix b/modules/element-calling.nix
index bdbe8b4..7a09b33 100755
--- a/modules/element-calling.nix
+++ b/modules/element-calling.nix
@@ -6,7 +6,7 @@ personalization = import ./personalization.nix;
 
 in
   
-{
+lib.mkIf config.sovran_systemsOS.features.element-calling {
 
   systemd.tmpfiles.rules = [
     "d /var/lib/domains/element-calling 0750 caddy php -"
diff --git a/modules/haven.nix b/modules/haven.nix
index 045c7bb..8092537 100755
--- a/modules/haven.nix
+++ b/modules/haven.nix
@@ -6,7 +6,7 @@ personalization = import ./personalization.nix;
 
 in
 
-{
+lib.mkIf config.sovran_systemsOS.features.haven {
 
 	services.haven = {
 		enable = true;
diff --git a/modules/mempool.nix b/modules/mempool.nix
index e95f793..5a6b1d3 100755
--- a/modules/mempool.nix
+++ b/modules/mempool.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-{
+lib.mkIf config.sovran_systemsOS.features.mempool {
 
   services.mempool = {
       enable = true;
diff --git a/modules/modules.nix b/modules/modules.nix
index 8e705fd..4f49a02 100755
--- 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
+
+  ];
+
 }
diff --git a/modules/rdp.nix b/modules/rdp.nix
index 2f3c7a7..164e239 100755
--- a/modules/rdp.nix
+++ b/modules/rdp.nix
@@ -1,6 +1,7 @@
 { config, pkgs, lib, ... }:
 
-{
+lib.mkIf config.sovran_systemsOS.features.rpd {
+
   services.gnome.gnome-remote-desktop.enable = true;
   
   systemd.services.gnome-remote-desktop = {