no diskoConfirations outputs

This commit is contained in:
William 2025-11-03 21:37:03 -03:00
parent f5f1541aec
commit d6f582fffd
7 changed files with 14 additions and 37 deletions

View file

@ -1,12 +0,0 @@
{ inputs, ... }:
{
imports = [
inputs.disko.flakeModule
];
flake.diskoConfigurations = {
io.modules = [ ./disko/io.nix ];
trantor.modules = [ ./disko/trantor.nix ];
};
}

View file

@ -62,7 +62,6 @@
imports = [ imports = [
./deploy.nix ./deploy.nix
./devShells.nix ./devShells.nix
./diskoConfigurations.nix
./homeConfigurations.nix ./homeConfigurations.nix
./nixosConfigurations.nix ./nixosConfigurations.nix
./nixosModules.nix ./nixosModules.nix

View file

@ -7,9 +7,7 @@
}: }:
{ {
imports = [ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
(modulesPath + "/installer/scan/not-detected.nix")
] ++ inputs.self.diskoConfigurations.io.modules;
boot = { boot = {
initrd = { initrd = {

View file

@ -10,7 +10,7 @@
enable = true; enable = true;
rootDevice = rootDevice =
if config.networking.hostName == "trantor" then if config.networking.hostName == "trantor" then
"/dev/disk/by-id/scsi-36067d367fe184830a89bbe708c7b1066" "/dev/disk/by-id/scsi-360b207ed25d84372a95d1ecf842f8e20-part2"
else else
"/dev/mapper/cryptroot"; "/dev/mapper/cryptroot";
rootSubvolume = "@root"; rootSubvolume = "@root";

View file

@ -1,7 +1,11 @@
{ inputs, ... }:
{ {
imports = [ inputs.disko.nixosModules.default ];
disko.devices.disk.main = { disko.devices.disk.main = {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/scsi-36067d367fe184830a89bbe708c7b1066"; device = "/dev/disk/by-id/scsi-360b207ed25d84372a95d1ecf842f8e20";
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {

View file

@ -1,30 +1,18 @@
{ {
lib, lib,
modulesPath, modulesPath,
inputs,
... ...
}: }:
{ {
imports = [ imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
(modulesPath + "/profiles/qemu-guest.nix")
inputs.disko.nixosModules.disko
]
++ inputs.self.diskoConfigurations.trantor.modules;
boot = { boot.initrd.availableKernelModules = [
kernelModules = [ ]; "xhci_pci"
extraModulePackages = [ ]; "virtio_pci"
initrd = { "virtio_scsi"
availableKernelModules = [ "usbhid"
"xhci_pci" ];
"virtio_pci"
"virtio_scsi"
"usbhid"
];
kernelModules = [ ];
};
};
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;