initial retooling

2026-03-27 14:29:26 -05:00
parent 5057ed2a05 5bee5ad99b
commit 10b0ac6cea
7 changed files with 638 additions and 0 deletions
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -1,6 +1,7 @@
 { config, pkgs, lib, ... }:

 {
+<<<<<<< HEAD
  imports = [
    ./core/roles.nix
    ./core/role-logic.nix
@@ -13,6 +14,20 @@
    ./wordpress.nix
    ./nextcloud.nix
    ./btcpayserver.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
+>>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
    ./vaultwarden.nix
    ./haven.nix
    ./bip110.nix
@@ -20,6 +35,12 @@
    ./mempool.nix
    ./bitcoin-core.nix
    ./rdp.nix
+<<<<<<< HEAD
    ./bitcoinecosystem.nix
  ];
+=======
+
+  ];
+
+>>>>>>> 5bee5ad99bb7890df011d88e9928b6944c3565f8
 }