diff --git a/build04/configuration.nix b/build04/configuration.nix index 38bc17c..e7d9a97 100644 --- a/build04/configuration.nix +++ b/build04/configuration.nix @@ -36,5 +36,5 @@ # nix run github:numtide/nixos-anywhere#nixos-anywhere -- \ # --debug \ # --kexec "$(nix build --print-out-paths github:nix-community/nixos-images#packages.aarch64-linux.kexec-installer-nixos-unstable)/nixos-kexec-installer-aarch64-linux.tar.gz" \ -# --flake '.#build04.nix-community.org' \ +# --flake '.#build04' \ # opc@141.148.235.248 diff --git a/ci.nix b/ci.nix index 325b62f..cb6a8c4 100644 --- a/ci.nix +++ b/ci.nix @@ -5,7 +5,6 @@ let self = builtins.getFlake (toString ./.); inherit (self.inputs.nixpkgs) lib; - stripDomain = name: lib.head (builtins.match "(.*).nix-community.org" name); effects = self.inputs.hercules-ci-effects.lib.withPkgs self.inputs.nixpkgs.legacyPackages.x86_64-linux; terraform-deploy = @@ -32,7 +31,7 @@ let ''; }); in -(lib.mapAttrs' (name: config: lib.nameValuePair "nixos-${stripDomain name}" config.config.system.build.toplevel) self.outputs.nixosConfigurations) // +(lib.mapAttrs' (name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) self.outputs.nixosConfigurations) // { # FIXME: maybe find a more generic solution here? devShell-x86_64 = self.outputs.devShells.x86_64-linux.default; diff --git a/flake.nix b/flake.nix index c801d9c..8df0b1b 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ ]; in { - "build01.nix-community.org" = nixosSystem { + build01 = nixosSystem { system = "x86_64-linux"; modules = common @@ -87,7 +87,7 @@ ]; }; - "build02.nix-community.org" = nixosSystem { + build02 = nixosSystem { system = "x86_64-linux"; modules = common @@ -106,7 +106,7 @@ ]; }; - "build03.nix-community.org" = nixosSystem { + build03 = nixosSystem { system = "x86_64-linux"; modules = common @@ -120,7 +120,7 @@ ]; }; - "build04.nix-community.org" = nixosSystem { + build04 = nixosSystem { system = "aarch64-linux"; modules = common diff --git a/roles/common.nix b/roles/common.nix index b3b43ce..102c353 100644 --- a/roles/common.nix +++ b/roles/common.nix @@ -1,5 +1,3 @@ -{ lib, config, ... }: - { imports = [ ./auto-upgrade.nix @@ -27,11 +25,4 @@ documentation.enable = false; networking.domain = "nix-community.org"; - - # HACK: NixOS does not let us using a hostname that has the domain part included include domain part in hostname - boot.kernel.sysctl."kernel.hostname" = config.networking.fqdn; - - # don't override host set by sysctl - system.activationScripts.hostname = lib.mkForce ""; - system.activationScripts.domain = lib.mkForce ""; }