diff --git a/flake.nix b/flake.nix index e433a3e8..81326255 100644 --- a/flake.nix +++ b/flake.nix @@ -86,9 +86,7 @@ tx5.url = "github:holochain/tx5/tx5-signal-srv-v0.0.8-alpha"; tx5.flake = false; - sbd.url = - "github:holochain/sbd/sbd-server-v0.0.4-alpha" - ; + sbd.url = "github:holochain/sbd/sbd-server-v0.0.4-alpha"; sbd.flake = false; holochain-versions.url = "github:holochain/holochain?dir=versions/weekly"; @@ -147,7 +145,6 @@ nomadCaCert = ./secrets/nomad/admin/nomad-agent-ca.pem; nomadClientCert = ./secrets/nomad/cli/global-cli-nomad.pem; - pkgsUnstable = inputs'.nixpkgsUnstable.legacyPackages; pkgsPulumi = inputs'.nixpkgsPulumi.legacyPackages; in @@ -193,10 +190,11 @@ pkgs.jq pkgsPulumi.pulumictl - (pkgsPulumi.pulumi.withPackages(pulumiPackages: with pulumiPackages; [ - pulumi-language-go - pulumi-command - ])) + (pkgsPulumi.pulumi.withPackages (pulumiPackages: + with pulumiPackages; [ + pulumi-language-go + pulumi-command + ])) pkgs.go_1_21 ] ++ ( diff --git a/modules/flake-parts/apps.deploy-/linux.nix b/modules/flake-parts/apps.deploy-/linux.nix index b302be05..f54a2978 100644 --- a/modules/flake-parts/apps.deploy-/linux.nix +++ b/modules/flake-parts/apps.deploy-/linux.nix @@ -51,7 +51,6 @@ ssh root@${hostName} "$closure_path/bin/switch-to-configuration ''${1:-switch}" ''; - mkLinuxDeployDirectApp = attrName: config: lib.nameValuePair "deploy-direct-${attrName}" { type = "app"; @@ -62,9 +61,8 @@ }; in { config.apps = - (lib.mapAttrs' mkLinuxDeployApp self.nixosConfigurations) // - (lib.mapAttrs' mkLinuxDeployDirectApp self.nixosConfigurations) // - {} - ; + (lib.mapAttrs' mkLinuxDeployApp self.nixosConfigurations) + // (lib.mapAttrs' mkLinuxDeployDirectApp self.nixosConfigurations) + // {}; }; } diff --git a/modules/flake-parts/nixosConfigurations.tfgrid-devnet-vm0/configuration.nix b/modules/flake-parts/nixosConfigurations.tfgrid-devnet-vm0/configuration.nix index 618a5b91..de2af389 100644 --- a/modules/flake-parts/nixosConfigurations.tfgrid-devnet-vm0/configuration.nix +++ b/modules/flake-parts/nixosConfigurations.tfgrid-devnet-vm0/configuration.nix @@ -8,7 +8,6 @@ }: let hostName = "tfgrid-devnet-vm0"; in { - imports = [ ../nixosConfigurations.tfgrid-base/configuration.nix diff --git a/modules/flake-parts/nixosConfigurations.tfgrid-hpos-base/configuration.nix b/modules/flake-parts/nixosConfigurations.tfgrid-hpos-base/configuration.nix index 877da236..67dd384d 100644 --- a/modules/flake-parts/nixosConfigurations.tfgrid-hpos-base/configuration.nix +++ b/modules/flake-parts/nixosConfigurations.tfgrid-hpos-base/configuration.nix @@ -8,7 +8,6 @@ }: let hostName = "tfgrid-hpos-base"; in { - imports = [ ../nixosConfigurations.tfgrid-base/configuration.nix diff --git a/modules/flake-parts/nixosConfigurations.tfgrid-hpos-base/default.nix b/modules/flake-parts/nixosConfigurations.tfgrid-hpos-base/default.nix index 5263b9f6..3e9c93cd 100644 --- a/modules/flake-parts/nixosConfigurations.tfgrid-hpos-base/default.nix +++ b/modules/flake-parts/nixosConfigurations.tfgrid-hpos-base/default.nix @@ -7,7 +7,7 @@ flake.nixosConfigurations.tfgrid-hpos-base = inputs.nixpkgs.lib.nixosSystem { modules = [ ./configuration.nix - ]; + ]; system = "x86_64-linux"; specialArgs = self.specialArgs; }; diff --git a/modules/flake-parts/nixosConfigurations.tfgrid-hpos/configuration.nix b/modules/flake-parts/nixosConfigurations.tfgrid-hpos/configuration.nix index 0634a1a9..ac137c35 100644 --- a/modules/flake-parts/nixosConfigurations.tfgrid-hpos/configuration.nix +++ b/modules/flake-parts/nixosConfigurations.tfgrid-hpos/configuration.nix @@ -8,7 +8,6 @@ }: let hostName = "tfgrid-hpos-base"; in { - imports = [ ../nixosConfigurations.tfgrid-hpos-base/configuration.nix diff --git a/modules/flake-parts/nixosConfigurations.tfgrid-hpos/default.nix b/modules/flake-parts/nixosConfigurations.tfgrid-hpos/default.nix index d34d304b..3b9dc74d 100644 --- a/modules/flake-parts/nixosConfigurations.tfgrid-hpos/default.nix +++ b/modules/flake-parts/nixosConfigurations.tfgrid-hpos/default.nix @@ -7,7 +7,7 @@ flake.nixosConfigurations.tfgrid-hpos = inputs.nixpkgs.lib.nixosSystem { modules = [ ./configuration.nix - ]; + ]; system = "x86_64-linux"; specialArgs = self.specialArgs; };