diff --git a/_sources/generated.json b/_sources/generated.json
index 46e81e9..6827524 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -1,202 +1,202 @@
 {
-    "bang-bang": {
-        "cargoLocks": null,
-        "date": "2023-07-23",
-        "extract": null,
-        "name": "bang-bang",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "oh-my-fish",
-            "repo": "plugin-bang-bang",
-            "rev": "ec991b80ba7d4dda7a962167b036efc5c2d79419",
-            "sha256": "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=",
-            "type": "github"
-        },
-        "version": "ec991b80ba7d4dda7a962167b036efc5c2d79419"
+  "bang-bang": {
+    "cargoLocks": null,
+    "date": "2023-07-23",
+    "extract": null,
+    "name": "bang-bang",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "deepClone": false,
+      "fetchSubmodules": false,
+      "leaveDotGit": false,
+      "name": null,
+      "owner": "oh-my-fish",
+      "repo": "plugin-bang-bang",
+      "rev": "ec991b80ba7d4dda7a962167b036efc5c2d79419",
+      "sha256": "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=",
+      "type": "github"
     },
-    "fix-window-role": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "fix-window-role",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "name": null,
-            "sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=",
-            "type": "url",
-            "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"
-        },
-        "version": "latest"
+    "version": "ec991b80ba7d4dda7a962167b036efc5c2d79419"
+  },
+  "fix-window-role": {
+    "cargoLocks": null,
+    "date": null,
+    "extract": null,
+    "name": "fix-window-role",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "name": null,
+      "sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=",
+      "type": "url",
+      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"
     },
-    "git-abbr": {
-        "cargoLocks": null,
-        "date": "2023-06-19",
-        "extract": null,
-        "name": "git-abbr",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "pupbrained",
-            "repo": "fish-git-abbr",
-            "rev": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e",
-            "sha256": "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=",
-            "type": "github"
-        },
-        "version": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e"
+    "version": "latest"
+  },
+  "git-abbr": {
+    "cargoLocks": null,
+    "date": "2023-06-19",
+    "extract": null,
+    "name": "git-abbr",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "deepClone": false,
+      "fetchSubmodules": false,
+      "leaveDotGit": false,
+      "name": null,
+      "owner": "pupbrained",
+      "repo": "fish-git-abbr",
+      "rev": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e",
+      "sha256": "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=",
+      "type": "github"
     },
-    "gityaw": {
-        "cargoLocks": null,
-        "date": "2019-01-07",
-        "extract": null,
-        "name": "gityaw",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "oh-my-fish",
-            "repo": "plugin-gityaw",
-            "rev": "59196560e0f4520db63fb8cab645510377bb8b13",
-            "sha256": "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=",
-            "type": "github"
-        },
-        "version": "59196560e0f4520db63fb8cab645510377bb8b13"
+    "version": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e"
+  },
+  "gityaw": {
+    "cargoLocks": null,
+    "date": "2019-01-07",
+    "extract": null,
+    "name": "gityaw",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "deepClone": false,
+      "fetchSubmodules": false,
+      "leaveDotGit": false,
+      "name": null,
+      "owner": "oh-my-fish",
+      "repo": "plugin-gityaw",
+      "rev": "59196560e0f4520db63fb8cab645510377bb8b13",
+      "sha256": "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=",
+      "type": "github"
     },
-    "license": {
-        "cargoLocks": null,
-        "date": "2018-10-22",
-        "extract": null,
-        "name": "license",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "oh-my-fish",
-            "repo": "plugin-license",
-            "rev": "0155b16f102957ec0c734a90979245dc1073f979",
-            "sha256": "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=",
-            "type": "github"
-        },
-        "version": "0155b16f102957ec0c734a90979245dc1073f979"
+    "version": "59196560e0f4520db63fb8cab645510377bb8b13"
+  },
+  "license": {
+    "cargoLocks": null,
+    "date": "2018-10-22",
+    "extract": null,
+    "name": "license",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "deepClone": false,
+      "fetchSubmodules": false,
+      "leaveDotGit": false,
+      "name": null,
+      "owner": "oh-my-fish",
+      "repo": "plugin-license",
+      "rev": "0155b16f102957ec0c734a90979245dc1073f979",
+      "sha256": "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=",
+      "type": "github"
     },
-    "poll": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "poll",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "name": null,
-            "sha256": "sha256-Weh2+C5v2ORYO8JFYzntpPmJyGseFqArByZwLpX2CCU=",
-            "type": "url",
-            "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/poll.patch"
-        },
-        "version": "latest"
+    "version": "0155b16f102957ec0c734a90979245dc1073f979"
+  },
+  "poll": {
+    "cargoLocks": null,
+    "date": null,
+    "extract": null,
+    "name": "poll",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "name": null,
+      "sha256": "sha256-Weh2+C5v2ORYO8JFYzntpPmJyGseFqArByZwLpX2CCU=",
+      "type": "url",
+      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/poll.patch"
     },
-    "replay-fish": {
-        "cargoLocks": null,
-        "date": "2024-07-01",
-        "extract": null,
-        "name": "replay-fish",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "jorgebucaran",
-            "repo": "replay.fish",
-            "rev": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c",
-            "sha256": "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg=",
-            "type": "github"
-        },
-        "version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c"
+    "version": "latest"
+  },
+  "replay-fish": {
+    "cargoLocks": null,
+    "date": "2024-07-01",
+    "extract": null,
+    "name": "replay-fish",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "deepClone": false,
+      "fetchSubmodules": false,
+      "leaveDotGit": false,
+      "name": null,
+      "owner": "jorgebucaran",
+      "repo": "replay.fish",
+      "rev": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c",
+      "sha256": "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg=",
+      "type": "github"
     },
-    "round-undecorated-frame": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "round-undecorated-frame",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "name": null,
-            "sha256": "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=",
-            "type": "url",
-            "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch"
-        },
-        "version": "latest"
+    "version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c"
+  },
+  "round-undecorated-frame": {
+    "cargoLocks": null,
+    "date": null,
+    "extract": null,
+    "name": "round-undecorated-frame",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "name": null,
+      "sha256": "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=",
+      "type": "url",
+      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch"
     },
-    "sddm-theme-minesddm": {
-        "cargoLocks": null,
-        "date": "2024-12-15",
-        "extract": null,
-        "name": "sddm-theme-minesddm",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "Davi-S",
-            "repo": "sddm-theme-minesddm",
-            "rev": "3f6d2c82b181719d95f27366fd7ebc43185b0088",
-            "sha256": "sha256-lkNUGmWe+R75IFbI/VX4j8c9DJk/QELxCg1D/CIsaAc=",
-            "type": "github"
-        },
-        "version": "3f6d2c82b181719d95f27366fd7ebc43185b0088"
+    "version": "latest"
+  },
+  "sddm-theme-minesddm": {
+    "cargoLocks": null,
+    "date": "2024-12-15",
+    "extract": null,
+    "name": "sddm-theme-minesddm",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "deepClone": false,
+      "fetchSubmodules": false,
+      "leaveDotGit": false,
+      "name": null,
+      "owner": "Davi-S",
+      "repo": "sddm-theme-minesddm",
+      "rev": "3f6d2c82b181719d95f27366fd7ebc43185b0088",
+      "sha256": "sha256-lkNUGmWe+R75IFbI/VX4j8c9DJk/QELxCg1D/CIsaAc=",
+      "type": "github"
     },
-    "system-appearance": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "system-appearance",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "name": null,
-            "sha256": "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=",
-            "type": "url",
-            "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch"
-        },
-        "version": "latest"
+    "version": "3f6d2c82b181719d95f27366fd7ebc43185b0088"
+  },
+  "system-appearance": {
+    "cargoLocks": null,
+    "date": null,
+    "extract": null,
+    "name": "system-appearance",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "name": null,
+      "sha256": "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=",
+      "type": "url",
+      "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch"
     },
-    "wttr": {
-        "cargoLocks": null,
-        "date": "2016-05-23",
-        "extract": null,
-        "name": "wttr",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "oh-my-fish",
-            "repo": "plugin-wttr",
-            "rev": "7500e382e6b29a463edc57598217ce0cfaf8c90c",
-            "sha256": "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=",
-            "type": "github"
-        },
-        "version": "7500e382e6b29a463edc57598217ce0cfaf8c90c"
-    }
-}
\ No newline at end of file
+    "version": "latest"
+  },
+  "wttr": {
+    "cargoLocks": null,
+    "date": "2016-05-23",
+    "extract": null,
+    "name": "wttr",
+    "passthru": null,
+    "pinned": false,
+    "src": {
+      "deepClone": false,
+      "fetchSubmodules": false,
+      "leaveDotGit": false,
+      "name": null,
+      "owner": "oh-my-fish",
+      "repo": "plugin-wttr",
+      "rev": "7500e382e6b29a463edc57598217ce0cfaf8c90c",
+      "sha256": "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=",
+      "type": "github"
+    },
+    "version": "7500e382e6b29a463edc57598217ce0cfaf8c90c"
+  }
+}
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 0903599..cd30fe9 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -1,6 +1,8 @@
 # This file was generated by nvfetcher, please do not modify it manually.
-{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
 {
+  fetchurl,
+  fetchFromGitHub,
+}: {
   bang-bang = {
     pname = "bang-bang";
     version = "ec991b80ba7d4dda7a962167b036efc5c2d79419";
diff --git a/flake.lock b/flake.lock
index 5c22ae6..3a59edb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,11 +91,11 @@
     },
     "catppuccin": {
       "locked": {
-        "lastModified": 1734546365,
-        "narHash": "sha256-g8GoZj1+r78/+gl2uWqausP+5oUap+GQsUKHnj+yB38=",
+        "lastModified": 1734624488,
+        "narHash": "sha256-swNM0LxzIcyQcyK5SE0Q13qs3MOcJR4KL2+bSv2HHpg=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "5cdefd69fc9238a6fe512e76ed9d22169c661616",
+        "rev": "562a0ace199ab59413d5093e31d6745704bd0d11",
         "type": "github"
       },
       "original": {
@@ -112,11 +112,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1734346739,
-        "narHash": "sha256-Um5yY36idRodddotyBaI9sQjw/xw5SV6tt3jPRgL330=",
+        "lastModified": 1734619568,
+        "narHash": "sha256-rYVM0KsGb+zUScfLCHnyxkR+poKOkH5VUKFzPxP1RcY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "7228d7032f0316dbc69b69584ec07707efbd38c9",
+        "rev": "49af1cfc2787e08814d3b8ce95693364cc86b4bf",
         "type": "github"
       },
       "original": {
@@ -155,11 +155,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1734404414,
-        "narHash": "sha256-c/7bsbMcVMb8c4wiLA142ZQfL08U8qYJROGf9NCkfQE=",
+        "lastModified": 1734620407,
+        "narHash": "sha256-JarUp0GVny6BwGZaUfIXsSQQcz1w7SGMxgCsJZBdv7U=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "a364e6a5e9eb93253daf93c747b150e31e09b13c",
+        "rev": "f6036448ff647e02dcd83f673036ccacbd2922b7",
         "type": "github"
       },
       "original": {
@@ -957,11 +957,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734093295,
-        "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
+        "lastModified": 1734344598,
+        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
+        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
         "type": "github"
       },
       "original": {
@@ -977,11 +977,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734344598,
-        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
+        "lastModified": 1734622215,
+        "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
+        "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
         "type": "github"
       },
       "original": {
@@ -1376,11 +1376,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734162608,
-        "narHash": "sha256-m2AX+3eiVqIK6uO7GbGY7SFnkkYOlR5fQiNI0eRvWOQ=",
+        "lastModified": 1734591594,
+        "narHash": "sha256-7Q4hXE+b9A4DebZ5Q+q3WStuMiWR5bMW0ltpzbY/zMQ=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "31bdf4c7c91204d65afbde01146deee0259a8fb7",
+        "rev": "ce2abe494524cdb389a5d31c11c41834d4362ac5",
         "type": "github"
       },
       "original": {
@@ -1435,11 +1435,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1734526071,
-        "narHash": "sha256-0GjNrhkmJv961FqmkxPUWSj0Vdy2ZOzaw6dL1lBGhco=",
+        "lastModified": 1734612140,
+        "narHash": "sha256-8sSHmTQDMaGGUlo9iK+oAgvdyru7qTeUOCS32U11coo=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "328e55103afad95949f7fc60bb2ecabdd790611e",
+        "rev": "99a53a8074075815200d09a41be3c4ef5ad21ca5",
         "type": "github"
       },
       "original": {
@@ -1608,11 +1608,11 @@
     },
     "nixos-facter-modules": {
       "locked": {
-        "lastModified": 1732288619,
-        "narHash": "sha256-zSQ2cR+NRJfHUVfkv+O6Wi53wXfzX8KHiO8fRfnvc0M=",
+        "lastModified": 1734596637,
+        "narHash": "sha256-MRqwVAe3gsb88u4ME1UidmZFVCx+FEnoob0zkpO9DMY=",
         "owner": "numtide",
         "repo": "nixos-facter-modules",
-        "rev": "862648589993a96480c2255197a28feea712f68f",
+        "rev": "536472754982bf03079b4b4e0261838a760587c0",
         "type": "github"
       },
       "original": {
@@ -1686,11 +1686,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1734083684,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "lastModified": 1734323986,
+        "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "rev": "394571358ce82dff7411395829aa6a3aad45b907",
         "type": "github"
       },
       "original": {
@@ -1734,11 +1734,11 @@
     },
     "nixpkgs-stable_4": {
       "locked": {
-        "lastModified": 1734202038,
-        "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=",
+        "lastModified": 1734529975,
+        "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d",
+        "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a",
         "type": "github"
       },
       "original": {
@@ -1909,11 +1909,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1734119587,
-        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
@@ -2238,11 +2238,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734316514,
-        "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=",
+        "lastModified": 1734489114,
+        "narHash": "sha256-dKBBZr2pw7KDI/7GeiN5qPccqqtvnK2jqAMcMo4rVvU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "83ee8ff74d6294a7657320f16814754c4594127b",
+        "rev": "b2e385f8e5c1d7c0d9ce738d650955c2e94555ae",
         "type": "github"
       },
       "original": {
diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json
index 9d5d21f..3cd0fc6 100644
--- a/systems/x86_64-linux/navis/facter.json
+++ b/systems/x86_64-linux/navis/facter.json
@@ -1078,95 +1078,6 @@
     "disk": [
       {
         "index": 42,
-        "attached_to": 21,
-        "class_list": [
-          "disk",
-          "block_device",
-          "nvme"
-        ],
-        "bus_type": {
-          "hex": "0096",
-          "name": "NVME",
-          "value": 150
-        },
-        "slot": {
-          "bus": 0,
-          "number": 0
-        },
-        "base_class": {
-          "hex": "0106",
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "hex": "1c5c",
-          "value": 7260
-        },
-        "sub_vendor": {
-          "hex": "1c5c",
-          "value": 7260
-        },
-        "device": {
-          "hex": "174a",
-          "name": "HFM512GD3JX013N",
-          "value": 5962
-        },
-        "sub_device": {
-          "hex": "174a",
-          "value": 5962
-        },
-        "serial": "FYA7N020713207841",
-        "model": "HFM512GD3JX013N",
-        "sysfs_id": "/class/block/nvme0n1",
-        "sysfs_bus_id": "nvme0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:06.0/0000:02:00.0/nvme/nvme0",
-        "unix_device_name": "/dev/nvme0n1",
-        "unix_device_number": {
-          "type": 98,
-          "major": 259,
-          "minor": 5,
-          "range": 0
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/2",
-          "/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841",
-          "/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841_1",
-          "/dev/disk/by-id/nvme-nvme.1c5c-465941374e303230373133323037383431-48464d3531324744334a583031334e-00000001",
-          "/dev/disk/by-path/pci-0000:02:00.0-nvme-1",
-          "/dev/nvme0n1"
-        ],
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 488386,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 1000215216,
-            "value_2": 512
-          }
-        ],
-        "driver": "nvme",
-        "driver_module": "nvme",
-        "drivers": [
-          "nvme"
-        ],
-        "driver_modules": [
-          "nvme"
-        ]
-      },
-      {
-        "index": 43,
         "attached_to": 16,
         "class_list": [
           "disk",
@@ -1180,7 +1091,7 @@
         },
         "slot": {
           "bus": 0,
-          "number": 1
+          "number": 0
         },
         "base_class": {
           "hex": "0106",
@@ -1211,10 +1122,10 @@
         },
         "serial": "S6S1NG0RA02239Z",
         "model": "Samsung SSD 970 EVO Plus 1TB",
-        "sysfs_id": "/class/block/nvme1n1",
-        "sysfs_bus_id": "nvme1",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1b.0/0000:03:00.0/nvme/nvme1",
-        "unix_device_name": "/dev/nvme1n1",
+        "sysfs_id": "/class/block/nvme0n1",
+        "sysfs_bus_id": "nvme0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1b.0/0000:03:00.0/nvme/nvme0",
+        "unix_device_name": "/dev/nvme0n1",
         "unix_device_number": {
           "type": 98,
           "major": 259,
@@ -1227,7 +1138,7 @@
           "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NG0RA02239Z_1",
           "/dev/disk/by-id/nvme-eui.0025385a1150c740",
           "/dev/disk/by-path/pci-0000:03:00.0-nvme-1",
-          "/dev/nvme1n1"
+          "/dev/nvme0n1"
         ],
         "resources": [
           {
@@ -1253,6 +1164,95 @@
         "driver_modules": [
           "nvme"
         ]
+      },
+      {
+        "index": 43,
+        "attached_to": 21,
+        "class_list": [
+          "disk",
+          "block_device",
+          "nvme"
+        ],
+        "bus_type": {
+          "hex": "0096",
+          "name": "NVME",
+          "value": 150
+        },
+        "slot": {
+          "bus": 0,
+          "number": 1
+        },
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "1c5c",
+          "value": 7260
+        },
+        "sub_vendor": {
+          "hex": "1c5c",
+          "value": 7260
+        },
+        "device": {
+          "hex": "174a",
+          "name": "HFM512GD3JX013N",
+          "value": 5962
+        },
+        "sub_device": {
+          "hex": "174a",
+          "value": 5962
+        },
+        "serial": "FYA7N020713207841",
+        "model": "HFM512GD3JX013N",
+        "sysfs_id": "/class/block/nvme1n1",
+        "sysfs_bus_id": "nvme1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:06.0/0000:02:00.0/nvme/nvme1",
+        "unix_device_name": "/dev/nvme1n1",
+        "unix_device_number": {
+          "type": 98,
+          "major": 259,
+          "minor": 5,
+          "range": 0
+        },
+        "unix_device_names": [
+          "/dev/disk/by-diskseq/2",
+          "/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841",
+          "/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841_1",
+          "/dev/disk/by-id/nvme-nvme.1c5c-465941374e303230373133323037383431-48464d3531324744334a583031334e-00000001",
+          "/dev/disk/by-path/pci-0000:02:00.0-nvme-1",
+          "/dev/nvme1n1"
+        ],
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 488386,
+            "heads": 64,
+            "sectors": 32,
+            "size": 0,
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 1000215216,
+            "value_2": 512
+          }
+        ],
+        "driver": "nvme",
+        "driver_module": "nvme",
+        "drivers": [
+          "nvme"
+        ],
+        "driver_modules": [
+          "nvme"
+        ]
       }
     ],
     "graphics_card": [
@@ -2424,7 +2424,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 67152121856,
+            "range": 67152105472,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -2882,7 +2882,7 @@
           "hex": "307a",
           "value": 12410
         },
-        "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-0/i2c-ELAN1203:00/0018:04F3:307A.000C/input/input28",
+        "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN1203:00/0018:04F3:307A.000C/input/input28",
         "unix_device_names": [
           "/dev/input/event25",
           "/dev/input/ + handler"
@@ -3187,6 +3187,48 @@
     "network_interface": [
       {
         "index": 74,
+        "attached_to": 32,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0001",
+          "name": "Ethernet",
+          "value": 1
+        },
+        "model": "Ethernet network interface",
+        "sysfs_id": "/class/net/enp5s0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0",
+        "unix_device_name": "enp5s0",
+        "unix_device_names": [
+          "enp5s0"
+        ],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 48
+          },
+          {
+            "type": "phwaddr",
+            "address": 48
+          }
+        ],
+        "driver": "r8169",
+        "driver_module": "r8169",
+        "drivers": [
+          "r8169"
+        ],
+        "driver_modules": [
+          "r8169"
+        ]
+      },
+      {
+        "index": 75,
         "attached_to": 36,
         "class_list": [
           "network_interface"
@@ -3228,7 +3270,7 @@
         ]
       },
       {
-        "index": 75,
+        "index": 76,
         "attached_to": 0,
         "class_list": [
           "network_interface"
@@ -3249,48 +3291,6 @@
         "unix_device_names": [
           "lo"
         ]
-      },
-      {
-        "index": 76,
-        "attached_to": 32,
-        "class_list": [
-          "network_interface"
-        ],
-        "base_class": {
-          "hex": "0107",
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "hex": "0001",
-          "name": "Ethernet",
-          "value": 1
-        },
-        "model": "Ethernet network interface",
-        "sysfs_id": "/class/net/enp5s0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0",
-        "unix_device_name": "enp5s0",
-        "unix_device_names": [
-          "enp5s0"
-        ],
-        "resources": [
-          {
-            "type": "hwaddr",
-            "address": 48
-          },
-          {
-            "type": "phwaddr",
-            "address": 48
-          }
-        ],
-        "driver": "r8169",
-        "driver_module": "r8169",
-        "drivers": [
-          "r8169"
-        ],
-        "driver_modules": [
-          "r8169"
-        ]
       }
     ],
     "pci": [
@@ -5086,6 +5086,9 @@
           "range": 1
         },
         "unix_device_names": [
+          "/dev/input/by-id/usb-SteelSeries_SteelSeries_Arctis_7-event-if05",
+          "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.3:1.5-event",
+          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.3:1.5-event",
           "/dev/input/event13"
         ],
         "resources": [