From c384f800b3e09f71e6a32baaa777d89be9acb30e Mon Sep 17 00:00:00 2001 From: catvayor Date: Thu, 12 Jun 2025 15:36:09 +0200 Subject: [PATCH] refactor(zulip01): remove disko dependencies --- .../nixos/zulip01/_hardware-configuration.nix | 29 ++++++++++----- machines/nixos/zulip01/disko.nix | 37 ------------------- 2 files changed, 20 insertions(+), 46 deletions(-) delete mode 100644 machines/nixos/zulip01/disko.nix diff --git a/machines/nixos/zulip01/_hardware-configuration.nix b/machines/nixos/zulip01/_hardware-configuration.nix index 54e1ab1..17cd11f 100644 --- a/machines/nixos/zulip01/_hardware-configuration.nix +++ b/machines/nixos/zulip01/_hardware-configuration.nix @@ -1,17 +1,10 @@ -# SPDX-FileCopyrightText: 2024 Tom Hubrecht -# -# SPDX-License-Identifier: EUPL-1.2 - # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ modulesPath, sources, ... }: - +{ modulesPath, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") - (sources.disko + "/module.nix") - ./disko.nix ]; boot = { @@ -19,8 +12,8 @@ availableKernelModules = [ "ata_piix" "uhci_hcd" - "ehci_pci" "virtio_pci" + "virtio_scsi" "sr_mod" "virtio_blk" ]; @@ -30,4 +23,22 @@ kernelModules = [ "kvm-intel" ]; extraModulePackages = [ ]; }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/179ba756-b0f0-42ec-b0b5-ab3daca97d3d"; + fsType = "ext4"; + }; + + "/boot" = { + device = "/dev/disk/by-uuid/0DB8-F2E0"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + }; + + swapDevices = [ ]; } diff --git a/machines/nixos/zulip01/disko.nix b/machines/nixos/zulip01/disko.nix deleted file mode 100644 index e549442..0000000 --- a/machines/nixos/zulip01/disko.nix +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-FileCopyrightText: 2024 Maurice Debray -# -# SPDX-License-Identifier: EUPL-1.2 - -_: { - disko.devices = { - disk = { - main = { - device = "/dev/sda"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - type = "EF00"; - size = "1G"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; -}