diff --git a/nixos/.github/workflows/build.yml b/nixos/.github/workflows/build.yml index 181c1c6..07e4b5f 100644 --- a/nixos/.github/workflows/build.yml +++ b/nixos/.github/workflows/build.yml @@ -12,4 +12,4 @@ jobs: - uses: DeterminateSystems/nix-installer-action@main - uses: DeterminateSystems/magic-nix-cache-action@main - run: ssh-keygen -t rsa -N '' -f ./id_rsa && git add id_rsa.pub - - run: nix build .#nixosConfigurations.nixos.config.system.build.toplevel + - run: nix build .#nixosConfigurations.mainframe.config.system.build.toplevel diff --git a/nixos/apply.sh b/nixos/apply.sh index 50a7953..04811c3 100755 --- a/nixos/apply.sh +++ b/nixos/apply.sh @@ -3,4 +3,4 @@ set -e git pull origin main -nixos-rebuild switch --flake .#nixos --verbose --show-trace +nixos-rebuild switch --flake .#mainframe --verbose --show-trace diff --git a/nixos/flake.nix b/nixos/flake.nix index caed697..752f75e 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -92,14 +92,13 @@ ++ modules; }; in { - nixosConfigurations.nixos = mkNixosConfiguration { + nixosConfigurations.mainframe = mkNixosConfiguration { hostname = "pw-mainframe"; username = "ironmagma"; args = { nixPkgs = import nixpkgs {inherit system overlays;}; }; modules = [ - disko.nixosModules.disko agenix.nixosModules.age ./hetzner.nix ./linux.nix diff --git a/nixos/hetzner.nix b/nixos/hetzner.nix index cbbf2f3..da3eef2 100644 --- a/nixos/hetzner.nix +++ b/nixos/hetzner.nix @@ -2,28 +2,29 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/profiles/qemu-guest.nix") - ./disk-config.nix ]; # Fixes iotop boot.kernel.sysctl = {"kernel.task_delayacct" = 1;}; boot.loader.grub = { - # no need to set devices, disko will add all devices that have a EF02 partition to the list already - # devices = [ ]; - efiSupport = true; - efiInstallAsRemovable = true; + enable = true; + device = "/dev/sda"; + efiSupport = false; + }; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/aaf104ce-4851-40d9-aeea-bebb5684f8c4"; + fsType = "ext4"; }; services.openssh = { enable = true; settings.PasswordAuthentication = true; - settings.UsePAM = false; settings.PermitRootLogin = "yes"; settings.AllowUsers = [ "root" ]; extraConfig = '' PrintLastLog no -UsePAM no ''; hostKeys = [ {