diff --git a/configuration.nix b/configuration.nix index 3e5dfa4..1c4f7bd 100644 --- a/configuration.nix +++ b/configuration.nix @@ -176,6 +176,7 @@ in gnome.zenity libargon2 gnome.gnome-terminal + libreoffice-fresh ]; diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh index eb292d0..5430209 100644 --- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh +++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh @@ -16,7 +16,11 @@ rm -rf /home/free/Downloads/sovran-pro-flake-update.sh #### SCRIPT 2 #### +/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/add-custom-nix.sh" +/run/current-system/sw/bin/bash /home/free/Downloads/add-custom-nix.sh + +rm -rf /home/free/Downloads/add-custom.nix.sh #### REMOVAL OF MAIN SCRIPT #### diff --git a/file_fixes_and_new_services/add-custom-nix.sh b/file_fixes_and_new_services/add-custom-nix.sh new file mode 100644 index 0000000..2001864 --- /dev/null +++ b/file_fixes_and_new_services/add-custom-nix.sh @@ -0,0 +1,82 @@ +#!/usr/bin/env bash + +function log_console () { + echo "`date` :: $1" >> /var/lib/beacons/awesome.log + echo $1 +} + + +#### CHECK TO SEE IF IT HAS BEEN RUN BEFORE #### + +FILE=/var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed + + if [ -e $FILE ]; then + + /run/current-system/sw/bin/echo "File Found :), No Need to Run ... Exiting" + + exit 1 + + fi + + +#### CREATE INITIAL TAG #### + +/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/add-custom-nix ; touch /var/lib/beacons/file_fixes_and_new_services/add-custom-nix/started + + if [[ $? != 0 ]]; then + + /run/current-system/sw/bin/echo "Could Not Create Initial Tag" + + exit 1 + + fi + + +#### MAIN SCRIPT #### + +/run/current-system/sw/bin/cat > /etc/nixos/custom.nix <<- "EOF" + +{config, pkgs, lib, ...}: + +/* +Add custom NixOS modules here. +/* +let + personalization = import ./personalization.nix; + + in +{ + + + +} + +*\ + +EOF + + + if [[ $? != 0 ]]; then + + /run/current-system/sw/bin/echo "Could Not Run add-custom-nix" + + exit 1 + + fi + + + +#### CREATE COMPELETE TAG #### + +/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/add-custom-nix/completed + + if [[ $? != 0 ]]; then + + /run/current-system/sw/bin/echo "Could Not Create Completed Tag" + + exit 1 + + fi + + +exit 0 \ No newline at end of file diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix index 3fb698f..a8969a6 100644 --- a/for_new_sovran_pros/flake.nix +++ b/for_new_sovran_pros/flake.nix @@ -17,6 +17,8 @@ ./hardware-configuration.nix + ./custom.nix + Sovran_Systems.nixosModules.Sovran_SystemsOS ]; diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix index 0f8e45d..60df100 100644 --- a/modules/bitcoinecosystem.nix +++ b/modules/bitcoinecosystem.nix @@ -72,5 +72,7 @@ enable = true; name = "free"; }; + + nix-bitcoin.useVersionLockedPkgs = true; } diff --git a/modules/modules.nix b/modules/modules.nix index 37c1184..0a56366 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -8,7 +8,6 @@ ./coturn.nix ./bitcoinecosystem.nix ./vaultwarden.nix - ./onlyoffice.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix ];