Merge pull request #85 from naturallaw777/copilot/replace-custom-template-nix
Simplify custom.template.nix and add-custom-nix.sh — remove hub-managed steps
This commit is contained in:
Sovran_Systems
GitHub
@@ -5,8 +5,13 @@
|
|||||||
# #
|
# #
|
||||||
# Sovran_SystemsOS — custom.nix #
|
# Sovran_SystemsOS — custom.nix #
|
||||||
# #
|
# #
|
||||||
# This is YOUR configuration file. Edit it to customize #
|
# Services, features, and roles are managed by the #
|
||||||
# which services and features run on your machine. #
|
# Sovran Hub. Any changes you make through the Hub #
|
||||||
|
# will appear in the "Hub Managed" section below. #
|
||||||
|
# #
|
||||||
|
# If you want to add your own NixOS modules or #
|
||||||
|
# configuration, place them here — outside of the #
|
||||||
|
# Hub Managed section. #
|
||||||
# #
|
# #
|
||||||
# After making changes, rebuild with: #
|
# After making changes, rebuild with: #
|
||||||
# #
|
# #
|
||||||
@@ -14,115 +19,6 @@
|
|||||||
# #
|
# #
|
||||||
###########################################################
|
###########################################################
|
||||||
|
|
||||||
|
# ─── Add your custom NixOS configuration below ───────────
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
# STEP 1: CHOOSE YOUR ROLE
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
#
|
|
||||||
# Your initial role was selected during installation.
|
|
||||||
# To CHANGE your role, uncomment exactly ONE of the lines below.
|
|
||||||
#
|
|
||||||
# Server+Desktop: Full server + desktop environment
|
|
||||||
# Desktop Only: Desktop environment, no server services
|
|
||||||
# Node (Bitcoin Only): Bitcoin ecosystem
|
|
||||||
#
|
|
||||||
# ───────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
# sovran_systemsOS.roles.server_plus_desktop = true;
|
|
||||||
# sovran_systemsOS.roles.desktop = true;
|
|
||||||
# sovran_systemsOS.roles.node = true;
|
|
||||||
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
# STEP 2: SERVICES (default: ON)
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
#
|
|
||||||
# These are all ON by default in the Server+Desktop role.
|
|
||||||
# Set any to "false" to disable it.
|
|
||||||
#
|
|
||||||
# ┌─────────────────────┬────────────────────────────────┐
|
|
||||||
# │ Service │ What it does │
|
|
||||||
# ├─────────────────────┼────────────────────────────────┤
|
|
||||||
# │ synapse │ Matrix Synapse homeserver │
|
|
||||||
# │ bitcoin │ Bitcoin ecosystem (bitcoind, │
|
|
||||||
# │ │ electrs, lnd, rtl, btcpay) │
|
|
||||||
# │ vaultwarden │ Vaultwarden password manager │
|
|
||||||
# │ wordpress │ WordPress website │
|
|
||||||
# │ nextcloud │ Nextcloud file hosting │
|
|
||||||
# └─────────────────────┴────────────────────────────────┘
|
|
||||||
#
|
|
||||||
# Example — disable WordPress and Nextcloud:
|
|
||||||
#
|
|
||||||
# sovran_systemsOS.services.wordpress = false;
|
|
||||||
# sovran_systemsOS.services.nextcloud = false;
|
|
||||||
#
|
|
||||||
# ───────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
# sovran_systemsOS.services.wordpress = false;
|
|
||||||
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
# STEP 3: FEATURES (default: OFF)
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
#
|
|
||||||
# These are OFF by default. Set to "true" to enable.
|
|
||||||
#
|
|
||||||
# ┌─────────────────────┬────────────────────────────────┐
|
|
||||||
# │ Feature │ What it does │
|
|
||||||
# ├─────────────────────┼────────────────────────────────┤
|
|
||||||
# │ haven │ Haven NOSTR relay & Blossom │
|
|
||||||
# │ bip110 │ BIP-110 Bitcoin Better Money │
|
|
||||||
# │ mempool │ Mempool.space block explorer │
|
|
||||||
# │ element-calling │ LiveKit server for Matrix │
|
|
||||||
# │ rdp │ GNOME Remote Desktop (RDP) │
|
|
||||||
# │ bitcoin-core │ Bitcoin Core GUI desktop app │
|
|
||||||
# │ sshd │ SSH remote access (for support) │
|
|
||||||
# └─────────────────────┴─────<E29480><E29480><EFBFBD>──────────────────────────┘
|
|
||||||
#
|
|
||||||
# Example — enable element video calling:
|
|
||||||
#
|
|
||||||
# sovran_systemsOS.features.element-calling = true;
|
|
||||||
#
|
|
||||||
# ───────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
# sovran_systemsOS.features.element-calling = true;
|
|
||||||
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
# STEP 4: WEB EXPOSURE (default: ON)
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
#
|
|
||||||
# Controls whether Caddy serves this application to the web.
|
|
||||||
# (Does not stop the application itself from running).
|
|
||||||
#
|
|
||||||
# ┌─────────────────────┬────────────────────────────────┐
|
|
||||||
# │ Option │ Default │
|
|
||||||
# ├─────────────────────┼────────────────────────────────┤
|
|
||||||
# │ btcpayserver │ true (false in Node role) │
|
|
||||||
# └─────────────────────┴────────────────────────────────┘
|
|
||||||
#
|
|
||||||
# Example — hide BTCPay from the web:
|
|
||||||
#
|
|
||||||
# sovran_systemsOS.web.btcpayserver = false;
|
|
||||||
#
|
|
||||||
# ───────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
# sovran_systemsOS.web.btcpayserver = false;
|
|
||||||
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
# STEP 5: NOSTR PUBLIC KEY (required for Haven)
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
#
|
|
||||||
# If you enabled Haven above, paste your npub here.
|
|
||||||
# Haven will NOT start without a valid npub.
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
#
|
|
||||||
# sovran_systemsOS.nostr_npub = "npub1abc123...";
|
|
||||||
#
|
|
||||||
# ───────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
# sovran_systemsOS.nostr_npub = "";
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,21 +37,26 @@ FILE=/var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed
|
|||||||
touch /etc/nixos/custom.nix
|
touch /etc/nixos/custom.nix
|
||||||
|
|
||||||
/run/current-system/sw/bin/cat > /etc/nixos/custom.nix <<- "EOF"
|
/run/current-system/sw/bin/cat > /etc/nixos/custom.nix <<- "EOF"
|
||||||
|
{ config, lib, ... }:
|
||||||
|
|
||||||
{config, pkgs, lib, ...}:
|
|
||||||
|
|
||||||
# Add custom NixOS modules here.
|
|
||||||
|
|
||||||
let
|
|
||||||
personalization = import ./personalization.nix;
|
|
||||||
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
###########################################################
|
||||||
|
# #
|
||||||
|
# Sovran_SystemsOS — custom.nix #
|
||||||
|
# #
|
||||||
|
# Services, features, and roles are managed by the #
|
||||||
|
# Sovran Hub. Any changes you make through the Hub #
|
||||||
|
# will appear in the "Hub Managed" section below. #
|
||||||
|
# #
|
||||||
|
# If you want to add your own NixOS modules or #
|
||||||
|
# configuration, place them here — outside of the #
|
||||||
|
# Hub Managed section. #
|
||||||
|
# #
|
||||||
|
###########################################################
|
||||||
|
|
||||||
|
# ─── Add your custom NixOS configuration below ───────────
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user