From 634e92b4a73f23054b22aad70e125e8a0044aef5 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 25 Mar 2026 12:01:26 -0500 Subject: [PATCH] optimized both flake.nix --- flake.nix | 75 +++++++++++++++++++---------------- for_new_sovran_pros/flake.nix | 6 +-- 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/flake.nix b/flake.nix index 78c9d64..f686d46 100755 --- a/flake.nix +++ b/flake.nix @@ -17,51 +17,58 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - bip110.url = "github:emmanuelrosa/bitcoin-knots-bip-110-nix"; + bip110.url = "github:emmanuelrosa/bitcoin-knots-bip-110-nix"; }; - outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: + outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }: - let + let - overlay-stable = final: prev: { - stable = import nixpkgs-stable { - system = prev.stdenv.hostPlatform.system; - config.allowUnfree = true; - }; - }; + overlay-stable = final: prev: { - in + stable = import nixpkgs-stable { + system = prev.stdenv.hostPlatform.system; + config.allowUnfree = true; - { + }; - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - }; + }; - nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: { + in - imports = [ - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ overlay-stable ]; - }) + { + + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + + modules = [ + { nixpkgs.hostPlatform = "x86_64-linux"; } + ]; + + }; + + nixosModules.Sovran_SystemsOS = { pkgs, lib, config, ... }: { - ./configuration.nix - nix-bitcoin.nixosModules.default - agenix.nixosModules.default - nixvim.nixosModules.nixvim - ]; + imports = [ + ({ config, pkgs, ... }: { + nixpkgs.overlays = [ overlay-stable ]; + }) - config = { - environment.systemPackages = with pkgs; [ - btc-clients.packages.${pkgs.system}.bisq - btc-clients.packages.${pkgs.system}.bisq2 - btc-clients.packages.${pkgs.system}.sparrow - ]; + ./configuration.nix + nix-bitcoin.nixosModules.default + agenix.nixosModules.default + nixvim.nixosModules.nixvim + ]; - sovran_systemsOS.packages.bip110 = bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; - }; - }; - }; + config = { + environment.systemPackages = with pkgs; [ + btc-clients.packages.${pkgs.system}.bisq + btc-clients.packages.${pkgs.system}.bisq2 + btc-clients.packages.${pkgs.system}.sparrow + ]; + + sovran_systemsOS.packages.bip110 = bip110.packages.${pkgs.system}.bitcoind-knots-bip-110; + }; + }; + }; } diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix index a8969a6..416e872 100755 --- a/for_new_sovran_pros/flake.nix +++ b/for_new_sovran_pros/flake.nix @@ -10,11 +10,11 @@ outputs = { self, Sovran_Systems, ... }@inputs: { nixosConfigurations."nixos" = Sovran_Systems.inputs.nixpkgs.lib.nixosSystem { - - system = "x86_64-linux"; modules = [ + { nixpkgs.hostPlatform = "x86_64-linux"; } + ./hardware-configuration.nix ./custom.nix @@ -27,4 +27,4 @@ }; -} \ No newline at end of file +}