diff --git a/configuration.nix b/configuration.nix index 1cc21ea..474e8e7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ let - personalization = import ./personalization.nix; + personalization = import ./modules/personalization.nix; custom-php = pkgs.php81.buildEnv { diff --git a/flake.nix b/flake.nix index 33e4b2c..42e1c6c 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,8 @@ ./configuration.nix + (nixpkgs + "/etc/nixos/hardware-configuration.nix") + nix-bitcoin.nixosModules.default agenix.nixosModules.default diff --git a/for_new_sovran_pros/flake.nix b/for_new_sovran_pros/flake.nix index 954d097..aa77d3a 100644 --- a/for_new_sovran_pros/flake.nix +++ b/for_new_sovran_pros/flake.nix @@ -13,20 +13,7 @@ system = "x86_64-linux"; - modules = [ - - (nixpkgs + " - - /etc/nixos/hardware-configuration.nix - - ./modules/bitcoinecosystem.nix - - - ") - - Sovran_Systems.nixosModules.Sovran_SystemsOS - - ]; + modules = [ Sovran_Systems.nixosModules.Sovran_SystemsOS ]; }; diff --git a/modules/modules.nix b/modules/modules.nix index 4333745..37c1184 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -9,7 +9,6 @@ ./bitcoinecosystem.nix ./vaultwarden.nix ./onlyoffice.nix - ./personalization.nix ./Sovran_SystemsOS_File_Fixes_And_New_Services.nix ];