fixed tooling

This commit is contained in:
2026-03-24 17:03:02 -05:00
parent 5ccaecf12c
commit b38b514606
9 changed files with 32 additions and 26 deletions

View File

@@ -1,6 +1,6 @@
{ config, lib, pkgs, bip110, ... }: { 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; services.bitcoind.packages = lib.mkForce bip110.packages.x86_64-linux.bitcoind-knots-bip-110;

View File

@@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ lib.mkIf config.sovran_systemsOS.features.bitcoin-core {
services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind; services.bitcoind.package = lib.mkForce config.nix-bitcoin.pkgs.bitcoind;

View File

@@ -1,6 +1,6 @@
{ config, pkgs, lib, bip110, ... }: { config, pkgs, lib, bip110, ... }:
{ lib.mkIf config.sovran_systemsOS.features.bitcoin {
## Bitcoind ## Bitcoind

View File

@@ -5,7 +5,7 @@
roles = { roles = {
server-desktop = lib.mkOption { server-desktop = lib.mkOption {
type = lib.types.bool; 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"; desktop = lib.mkEnableOption "Desktop Role";
node = lib.mkEnableOption "Bitcoin Node Only Role"; node = lib.mkEnableOption "Bitcoin Node Only Role";

View File

@@ -6,7 +6,7 @@ personalization = import ./personalization.nix;
in in
{ lib.mkIf config.sovran_systemsOS.features.element-calling {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /var/lib/domains/element-calling 0750 caddy php -" "d /var/lib/domains/element-calling 0750 caddy php -"

View File

@@ -6,7 +6,7 @@ personalization = import ./personalization.nix;
in in
{ lib.mkIf config.sovran_systemsOS.features.haven {
services.haven = { services.haven = {
enable = true; enable = true;

View File

@@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ lib.mkIf config.sovran_systemsOS.features.mempool {
services.mempool = { services.mempool = {
enable = true; enable = true;

View File

@@ -1,21 +1,26 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
imports =
[ imports = [
./core/roles.nix
./core/role-logic.nix ./core/roles.nix
./php.nix ./core/role-logic.nix
./Sovran_SystemsOS_File_Fixes_And_New_Services.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 # Always imported feature modules
++ lib.optional config.sovran_systemsOS.features.bitcoin ./bitcoinecosystem.nix ./synapse.nix
++ lib.optional config.sovran_systemsOS.features.vaultwarden ./vaultwarden.nix ./coturn.nix
++ lib.optional config.sovran_systemsOS.features.haven ./haven.nix ./bitcoinecosystem.nix
++ lib.optional config.sovran_systemsOS.features.bip110 ./bip110.nix ./vaultwarden.nix
++ lib.optional config.sovran_systemsOS.features.element-calling ./element-calling.nix ./haven.nix
++ lib.optional config.sovran_systemsOS.features.mempool ./mempool.nix ./bip110.nix
++ lib.optional config.sovran_systemsOS.features.bitcoin-core ./bitcoin-core.nix ./element-calling.nix
++ lib.optional config.sovran_systemsOS.features.rdp ./rdp.nix; ./mempool.nix
./bitcoin-core.nix
./rdp.nix
];
} }

View File

@@ -1,6 +1,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ lib.mkIf config.sovran_systemsOS.features.rpd {
services.gnome.gnome-remote-desktop.enable = true; services.gnome.gnome-remote-desktop.enable = true;
systemd.services.gnome-remote-desktop = { systemd.services.gnome-remote-desktop = {