diff --git a/flake.lock b/flake.lock
index aa31c45..b07e465 100644
--- a/flake.lock
+++ b/flake.lock
@@ -692,11 +692,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1787092242,
-        "narHash": "sha256-Xv0pguwNvT+gbnR5pMsR9RULuAmP0GMtTNd1eHkLoBQ=",
-        "rev": "3470ce4d506416a1d70f6d3efec454e768aaae58",
+        "lastModified": 1787157981,
+        "narHash": "sha256-VH4Svgdabm6X5+NSK7Gg0wzZrE83sGCtg5+uLbVkskI=",
+        "rev": "1d670e56039f1bf20111b3830b346dd6f3cfce2b",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3470ce4d506416a1d70f6d3efec454e768aaae58.tar.gz?rev=3470ce4d506416a1d70f6d3efec454e768aaae58"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1d670e56039f1bf20111b3830b346dd6f3cfce2b.tar.gz?rev=1d670e56039f1bf20111b3830b346dd6f3cfce2b"
       },
       "original": {
         "type": "tarball",
diff --git a/hosts/angus/disk-config.nix b/hosts/angus/disk-config.nix
index 56cf1e3..1d2520a 100644
--- a/hosts/angus/disk-config.nix
+++ b/hosts/angus/disk-config.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 {
   disko.devices.disk =
-    lib.genAttrs [ "ata-VK000240GWSRQ_S44HNA0M504508" "ata-VK000240GWSRQ_S4N9NA0N420738" ]
+    lib.genAttrs [ "ata-SAMSUNG_MZ7LM960HMJP-00003_S3LHNX0J709833" "ata-SAMSUNG_MZ7LM960HMJP-00003_S3LHNX0K503986" ]
       (name: {
         type = "disk";
         device = "/dev/disk/by-id/${name}";
@@ -13,7 +13,7 @@
               type = "EF02"; # for grub MBR
             };
             ESP = {
-              size = "500M";
+              size = "8G";
               type = "EF00";
               content = {
                 type = "mdraid";
diff --git a/hosts/angus/facter.json b/hosts/angus/facter.json
index 1ce7c77..d075dc2 100644
--- a/hosts/angus/facter.json
+++ b/hosts/angus/facter.json
@@ -3,8 +3,7 @@
   "system": "x86_64-linux",
   "virtualisation": "none",
   "uefi": {
-    "supported": true,
-    "platform_size": 64
+    "supported": false
   },
   "hardware": {
     "bios": {
@@ -22,7 +21,7 @@
       "pnp": true,
       "pnp_id": 0,
       "lba_support": false,
-      "low_memory_size": 653312,
+      "low_memory_size": 642048,
       "smbios_version": 520
     },
     "bridge": [
@@ -637,6 +636,93 @@
         "module_alias": "pci:v00001912d0000001Dsv00001912sd0000001Dbc06sc04i00"
       }
     ],
+    "cdrom": [
+      {
+        "index": 34,
+        "attached_to": 28,
+        "class_list": [
+          "cdrom",
+          "usb",
+          "scsi",
+          "block_device"
+        ],
+        "bus_type": {
+          "hex": "0084",
+          "name": "SCSI",
+          "value": 132
+        },
+        "slot": {
+          "bus": 6,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0002",
+          "name": "CD-ROM",
+          "value": 2
+        },
+        "pci_interface": {
+          "hex": "0003",
+          "name": "DVD",
+          "value": 3
+        },
+        "vendor": {
+          "hex": "0624",
+          "name": "iDRAC",
+          "value": 1572
+        },
+        "device": {
+          "hex": "0251",
+          "name": "Virtual CD",
+          "value": 593
+        },
+        "revision": {
+          "hex": "0000",
+          "name": "0329",
+          "value": 0
+        },
+        "serial": "20120731-1",
+        "model": "iDRAC Virtual CD",
+        "sysfs_id": "/class/block/sr0",
+        "sysfs_bus_id": "6:0:0:0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb1/1-3/1-3.4/1-3.4:1.0/host6/target6:0:0/6:0:0:0",
+        "unix_device_names": [
+          "/dev/cdrom",
+          "/dev/disk/by-id/usb-iDRAC_Virtual_CD_20120731-1-0:0",
+          "/dev/disk/by-label/nixos-minimal-26.05-x86_64",
+          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3.4:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:3.4:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-uuid/1980-01-01-00-00-00-00",
+          "/dev/sr0"
+        ],
+        "unix_device_name2": "/dev/sg0",
+        "resources": [
+          {
+            "type": "baud",
+            "speed": 480000000,
+            "bits": 0,
+            "stop_bits": 0,
+            "parity": 0,
+            "handshake": 0
+          }
+        ],
+        "driver": "usb-storage",
+        "driver_module": "usb_storage",
+        "drivers": [
+          "sr",
+          "usb-storage"
+        ],
+        "driver_modules": [
+          "sr_mod",
+          "usb_storage"
+        ],
+        "module_alias": "usb:v0624p0251d0000dc00dsc00dp00ic08isc06ip50in00"
+      }
+    ],
     "cpu": [
       {
         "architecture": "x86_64",
@@ -794,7 +880,7 @@
         "fpu_exception": false,
         "cpuid_level": 22,
         "write_protect": false,
-        "tlb_size": 32698,
+        "tlb_size": 30825,
         "clflush_size": 64,
         "cache_alignment": 64,
         "address_sizes": {
@@ -831,31 +917,36 @@
           "name": "Disk",
           "value": 0
         },
+        "vendor": {
+          "hex": "0000",
+          "name": "SAMSUNG",
+          "value": 0
+        },
         "device": {
           "hex": "0000",
-          "name": "VK000240GWSRQ",
+          "name": "MZ7LM960",
           "value": 0
         },
         "revision": {
           "hex": "0000",
-          "name": "HPG2",
+          "name": "0F3Q",
           "value": 0
         },
-        "serial": "S4N9NA0N420738",
-        "model": "VK000240GWSRQ",
+        "serial": "S3LHNX0J709833",
+        "model": "SAMSUNG MZ7LM960",
         "sysfs_id": "/class/block/sdb",
         "sysfs_bus_id": "7:0:4:0",
         "sysfs_device_link": "/devices/pci0000:00/0000:00:01.0/0000:01:00.0/host7/target7:0:4/7:0:4:0",
         "unix_device_names": [
-          "/dev/disk/by-id/ata-VK000240GWSRQ_S4N9NA0N420738",
-          "/dev/disk/by-id/wwn-0x5002538e0042a07d",
+          "/dev/disk/by-id/ata-SAMSUNG_MZ7LM960HMJP-00003_S3LHNX0J709833",
+          "/dev/disk/by-id/wwn-0x5002538c4070c4bd",
           "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:4:0",
           "/dev/sdb"
         ],
         "resources": [
           {
             "type": "disk_geo",
-            "cylinders": 29185,
+            "cylinders": 116737,
             "heads": 255,
             "sectors": 63,
             "size": "0x0",
@@ -864,7 +955,7 @@
           {
             "type": "size",
             "unit": "sectors",
-            "value_1": 468862128,
+            "value_1": 1875385008,
             "value_2": 512
           }
         ],
@@ -880,7 +971,7 @@
         ]
       },
       {
-        "index": 34,
+        "index": 35,
         "attached_to": 15,
         "class_list": [
           "disk",
@@ -906,31 +997,36 @@
           "name": "Disk",
           "value": 0
         },
+        "vendor": {
+          "hex": "0000",
+          "name": "SAMSUNG",
+          "value": 0
+        },
         "device": {
           "hex": "0000",
-          "name": "VK000240GWSRQ",
+          "name": "MZ7LM960",
           "value": 0
         },
         "revision": {
           "hex": "0000",
-          "name": "HPG1",
+          "name": "0F3Q",
           "value": 0
         },
-        "serial": "S44HNA0M504508",
-        "model": "VK000240GWSRQ",
+        "serial": "S3LHNX0K503986",
+        "model": "SAMSUNG MZ7LM960",
         "sysfs_id": "/class/block/sdc",
         "sysfs_bus_id": "7:0:5:0",
         "sysfs_device_link": "/devices/pci0000:00/0000:00:01.0/0000:01:00.0/host7/target7:0:5/7:0:5:0",
         "unix_device_names": [
-          "/dev/disk/by-id/ata-VK000240GWSRQ_S44HNA0M504508",
-          "/dev/disk/by-id/wwn-0x5002538e0017ee8a",
+          "/dev/disk/by-id/ata-SAMSUNG_MZ7LM960HMJP-00003_S3LHNX0K503986",
+          "/dev/disk/by-id/wwn-0x5002538c40a4fac3",
           "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:5:0",
           "/dev/sdc"
         ],
         "resources": [
           {
             "type": "disk_geo",
-            "cylinders": 29185,
+            "cylinders": 116737,
             "heads": 255,
             "sectors": 63,
             "size": "0x0",
@@ -939,7 +1035,7 @@
           {
             "type": "size",
             "unit": "sectors",
-            "value_1": 468862128,
+            "value_1": 1875385008,
             "value_2": 512
           }
         ],
@@ -955,7 +1051,7 @@
         ]
       },
       {
-        "index": 35,
+        "index": 36,
         "attached_to": 28,
         "class_list": [
           "disk",
@@ -983,54 +1079,39 @@
           "value": 0
         },
         "vendor": {
-          "hex": "346d",
-          "name": "VendorCo",
-          "value": 13421
+          "hex": "0624",
+          "name": "iDRAC",
+          "value": 1572
         },
         "device": {
-          "hex": "5678",
-          "name": "ProductCode",
-          "value": 22136
+          "hex": "0251",
+          "name": "Virtual Floppy",
+          "value": 593
         },
         "revision": {
           "hex": "0000",
-          "name": "2.00",
+          "name": "0329",
           "value": 0
         },
-        "serial": "4002181202000771195",
-        "model": "VendorCo ProductCode",
+        "model": "iDRAC Virtual Floppy",
         "sysfs_id": "/class/block/sda",
-        "sysfs_bus_id": "6:0:0:0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb1/1-9/1-9:1.0/host6/target6:0:0/6:0:0:0",
+        "sysfs_bus_id": "6:0:0:1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb1/1-3/1-3.4/1-3.4:1.0/host6/target6:0:0/6:0:0:1",
         "unix_device_names": [
-          "/dev/disk/by-id/usb-VendorCo_ProductCode_4002181202000771195-0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:9:1.0-scsi-0:0:0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:9:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-id/usb-iDRAC_Virtual_Floppy_20120731-1-0:1",
+          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3.4:1.0-scsi-0:0:0:1",
+          "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:3.4:1.0-scsi-0:0:0:1",
           "/dev/sda"
         ],
-        "unix_device_name2": "/dev/sg0",
+        "unix_device_name2": "/dev/sg1",
         "resources": [
-          {
-            "type": "baud",
-            "speed": 480000000,
-            "bits": 0,
-            "stop_bits": 0,
-            "parity": 0,
-            "handshake": 0
-          },
           {
             "type": "disk_geo",
-            "cylinders": 60000,
-            "heads": 64,
-            "sectors": 32,
+            "cylinders": 1024,
+            "heads": 0,
+            "sectors": 62,
             "size": "0x0",
             "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 122880000,
-            "value_2": 512
           }
         ],
         "driver": "usb-storage",
@@ -1042,8 +1123,7 @@
         "driver_modules": [
           "sd_mod",
           "usb_storage"
-        ],
-        "module_alias": "usb:v346Dp5678d0200dc00dsc00dp00ic08isc06ip50in00"
+        ]
       }
     ],
     "graphics_card": [
@@ -1123,8 +1203,8 @@
     ],
     "hub": [
       {
-        "index": 38,
-        "attached_to": 39,
+        "index": 39,
+        "attached_to": 40,
         "class_list": [
           "usb",
           "hub"
@@ -1205,7 +1285,7 @@
         "module_alias": "usb:v413CpA001d0000dc09dsc00dp00ic09isc00ip00in00"
       },
       {
-        "index": 39,
+        "index": 40,
         "attached_to": 28,
         "class_list": [
           "usb",
@@ -1227,7 +1307,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.18.19 xhci-hcd",
+          "name": "Linux 6.18.44 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1241,7 +1321,7 @@
           "value": 0
         },
         "serial": "0000:00:14.0",
-        "model": "Linux 6.18.19 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.18.44 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-0:1.0",
         "sysfs_bus_id": "1-0:1.0",
         "resources": [
@@ -1292,7 +1372,7 @@
         "module_alias": "usb:v1D6Bp0002d0618dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 41,
+        "index": 44,
         "attached_to": 28,
         "class_list": [
           "usb",
@@ -1314,7 +1394,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.18.19 xhci-hcd",
+          "name": "Linux 6.18.44 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1328,7 +1408,7 @@
           "value": 0
         },
         "serial": "0000:00:14.0",
-        "model": "Linux 6.18.19 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.18.44 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb2/2-0:1.0",
         "sysfs_bus_id": "2-0:1.0",
         "detail": {
@@ -1371,8 +1451,8 @@
     ],
     "keyboard": [
       {
-        "index": 37,
-        "attached_to": 39,
+        "index": 41,
+        "attached_to": 40,
         "class_list": [
           "keyboard",
           "usb"
@@ -1397,27 +1477,27 @@
           "value": 0
         },
         "vendor": {
-          "hex": "1a2c",
-          "name": "SEM",
-          "value": 6700
+          "hex": "413c",
+          "name": "Primax",
+          "value": 16700
         },
         "device": {
-          "hex": "0b2a",
-          "name": "USB Keyboard",
-          "value": 2858
+          "hex": "2113",
+          "name": "Dell KB216 Wired Keyboard",
+          "value": 8467
         },
         "revision": {
           "hex": "0000",
-          "name": "1.10",
+          "name": "1.13",
           "value": 0
         },
-        "model": "SEM USB Keyboard",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-11/1-11:1.0",
-        "sysfs_bus_id": "1-11:1.0",
+        "model": "Primax Dell KB216 Wired Keyboard",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-4/1-4:1.0",
+        "sysfs_bus_id": "1-4:1.0",
         "unix_device_names": [
-          "/dev/input/by-id/usb-SEM_USB_Keyboard-event-kbd",
-          "/dev/input/by-path/pci-0000:00:14.0-usb-0:11:1.0-event-kbd",
-          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:11:1.0-event-kbd",
+          "/dev/input/by-id/usb-Primax_Dell_KB216_Wired_Keyboard-event-kbd",
+          "/dev/input/by-path/pci-0000:00:14.0-usb-0:4:1.0-event-kbd",
+          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:4:1.0-event-kbd",
           "/dev/input/event0"
         ],
         "resources": [
@@ -1470,7 +1550,105 @@
           "xkb_rules": "xfree86",
           "xkb_model": "pc104"
         },
-        "module_alias": "usb:v1A2Cp0B2Ad0110dc00dsc00dp00ic03isc01ip01in00"
+        "module_alias": "usb:v413Cp2113d0113dc00dsc00dp00ic03isc01ip01in00"
+      },
+      {
+        "index": 45,
+        "attached_to": 39,
+        "class_list": [
+          "keyboard",
+          "usb"
+        ],
+        "bus_type": {
+          "hex": "0086",
+          "name": "USB",
+          "value": 134
+        },
+        "slot": {
+          "bus": 0,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0108",
+          "name": "Keyboard",
+          "value": 264
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Keyboard",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "0624",
+          "name": "Avocent",
+          "value": 1572
+        },
+        "device": {
+          "hex": "0249",
+          "name": "Keyboard/Mouse Function",
+          "value": 585
+        },
+        "serial": "20121018",
+        "model": "Avocent Keyboard/Mouse Function",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-3/1-3.1/1-3.1:1.0",
+        "sysfs_bus_id": "1-3.1:1.0",
+        "unix_device_names": [
+          "/dev/input/by-id/usb-Avocent_Keyboard_Mouse_Function_20121018-event-kbd",
+          "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.1:1.0-event-kbd",
+          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.1:1.0-event-kbd",
+          "/dev/input/event3"
+        ],
+        "resources": [
+          {
+            "type": "baud",
+            "speed": 480000000,
+            "bits": 0,
+            "stop_bits": 0,
+            "parity": 0,
+            "handshake": 0
+          }
+        ],
+        "detail": {
+          "device_class": {
+            "hex": "0000",
+            "name": "per_interface",
+            "value": 0
+          },
+          "device_subclass": {
+            "hex": "0000",
+            "name": "per_interface",
+            "value": 0
+          },
+          "device_protocol": 0,
+          "interface_class": {
+            "hex": "0003",
+            "name": "hid",
+            "value": 3
+          },
+          "interface_subclass": {
+            "hex": "0001",
+            "name": "audio",
+            "value": 1
+          },
+          "interface_protocol": 1,
+          "interface_number": 0,
+          "interface_alternate_setting": 0
+        },
+        "hotplug": "usb",
+        "driver": "usbhid",
+        "driver_module": "usbhid",
+        "drivers": [
+          "usbhid"
+        ],
+        "driver_modules": [
+          "usbhid"
+        ],
+        "driver_info": {
+          "type": "keyboard",
+          "xkb_rules": "xfree86",
+          "xkb_model": "pc104"
+        },
+        "module_alias": "usb:v0624p0249d0000dc00dsc00dp00ic03isc01ip01in00"
       }
     ],
     "memory": [
@@ -1698,6 +1876,216 @@
         }
       }
     ],
+    "mouse": [
+      {
+        "index": 38,
+        "attached_to": 39,
+        "class_list": [
+          "mouse",
+          "usb"
+        ],
+        "bus_type": {
+          "hex": "0086",
+          "name": "USB",
+          "value": 134
+        },
+        "slot": {
+          "bus": 0,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0105",
+          "name": "Mouse",
+          "value": 261
+        },
+        "sub_class": {
+          "hex": "0003",
+          "name": "USB Mouse",
+          "value": 3
+        },
+        "vendor": {
+          "hex": "0624",
+          "name": "Avocent",
+          "value": 1572
+        },
+        "device": {
+          "hex": "0249",
+          "name": "Keyboard/Mouse Function",
+          "value": 585
+        },
+        "serial": "20121018",
+        "compat_vendor": "Unknown",
+        "compat_device": "Generic USB Mouse",
+        "model": "Avocent Keyboard/Mouse Function",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-3/1-3.1/1-3.1:1.1",
+        "sysfs_bus_id": "1-3.1:1.1",
+        "unix_device_names": [
+          "/dev/input/mice"
+        ],
+        "unix_device_name2": "/dev/input/mouse0",
+        "resources": [
+          {
+            "type": "baud",
+            "speed": 480000000,
+            "bits": 0,
+            "stop_bits": 0,
+            "parity": 0,
+            "handshake": 0
+          }
+        ],
+        "detail": {
+          "device_class": {
+            "hex": "0000",
+            "name": "per_interface",
+            "value": 0
+          },
+          "device_subclass": {
+            "hex": "0000",
+            "name": "per_interface",
+            "value": 0
+          },
+          "device_protocol": 0,
+          "interface_class": {
+            "hex": "0003",
+            "name": "hid",
+            "value": 3
+          },
+          "interface_subclass": {
+            "hex": "0001",
+            "name": "audio",
+            "value": 1
+          },
+          "interface_protocol": 2,
+          "interface_number": 1,
+          "interface_alternate_setting": 0
+        },
+        "hotplug": "usb",
+        "driver": "usbhid",
+        "driver_module": "usbhid",
+        "drivers": [
+          "usbhid"
+        ],
+        "driver_modules": [
+          "usbhid"
+        ],
+        "driver_info": {
+          "type": "mouse",
+          "db_entry_0": [
+            "explorerps/2",
+            "exps2"
+          ],
+          "xf86": "explorerps/2",
+          "gpm": "exps2",
+          "buttons": -1,
+          "wheels": -1
+        },
+        "module_alias": "usb:v0624p0249d0000dc00dsc00dp00ic03isc01ip02in01"
+      },
+      {
+        "index": 43,
+        "attached_to": 39,
+        "class_list": [
+          "mouse",
+          "usb"
+        ],
+        "bus_type": {
+          "hex": "0086",
+          "name": "USB",
+          "value": 134
+        },
+        "slot": {
+          "bus": 0,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0105",
+          "name": "Mouse",
+          "value": 261
+        },
+        "sub_class": {
+          "hex": "0003",
+          "name": "USB Mouse",
+          "value": 3
+        },
+        "vendor": {
+          "hex": "0624",
+          "name": "Avocent",
+          "value": 1572
+        },
+        "device": {
+          "hex": "0249",
+          "name": "Keyboard/Mouse Function",
+          "value": 585
+        },
+        "serial": "20121018",
+        "compat_vendor": "Unknown",
+        "compat_device": "Generic USB Mouse",
+        "model": "Avocent Keyboard/Mouse Function",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-3/1-3.1/1-3.1:1.2",
+        "sysfs_bus_id": "1-3.1:1.2",
+        "unix_device_names": [
+          "/dev/input/mice"
+        ],
+        "unix_device_name2": "/dev/input/mouse1",
+        "resources": [
+          {
+            "type": "baud",
+            "speed": 480000000,
+            "bits": 0,
+            "stop_bits": 0,
+            "parity": 0,
+            "handshake": 0
+          }
+        ],
+        "detail": {
+          "device_class": {
+            "hex": "0000",
+            "name": "per_interface",
+            "value": 0
+          },
+          "device_subclass": {
+            "hex": "0000",
+            "name": "per_interface",
+            "value": 0
+          },
+          "device_protocol": 0,
+          "interface_class": {
+            "hex": "0003",
+            "name": "hid",
+            "value": 3
+          },
+          "interface_subclass": {
+            "hex": "0001",
+            "name": "audio",
+            "value": 1
+          },
+          "interface_protocol": 2,
+          "interface_number": 2,
+          "interface_alternate_setting": 0
+        },
+        "hotplug": "usb",
+        "driver": "usbhid",
+        "driver_module": "usbhid",
+        "drivers": [
+          "usbhid"
+        ],
+        "driver_modules": [
+          "usbhid"
+        ],
+        "driver_info": {
+          "type": "mouse",
+          "db_entry_0": [
+            "explorerps/2",
+            "exps2"
+          ],
+          "xf86": "explorerps/2",
+          "gpm": "exps2",
+          "buttons": -1,
+          "wheels": -1
+        },
+        "module_alias": "usb:v0624p0249d0000dc00dsc00dp00ic03isc01ip02in02"
+      }
+    ],
     "network_controller": [
       {
         "index": 8,
@@ -2032,7 +2420,7 @@
     ],
     "network_interface": [
       {
-        "index": 42,
+        "index": 46,
         "attached_to": 17,
         "class_list": [
           "network_interface"
@@ -2073,8 +2461,30 @@
         ]
       },
       {
-        "index": 43,
-        "attached_to": 20,
+        "index": 47,
+        "attached_to": 0,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
+        },
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
+        "unix_device_names": [
+          "lo"
+        ]
+      },
+      {
+        "index": 48,
+        "attached_to": 12,
         "class_list": [
           "network_interface"
         ],
@@ -2089,10 +2499,10 @@
           "value": 1
         },
         "model": "Ethernet network interface",
-        "sysfs_id": "/class/net/enp2s0f1",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:01.1/0000:02:00.1",
+        "sysfs_id": "/class/net/enp2s0f0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:01.1/0000:02:00.0",
         "unix_device_names": [
-          "enp2s0f1"
+          "enp2s0f0"
         ],
         "resources": [
           {
@@ -2114,7 +2524,7 @@
         ]
       },
       {
-        "index": 44,
+        "index": 49,
         "attached_to": 8,
         "class_list": [
           "network_interface"
@@ -2155,8 +2565,8 @@
         ]
       },
       {
-        "index": 45,
-        "attached_to": 12,
+        "index": 50,
+        "attached_to": 20,
         "class_list": [
           "network_interface"
         ],
@@ -2171,10 +2581,10 @@
           "value": 1
         },
         "model": "Ethernet network interface",
-        "sysfs_id": "/class/net/enp2s0f0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:01.1/0000:02:00.0",
+        "sysfs_id": "/class/net/enp2s0f1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:01.1/0000:02:00.1",
         "unix_device_names": [
-          "enp2s0f0"
+          "enp2s0f1"
         ],
         "resources": [
           {
@@ -2194,28 +2604,6 @@
         "driver_modules": [
           "ixgbe"
         ]
-      },
-      {
-        "index": 46,
-        "attached_to": 0,
-        "class_list": [
-          "network_interface"
-        ],
-        "base_class": {
-          "hex": "0107",
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Loopback",
-          "value": 0
-        },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_names": [
-          "lo"
-        ]
       }
     ],
     "pci": [
@@ -2797,8 +3185,8 @@
     ],
     "usb": [
       {
-        "index": 40,
-        "attached_to": 39,
+        "index": 37,
+        "attached_to": 40,
         "class_list": [
           "usb",
           "unknown"
@@ -2823,24 +3211,27 @@
           "value": 0
         },
         "vendor": {
-          "hex": "1a2c",
-          "name": "SEM",
-          "value": 6700
+          "hex": "413c",
+          "name": "Primax",
+          "value": 16700
         },
         "device": {
-          "hex": "0b2a",
-          "name": "USB Keyboard",
-          "value": 2858
+          "hex": "2113",
+          "name": "Dell KB216 Wired Keyboard",
+          "value": 8467
         },
         "revision": {
           "hex": "0000",
-          "name": "1.10",
+          "name": "1.13",
           "value": 0
         },
-        "model": "SEM USB Keyboard",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-11/1-11:1.1",
-        "sysfs_bus_id": "1-11:1.1",
+        "model": "Primax Dell KB216 Wired Keyboard",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-4/1-4:1.1",
+        "sysfs_bus_id": "1-4:1.1",
         "unix_device_names": [
+          "/dev/input/by-id/usb-Primax_Dell_KB216_Wired_Keyboard-event-if01",
+          "/dev/input/by-path/pci-0000:00:14.0-usb-0:4:1.1-event",
+          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:4:1.1-event",
           "/dev/input/event1"
         ],
         "resources": [
@@ -2888,7 +3279,7 @@
         "driver_modules": [
           "usbhid"
         ],
-        "module_alias": "usb:v1A2Cp0B2Ad0110dc00dsc00dp00ic03isc00ip00in01"
+        "module_alias": "usb:v413Cp2113d0113dc00dsc00dp00ic03isc00ip00in01"
       }
     ],
     "usb_controller": [