diff --git a/machines/vega/disko.nix b/machines/vega/disko.nix index 31fd5b6..9d7a10f 100644 --- a/machines/vega/disko.nix +++ b/machines/vega/disko.nix @@ -1,7 +1,7 @@ { lib, ... }: let hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}"; - os = "/dev/disk/by-id/mmc-CUTB42_0x9d59499c"; + os = "/dev/disk/by-id/mmc-CUTB42_0x95d14f9e"; vdev = [ "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5RYRG" "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5S02X" diff --git a/machines/vega/facter.json b/machines/vega/facter.json index 5ddaa36..b8bd941 100644 --- a/machines/vega/facter.json +++ b/machines/vega/facter.json @@ -23,8 +23,8 @@ }, "bluetooth": [ { - "index": 33, - "attached_to": 34, + "index": 31, + "attached_to": 33, "class_list": ["usb", "bluetooth"], "bus_type": { "hex": "0086", @@ -99,7 +99,7 @@ }, { "index": 36, - "attached_to": 34, + "attached_to": 33, "class_list": ["usb", "bluetooth"], "bus_type": { "hex": "0086", @@ -597,7 +597,7 @@ "fpu_exception": true, "cpuid_level": 32, "write_protect": false, - "tlb_size": 32767, + "tlb_size": 32764, "clflush_size": 64, "cache_alignment": 64, "address_sizes": { @@ -636,7 +636,7 @@ }, "device": { "hex": "0561", - "name": "0", + "name": "1", "value": 1377 }, "revision": { @@ -645,10 +645,10 @@ "value": 0 }, "serial": "000000004EBF", - "model": "0", + "model": "1", "sysfs_id": "/class/block/sdb", - "sysfs_bus_id": "1:0:0:0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:0", + "sysfs_bus_id": "1:0:0:1", + "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:1", "unix_device_name": "/dev/sdb", "unix_device_number": { "type": 98, @@ -657,10 +657,10 @@ "range": 16 }, "unix_device_names": [ - "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5RYRG", - "/dev/disk/by-id/usb-USB_3.0_Device_0_000000004EBF-0:0", - "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:0", - "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:0", + "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5S02X", + "/dev/disk/by-id/usb-USB_3.0_Device_1_000000004EBF-0:1", + "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:1", + "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:1", "/dev/sdb" ], "unix_device_name2": "/dev/sg1", @@ -706,7 +706,7 @@ "name": "Disk", "value": 0 }, - "serial": "0x9d59499c", + "serial": "0x95d14f9e", "model": "Disk", "sysfs_id": "/class/block/mmcblk0", "sysfs_bus_id": "mmc0:0001", @@ -719,7 +719,7 @@ "range": 32 }, "unix_device_names": [ - "/dev/disk/by-id/mmc-CUTB42_0x9d59499c", + "/dev/disk/by-id/mmc-CUTB42_0x95d14f9e", "/dev/mmcblk0" ], "resources": [ @@ -745,180 +745,6 @@ }, { "index": 29, - "attached_to": 25, - "class_list": ["disk", "block_device"], - "base_class": { - "hex": "0106", - "name": "Mass Storage Device", - "value": 262 - }, - "sub_class": { - "hex": "0000", - "name": "Disk", - "value": 0 - }, - "model": "Disk", - "sysfs_id": "/class/block/mmcblk0boot0", - "sysfs_bus_id": "mmcblk0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1a.0/mmc_host/mmc0/mmc0:0001/block/mmcblk0", - "unix_device_name": "/dev/mmcblk0boot0", - "unix_device_number": { - "type": 98, - "major": 179, - "minor": 32, - "range": 32 - }, - "unix_device_names": ["/dev/mmcblk0boot0"], - "resources": [ - { - "type": "disk_geo", - "cylinders": 128, - "heads": 4, - "sectors": 16, - "size": "0x0", - "geo_type": "logical" - }, - { - "type": "size", - "unit": "sectors", - "value_1": 8192, - "value_2": 512 - } - ], - "driver": "mmcblk", - "drivers": ["mmcblk"] - }, - { - "index": 30, - "attached_to": 22, - "class_list": ["disk", "usb", "scsi", "block_device"], - "bus_type": { - "hex": "0084", - "name": "SCSI", - "value": 132 - }, - "slot": { - "bus": 1, - "number": 0 - }, - "base_class": { - "hex": "0106", - "name": "Mass Storage Device", - "value": 262 - }, - "sub_class": { - "hex": "0000", - "name": "Disk", - "value": 0 - }, - "vendor": { - "hex": "152d", - "value": 5421 - }, - "device": { - "hex": "0561", - "name": "1", - "value": 1377 - }, - "revision": { - "hex": "0000", - "name": "~", - "value": 0 - }, - "serial": "000000004EBF", - "model": "1", - "sysfs_id": "/class/block/sdc", - "sysfs_bus_id": "1:0:0:1", - "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:1", - "unix_device_name": "/dev/sdc", - "unix_device_number": { - "type": 98, - "major": 8, - "minor": 32, - "range": 16 - }, - "unix_device_names": [ - "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5S02X", - "/dev/disk/by-id/usb-USB_3.0_Device_1_000000004EBF-0:1", - "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:1", - "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:1", - "/dev/sdc" - ], - "unix_device_name2": "/dev/sg2", - "unix_device_number2": { - "type": 99, - "major": 21, - "minor": 2, - "range": 1 - }, - "resources": [ - { - "type": "disk_geo", - "cylinders": 19074048, - "heads": 64, - "sectors": 32, - "size": "0x0", - "geo_type": "logical" - }, - { - "type": "size", - "unit": "sectors", - "value_1": 39063650304, - "value_2": 512 - } - ], - "driver": "uas", - "driver_module": "uas", - "drivers": ["sd", "uas"], - "driver_modules": ["sd_mod", "uas"] - }, - { - "index": 31, - "attached_to": 25, - "class_list": ["disk", "block_device"], - "base_class": { - "hex": "0106", - "name": "Mass Storage Device", - "value": 262 - }, - "sub_class": { - "hex": "0000", - "name": "Disk", - "value": 0 - }, - "model": "Disk", - "sysfs_id": "/class/block/mmcblk0boot1", - "sysfs_bus_id": "mmcblk0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1a.0/mmc_host/mmc0/mmc0:0001/block/mmcblk0", - "unix_device_name": "/dev/mmcblk0boot1", - "unix_device_number": { - "type": 98, - "major": 179, - "minor": 64, - "range": 32 - }, - "unix_device_names": ["/dev/mmcblk0boot1"], - "resources": [ - { - "type": "disk_geo", - "cylinders": 128, - "heads": 4, - "sectors": 16, - "size": "0x0", - "geo_type": "logical" - }, - { - "type": "size", - "unit": "sectors", - "value_1": 8192, - "value_2": 512 - } - ], - "driver": "mmcblk", - "drivers": ["mmcblk"] - }, - { - "index": 32, "attached_to": 22, "class_list": ["disk", "usb", "scsi", "block_device"], "bus_type": { @@ -957,27 +783,27 @@ }, "serial": "000000001532", "model": "Generic STORAGE DEVICE", - "sysfs_id": "/class/block/sda", + "sysfs_id": "/class/block/sdc", "sysfs_bus_id": "0:0:0:0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0/host0/target0:0:0/0:0:0:0", - "unix_device_name": "/dev/sda", + "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.0/host0/target0:0:0/0:0:0:0", + "unix_device_name": "/dev/sdc", "unix_device_number": { "type": 98, "major": 8, - "minor": 0, + "minor": 32, "range": 16 }, "unix_device_names": [ "/dev/disk/by-id/usb-Generic_STORAGE_DEVICE_000000001532-0:0", - "/dev/disk/by-path/pci-0000:00:14.0-usb-0:2:1.0-scsi-0:0:0:0", - "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:2:1.0-scsi-0:0:0:0", - "/dev/sda" + "/dev/disk/by-path/pci-0000:00:14.0-usb-0:1:1.0-scsi-0:0:0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:1:1.0-scsi-0:0:0:0", + "/dev/sdc" ], - "unix_device_name2": "/dev/sg0", + "unix_device_name2": "/dev/sg2", "unix_device_number2": { "type": 99, "major": 21, - "minor": 0, + "minor": 2, "range": 1 }, "resources": [ @@ -1009,6 +835,90 @@ "drivers": ["sd", "usb-storage"], "driver_modules": ["sd_mod", "usb_storage"], "module_alias": "usb:v05E3p0749d1532dc00dsc00dp00ic08isc06ip50in00" + }, + { + "index": 30, + "attached_to": 22, + "class_list": ["disk", "usb", "scsi", "block_device"], + "bus_type": { + "hex": "0084", + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 1, + "number": 0 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "152d", + "value": 5421 + }, + "device": { + "hex": "0561", + "name": "0", + "value": 1377 + }, + "revision": { + "hex": "0000", + "name": "~", + "value": 0 + }, + "serial": "000000004EBF", + "model": "0", + "sysfs_id": "/class/block/sda", + "sysfs_bus_id": "1:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host1/target1:0:0/1:0:0:0", + "unix_device_name": "/dev/sda", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 0, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYD5RYRG", + "/dev/disk/by-id/usb-USB_3.0_Device_0_000000004EBF-0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:0", + "/dev/sda" + ], + "unix_device_name2": "/dev/sg0", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 0, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 19074048, + "heads": 64, + "sectors": 32, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 39063650304, + "value_2": 512 + } + ], + "driver": "uas", + "driver_module": "uas", + "drivers": ["sd", "uas"], + "driver_modules": ["sd_mod", "uas"] } ], "graphics_card": [ @@ -1118,7 +1028,7 @@ ], "hub": [ { - "index": 34, + "index": 33, "attached_to": 22, "class_list": ["usb", "hub"], "bus_type": { @@ -1268,7 +1178,7 @@ "module_alias": "usb:v1D6Bp0003d0615dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 39, + "index": 38, "attached_to": 9, "class_list": ["usb", "hub"], "bus_type": { @@ -1348,7 +1258,7 @@ "module_alias": "usb:v1D6Bp0002d0615dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 41, + "index": 40, "attached_to": 9, "class_list": ["usb", "hub"], "bus_type": { @@ -1420,8 +1330,8 @@ ], "keyboard": [ { - "index": 38, - "attached_to": 34, + "index": 39, + "attached_to": 33, "class_list": ["keyboard", "usb"], "bus_type": { "hex": "0086", @@ -1458,8 +1368,8 @@ "value": 0 }, "model": "Logitech USB Receiver", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-5/3-5:1.0", - "sysfs_bus_id": "3-5:1.0", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0", + "sysfs_bus_id": "3-2:1.0", "resources": [ { "type": "baud", @@ -1529,7 +1439,7 @@ { "type": "mem", "base": 0, - "range": 8096096256, + "range": 8097124352, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -1718,8 +1628,8 @@ ], "mouse": [ { - "index": 42, - "attached_to": 34, + "index": 32, + "attached_to": 33, "class_list": ["mouse", "usb"], "bus_type": { "hex": "0086", @@ -1758,8 +1668,8 @@ "compat_vendor": "Unknown", "compat_device": "Generic USB Mouse", "model": "Logitech USB Receiver", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-5/3-5:1.1", - "sysfs_bus_id": "3-5:1.1", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.1", + "sysfs_bus_id": "3-2:1.1", "resources": [ { "type": "baud", @@ -1964,7 +1874,7 @@ "resources": [ { "type": "hwaddr", - "address": 48 + "address": 54 }, { "type": "io", @@ -1989,7 +1899,7 @@ }, { "type": "phwaddr", - "address": 54 + "address": 53 }, { "type": "wlan", @@ -2082,8 +1992,8 @@ ], "network_interface": [ { - "index": 43, - "attached_to": 13, + "index": 41, + "attached_to": 0, "class_list": ["network_interface"], "base_class": { "hex": "0107", @@ -2091,32 +2001,17 @@ "value": 263 }, "sub_class": { - "hex": "000a", - "name": "WLAN", - "value": 10 + "hex": "0000", + "name": "Loopback", + "value": 0 }, - "model": "WLAN network interface", - "sysfs_id": "/class/net/wlan0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0", - "unix_device_name": "wlan0", - "unix_device_names": ["wlan0"], - "resources": [ - { - "type": "hwaddr", - "address": 48 - }, - { - "type": "phwaddr", - "address": 54 - } - ], - "driver": "rtw89_8852be", - "driver_module": "rtw89_8852be", - "drivers": ["rtw89_8852be"], - "driver_modules": ["rtw89_8852be"] + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": ["lo"] }, { - "index": 44, + "index": 42, "attached_to": 11, "class_list": ["network_interface"], "base_class": { @@ -2150,8 +2045,8 @@ "driver_modules": ["igc"] }, { - "index": 45, - "attached_to": 0, + "index": 43, + "attached_to": 13, "class_list": ["network_interface"], "base_class": { "hex": "0107", @@ -2159,14 +2054,29 @@ "value": 263 }, "sub_class": { - "hex": "0000", - "name": "Loopback", - "value": 0 + "hex": "000a", + "name": "WLAN", + "value": 10 }, - "model": "Loopback network interface", - "sysfs_id": "/class/net/lo", - "unix_device_name": "lo", - "unix_device_names": ["lo"] + "model": "WLAN network interface", + "sysfs_id": "/class/net/wlan0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0", + "unix_device_name": "wlan0", + "unix_device_names": ["wlan0"], + "resources": [ + { + "type": "hwaddr", + "address": 54 + }, + { + "type": "phwaddr", + "address": 53 + } + ], + "driver": "rtw89_8852be", + "driver_module": "rtw89_8852be", + "drivers": ["rtw89_8852be"], + "driver_modules": ["rtw89_8852be"] } ], "pci": [