From 5e44ad7ffdaf415f074ee5a3521c07b4dd9ad0d0 Mon Sep 17 00:00:00 2001 From: pupbrained Date: Mon, 11 Nov 2024 15:57:56 -0500 Subject: [PATCH] update --- _sources/generated.json | 344 +++--- flake.in.nix | 15 +- flake.lock | 147 ++- systems/x86_64-linux/navis/default.nix | 320 +++--- systems/x86_64-linux/navis/facter.json | 1011 +++++++++++++++--- systems/x86_64-linux/polaris-nix/facter.json | 2 +- 6 files changed, 1246 insertions(+), 593 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 257518a..ce3c3a4 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,182 +1,182 @@ { - "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" }, - "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": "latest" + }, + "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/flake.in.nix b/flake.in.nix index 9b674a4..05d6662 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -86,6 +86,7 @@ programs = { alejandra.enable = true; deadnix.enable = true; + jsonfmt.enable = true; stylua.enable = true; taplo.enable = true; }; @@ -97,11 +98,19 @@ alejandra git lua-language-server - #nvfetcher + nvfetcher statix - (writeScriptBin "build" "nix fmt && ${snowfallorg.flake}/bin/flake switch") - (writeScriptBin "up" "nix flake update") + (writeScriptBin "build" '' + sudo nix run \ + --option experimental-features "nix-command flakes" \ + --option extra-substituters https://numtide.cachix.org \ + --option extra-trusted-public-keys numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE= \ + github:numtide/nixos-facter -- -o systems/${system}/$(hostname)/facter.json + nix fmt + nh os switch + '') + (writeScriptBin "up" "nix flake update && nvfetcher") ]; }; }; diff --git a/flake.lock b/flake.lock index 6315820..851d0af 100644 --- a/flake.lock +++ b/flake.lock @@ -113,11 +113,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1727497393, - "narHash": "sha256-AHL2qezvAAZtOP61cHtnB0RtqPej4LqtGkvXNOAESNw=", + "lastModified": 1730140831, + "narHash": "sha256-tDKEnPx7mJNybQ4qb2zbCKeLSbHxomN7njr/VClcmZ8=", "owner": "jcdickinson", "repo": "codeium.nvim", - "rev": "17bbefff02be8fd66931f366bd4ed76a76e4a57e", + "rev": "dddaee0d1e9a1d0bcaea66f08a8103b3cdf26604", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731210504, - "narHash": "sha256-QE5qfTcJk1XBwTxoW3nJ2PWJ/YRppy8IiwsqLwnu4A0=", + "lastModified": 1731289077, + "narHash": "sha256-8Waya6WKqgWkYqbr1zkuyd1vNKgQb/QxfHLSMzp/LqU=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "aa9d41c105d715974b86f8cf64f84e0995d5e747", + "rev": "274f08b587d403940cd8d8da13a89ee094d3bc96", "type": "github" }, "original": { @@ -263,11 +263,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -460,11 +460,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -722,11 +722,11 @@ ] }, "locked": { - "lastModified": 1727514110, - "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -886,11 +886,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -928,11 +928,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -984,11 +984,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731279191, - "narHash": "sha256-9gJ3G8j9yUmzZdluh3fZoSN4qj/Y4XZgl2hsa8sdCwg=", + "lastModified": 1731340175, + "narHash": "sha256-IfE7lqNFfFyzAu3pe2XTeNovU9tVzJeGLzQ2B8Segy0=", "ref": "refs/heads/main", - "rev": "c10739e6e35c30ef5f273bfe5d219d361a31e226", - "revCount": 5438, + "rev": "f5fa84554ffe55e29a397014964238be89ffa54d", + "revCount": 5448, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1148,6 +1148,36 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -1157,11 +1187,11 @@ ] }, "locked": { - "lastModified": 1730962714, - "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", + "lastModified": 1731227601, + "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "93b525229c99fec0016db72a174f43b9d6237714", + "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", "type": "github" }, "original": { @@ -1233,11 +1263,11 @@ ] }, "locked": { - "lastModified": 1727507295, - "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=", + "lastModified": 1731153869, + "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70", + "rev": "5c74ab862c8070cbf6400128a1b56abb213656da", "type": "github" }, "original": { @@ -1472,11 +1502,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1727742380, - "narHash": "sha256-5lFzlmiwrl3OHrw7QhZn/ZpZtygzx1UspKOaZqpxXSQ=", + "lastModified": 1731287057, + "narHash": "sha256-JHTzkYQOF6756FDqN2EmMN4eysk9UAPDlnFoGoaVEBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dc3c339a2aecbd61ab2549248d8b64ba1c28af5", + "rev": "5812399690b88187502ee93b3e3f0856628ba010", "type": "github" }, "original": { @@ -1487,11 +1517,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -1591,11 +1621,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -1738,11 +1768,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1730304915, - "narHash": "sha256-qgxzBjrXMvfIhhqyEruh7rH5gAecpDoxKiOHGZcQeMs=", + "lastModified": 1731290794, + "narHash": "sha256-bj8x19+LDyX5zCLWtu6XZxWOTvj76Rbks0MD1alYAWI=", "owner": "pupbrained", "repo": "nvim-config", - "rev": "d766bf1a0c70f3bcee2706b9dab7718fe110349a", + "rev": "d5a156712e38016f0738444e4d5dc838959502a5", "type": "github" }, "original": { @@ -1764,11 +1794,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1727645871, - "narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=", + "lastModified": 1731281996, + "narHash": "sha256-xdNFY/wcs8i9qluVbTAVh5JLlhI/r4JJfXb0yfEj1Ks=", "owner": "nix-community", "repo": "nixvim", - "rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200", + "rev": "57068f532d5d42601fd74e2b531204fe1cd3a8f2", "type": "github" }, "original": { @@ -1780,6 +1810,7 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_5", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixvim", @@ -1787,11 +1818,11 @@ ] }, "locked": { - "lastModified": 1727452028, - "narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=", + "lastModified": 1731060242, + "narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=", "owner": "NuschtOS", "repo": "search", - "rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3", + "rev": "ef493352f9e1f051e01a55c062731503a6b36b4e", "type": "github" }, "original": { @@ -2132,11 +2163,11 @@ ] }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { @@ -2150,11 +2181,11 @@ "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { @@ -2285,11 +2316,11 @@ "nixpkgs": "nixpkgs_20" }, "locked": { - "lastModified": 1731201596, - "narHash": "sha256-W1zTYSLFuroahnbaYInl+d3I7uc8olZ8hcjI16PMCew=", + "lastModified": 1731287815, + "narHash": "sha256-+EDI5eFPdPnaGlFEvdDTC93R8XUfsvRn6E6DFfflkxQ=", "owner": "fufexan", "repo": "zen-browser-flake", - "rev": "ca4a27ef77733d50931c1ac7d4034e4dc27108d6", + "rev": "9217468e9995ee26e759451d71f4acbe038370bf", "type": "github" }, "original": { diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index b587874..10105f8 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -9,32 +9,32 @@ fileSystems = { "/" = { - device = "/dev/mapper/enc"; + device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b"; fsType = "btrfs"; options = ["subvol=root"]; }; "/home" = { - device = "/dev/mapper/enc"; + device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b"; fsType = "btrfs"; options = ["subvol=home" "compress=zstd"]; }; "/nix" = { - device = "/dev/mapper/enc"; + device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b"; fsType = "btrfs"; options = ["subvol=nix" "compress=zstd" "noatime"]; }; "/persist" = { - device = "/dev/mapper/enc"; + device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b"; neededForBoot = true; fsType = "btrfs"; options = ["subvol=persist" "compress=zstd"]; }; "/var/log" = { - device = "/dev/mapper/enc"; + device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b"; fsType = "btrfs"; options = ["subvol=log" "compress=zstd" "noatime"]; neededForBoot = true; @@ -74,6 +74,12 @@ wheelNeedsPassword = false; execWheelOnly = true; }; + + tpm2 = { + enable = true; + pkcs11.enable = true; + tctiEnvironment.enable = true; + }; }; fonts = { @@ -105,16 +111,48 @@ console.catppuccin.enable = true; - systemd.user.extraConfig = let - path = lib.concatStringsSep ":" [ - "/run/wrappers/bin" - "/etc/profiles/per-user/%u/bin" - "/nix/var/nix/profiles/default/bin" - "/run/current-system/sw/bin" - ]; - in '' - DefaultEnvironment="PATH=${path}" - ''; + systemd = { + tpm2.enable = true; + + network.networks = { + "10-lan1" = { + DHCP = "yes"; + matchConfig.MACAddress = "04:42:1a:02:fe:f5"; + + dhcpV4Config.RouteMetric = 10; + dhcpV6Config.RouteMetric = 10; + + networkConfig = { + IPv6PrivacyExtensions = "yes"; + MulticastDNS = true; + }; + }; + + "10-wlan1" = { + DHCP = "yes"; + matchConfig.MACAddress = "64:49:7d:c1:01:10"; + + dhcpV4Config.RouteMetric = 40; + dhcpV6Config.RouteMetric = 40; + + networkConfig = { + IPv6PrivacyExtensions = "yes"; + MulticastDNS = true; + }; + }; + }; + + user.extraConfig = let + path = lib.concatStringsSep ":" [ + "/run/wrappers/bin" + "/etc/profiles/per-user/%u/bin" + "/nix/var/nix/profiles/default/bin" + "/run/current-system/sw/bin" + ]; + in '' + DefaultEnvironment="PATH=${path}" + ''; + }; age = { secrets.passwd.file = ../../../secrets/passwd.age; @@ -142,14 +180,15 @@ }; systemPackages = with pkgs; [ - inputs.agenix.packages.${system}.default ddccontrol-db - nautilus + inputs.agenix.packages.${system}.default looking-glass-client + nautilus + qemu snowfallorg.flake sound-theme-freedesktop + uutils-coreutils-noprefix virtio-win - qemu (warp-terminal.override {waylandSupport = true;}) winetricks wineWowPackages.staging @@ -160,10 +199,10 @@ persistence."/persist" = { hideMounts = true; directories = [ - "/etc/NetworkManager" "/etc/ssh" "/root/.ssh" "/var/lib/bluetooth" + "/var/lib/iwd" "/var/lib/libvirt" "/var/lib/nixos" "/var/lib/systemd/coredump" @@ -176,47 +215,68 @@ blacklistedKernelModules = ["nouveau" "i915"]; kernelPackages = pkgs.linuxPackages_cachyos; supportedFilesystems = ["btrfs" "ntfs"]; - - # Encrypted device - initrd.luks.devices."enc".device = "/dev/disk/by-uuid/9952fcd1-46eb-4c9c-ab7d-361d31fdb9a2"; tmp.useTmpfs = true; - initrd.postDeviceCommands = lib.mkAfter '' - mkdir /btrfs_tmp - mount /dev/dm-0 /btrfs_tmp - if [[ -e /btrfs_tmp/root ]]; then - mkdir -p /btrfs_tmp/old_roots - timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") - mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" - fi + initrd = { + # Encrypted device + luks.devices."enc".device = "/dev/disk/by-uuid/9952fcd1-46eb-4c9c-ab7d-361d31fdb9a2"; - delete_subvolume_recursively() { - IFS=$'\n' - for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + systemd = { + enable = true; + emergencyAccess = true; + dbus.enable = true; + + network = { + enable = true; + networks = { + inherit (config.systemd.network.networks) "10-lan1" "10-wlan1"; + }; + }; + + initrdBin = with pkgs; [ + iwd + nix + vim + ]; + + services.wipe-root = { + requires = ["dev-mapper-enc.device"]; + after = ["dev-mapper-enc.device"]; + wantedBy = ["initrd.target"]; + script = lib.mkAfter '' + mkdir /btrfs_tmp + mount /dev/mapper/enc /btrfs_tmp + if [[ -e /btrfs_tmp/root ]]; then + mkdir -p /btrfs_tmp/old_roots + timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") + mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + fi + + delete_subvolume_recursively() { + IFS=$'\n' + for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do delete_subvolume_recursively "/btrfs_tmp/$i" - done - btrfs subvolume delete "$1" - } + done + btrfs subvolume delete "$1" + } - for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do - delete_subvolume_recursively "$i" - done + for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do + delete_subvolume_recursively "$i" + done - btrfs subvolume create /btrfs_tmp/root - umount /btrfs_tmp - ''; - - plymouth = { - enable = true; - catppuccin.enable = true; + btrfs subvolume create /btrfs_tmp/root + umount /btrfs_tmp + ''; + }; + }; }; extraModprobeConfig = "options nvidia " + lib.concatStringsSep " " [ - "NVreg_UsePageAttributeTable=1" "NVreg_EnablePCIeGen3=1" "NVreg_RegistryDwords=RMUseSwI2c=0x01;RMI2cSpeed=100" + "NVreg_UsePageAttributeTable=1" ]; kernelParams = [ @@ -325,126 +385,6 @@ flake = "/home/marshall/nix-config"; }; - nix-ld = { - enable = true; - libraries = with pkgs; [ - SDL - SDL2 - SDL2_image - SDL2_mixer - SDL2_ttf - SDL_image - SDL_mixer - SDL_ttf - alsa-lib - at-spi2-atk - at-spi2-core - atk - bzip2 - cairo - cups - curlWithGnuTls - dbus - dbus-glib - desktop-file-utils - e2fsprogs - expat - flac - fontconfig - freeglut - freetype - fribidi - fuse - fuse3 - gdk-pixbuf - glew110 - glib - gmp - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-ugly - gst_all_1.gstreamer - gtk2 - harfbuzz - icu - keyutils.lib - libgcc - libGL - libGLU - libappindicator-gtk2 - libcaca - libcanberra - libcap - libclang.lib - libdbusmenu - libdrm - libgcrypt - libgpg-error - libidn - libjack2 - libjpeg - libmikmod - libogg - libpng12 - libpulseaudio - librsvg - libsamplerate - libthai - libtheora - libtiff - libudev0-shim - libusb1 - libuuid - libvdpau - libvorbis - libvpx - libxcrypt-legacy - libxkbcommon - libxml2 - mesa - nspr - nss - openssl - p11-kit - pango - pixman - python3 - speex - stdenv.cc.cc - tbb - udev - vulkan-loader - wayland - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXft - xorg.libXi - xorg.libXinerama - xorg.libXmu - xorg.libXrandr - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.libXxf86vm - xorg.libpciaccess - xorg.libxcb - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xkeyboardconfig - xz - zlib - ]; - }; - obs-studio = { enable = true; enableVirtualCamera = true; @@ -452,12 +392,13 @@ }; networking = { - useDHCP = lib.mkDefault true; - hostName = "navis"; firewall.enable = false; + networkmanager.enable = false; + hostName = "navis"; nameservers = ["1.1.1.1" "1.0.0.1"]; - networkmanager.dns = "none"; - networkmanager.enable = true; + useDHCP = lib.mkForce true; + useNetworkd = true; + wireless.iwd.enable = true; }; time = { @@ -505,9 +446,12 @@ pipewire = { enable = true; - alsa.enable = true; - alsa.support32Bit = true; pulse.enable = true; + + alsa = { + enable = true; + support32Bit = true; + }; }; }; @@ -515,10 +459,18 @@ mutableUsers = false; users.marshall = { - isNormalUser = true; - extraGroups = ["wheel" "gamemode" "libvirtd" "qemu-libvirtd" "disk" "networkmanager"]; - shell = pkgs.fish; hashedPasswordFile = config.age.secrets.passwd.path; + isNormalUser = true; + shell = pkgs.fish; + + extraGroups = [ + "disk" + "gamemode" + "libvirtd" + "qemu-libvirtd" + "tss" + "wheel" + ]; }; }; @@ -554,19 +506,17 @@ xdg.portal = { enable = true; - config = { - common = { - default = [ - "cosmic" - "gtk" - ]; - }; - }; + xdgOpenUsePortal = true; + + config.common.default = [ + "cosmic" + "gtk" + ]; + extraPortals = [ pkgs.xdg-desktop-portal-cosmic pkgs.xdg-desktop-portal-gtk ]; - xdgOpenUsePortal = true; }; system.stateVersion = "24.05"; diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json index 7d3337f..c014d69 100644 --- a/systems/x86_64-linux/navis/facter.json +++ b/systems/x86_64-linux/navis/facter.json @@ -30,6 +30,7 @@ "bluetooth" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -38,13 +39,16 @@ "number": 0 }, "base_class": { + "hex": "0115", "name": "Bluetooth Device", "value": 277 }, "vendor": { + "hex": "8087", "value": 32903 }, "device": { + "hex": "0032", "value": 50 }, "model": "Bluetooth Device", @@ -62,19 +66,23 @@ ], "detail": { "device_class": { + "hex": "00e0", "name": "wireless", "value": 224 }, "device_subclass": { + "hex": "0001", "name": "audio", "value": 1 }, "device_protocol": 1, "interface_class": { + "hex": "00e0", "name": "wireless", "value": 224 }, "interface_subclass": { + "hex": "0001", "name": "audio", "value": 1 }, @@ -101,6 +109,7 @@ "bluetooth" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -109,13 +118,16 @@ "number": 0 }, "base_class": { + "hex": "0115", "name": "Bluetooth Device", "value": 277 }, "vendor": { + "hex": "8087", "value": 32903 }, "device": { + "hex": "0032", "value": 50 }, "model": "Bluetooth Device", @@ -133,19 +145,23 @@ ], "detail": { "device_class": { + "hex": "00e0", "name": "wireless", "value": 224 }, "device_subclass": { + "hex": "0001", "name": "audio", "value": 1 }, "device_protocol": 1, "interface_class": { + "hex": "00e0", "name": "wireless", "value": 224 }, "interface_subclass": { + "hex": "0001", "name": "audio", "value": 1 }, @@ -174,6 +190,7 @@ "bridge" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -182,31 +199,39 @@ "number": 28 }, "base_class": { + "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { + "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { + "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "43bf", "value": 17343 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel PCI bridge", @@ -243,6 +268,7 @@ "bridge" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -251,27 +277,34 @@ "number": 31 }, "base_class": { + "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { + "hex": "0001", "name": "ISA bridge", "value": 1 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "438b", "value": 17291 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel ISA bridge", @@ -297,6 +330,7 @@ "bridge" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -305,31 +339,39 @@ "number": 1 }, "base_class": { + "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { + "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { + "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "9a01", "value": 39425 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0005", "value": 5 }, "model": "Intel PCI bridge", @@ -366,6 +408,7 @@ "bridge" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -374,31 +417,39 @@ "number": 27 }, "base_class": { + "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { + "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { + "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "43c0", "value": 17344 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel PCI bridge", @@ -435,6 +486,7 @@ "bridge" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -443,27 +495,34 @@ "number": 0 }, "base_class": { + "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { + "hex": "0000", "name": "Host bridge", "value": 0 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "9a26", "value": 39462 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0005", "value": 5 }, "model": "Intel Host bridge", @@ -489,6 +548,7 @@ "bridge" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -497,25 +557,31 @@ "number": 6 }, "base_class": { + "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { + "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { + "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "device": { + "hex": "9a0f", "value": 39439 }, "revision": { + "hex": "0005", "value": 5 }, "model": "Intel PCI bridge", @@ -552,6 +618,7 @@ "bridge" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -560,31 +627,39 @@ "number": 29 }, "base_class": { + "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { + "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { + "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "43b6", "value": 17334 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel PCI bridge", @@ -623,6 +698,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -631,18 +707,22 @@ "number": 0 }, "base_class": { + "hex": "010f", "name": "Camera", "value": 271 }, "vendor": { + "hex": "322e", "name": "Sonix Technology Co., Ltd.", "value": 12846 }, "device": { + "hex": "202c", "name": "USB2.0 HD UVC WebCam", "value": 8236 }, "revision": { + "hex": "0000", "name": "1.03", "value": 0 }, @@ -661,19 +741,23 @@ ], "detail": { "device_class": { + "hex": "00ef", "name": "miscellaneous", "value": 239 }, "device_subclass": { + "hex": "0002", "name": "comm", "value": 2 }, "device_protocol": 1, "interface_class": { + "hex": "000e", "name": "video", "value": 14 }, "interface_subclass": { + "hex": "0001", "name": "audio", "value": 1 }, @@ -682,10 +766,12 @@ "interface_alternate_setting": 0, "interface_association": { "function_class": { + "hex": "000e", "name": "video", "value": 14 }, "function_subclass": { + "hex": "0003", "name": "hid", "value": 3 }, @@ -713,6 +799,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -721,18 +808,22 @@ "number": 0 }, "base_class": { + "hex": "010f", "name": "Camera", "value": 271 }, "vendor": { + "hex": "322e", "name": "Sonix Technology Co., Ltd.", "value": 12846 }, "device": { + "hex": "202c", "name": "USB2.0 HD UVC WebCam", "value": 8236 }, "revision": { + "hex": "0000", "name": "1.03", "value": 0 }, @@ -751,19 +842,23 @@ ], "detail": { "device_class": { + "hex": "00ef", "name": "miscellaneous", "value": 239 }, "device_subclass": { + "hex": "0002", "name": "comm", "value": 2 }, "device_protocol": 1, "interface_class": { + "hex": "000e", "name": "video", "value": 14 }, "interface_subclass": { + "hex": "0002", "name": "comm", "value": 2 }, @@ -772,10 +867,12 @@ "interface_alternate_setting": 0, "interface_association": { "function_class": { + "hex": "000e", "name": "video", "value": 14 }, "function_subclass": { + "hex": "0003", "name": "hid", "value": 3 }, @@ -981,13 +1078,14 @@ "disk": [ { "index": 42, - "attached_to": 16, + "attached_to": 21, "class_list": [ "disk", "block_device", "nvme" ], "bus_type": { + "hex": "0096", "name": "NVME", "value": 150 }, @@ -996,114 +1094,38 @@ "number": 0 }, "base_class": { + "hex": "0106", "name": "Mass Storage Device", "value": 262 }, "sub_class": { + "hex": "0000", "name": "Disk", "value": 0 }, "vendor": { - "value": 5197 - }, - "sub_vendor": { - "value": 5197 - }, - "device": { - "name": "Samsung SSD 970 EVO Plus 1TB", - "value": 43016 - }, - "sub_device": { - "value": 43009 - }, - "serial": "S6S1NG0RA02239Z", - "model": "Samsung SSD 970 EVO Plus 1TB", - "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, - "minor": 0, - "range": 0 - }, - "unix_device_names": [ - "/dev/disk/by-diskseq/1", - "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NG0RA02239Z", - "/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/nvme0n1" - ], - "resources": [ - { - "type": "disk_geo", - "cylinders": 953869, - "heads": 64, - "sectors": 32, - "size": 0, - "geo_type": "logical" - }, - { - "type": "size", - "unit": "sectors", - "value_1": 1953525168, - "value_2": 512 - } - ], - "driver": "nvme", - "driver_module": "nvme", - "drivers": [ - "nvme" - ], - "driver_modules": [ - "nvme" - ] - }, - { - "index": 43, - "attached_to": 21, - "class_list": [ - "disk", - "block_device", - "nvme" - ], - "bus_type": { - "name": "NVME", - "value": 150 - }, - "slot": { - "bus": 0, - "number": 1 - }, - "base_class": { - "name": "Mass Storage Device", - "value": 262 - }, - "sub_class": { - "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", + "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, @@ -1116,7 +1138,7 @@ "/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" + "/dev/nvme0n1" ], "resources": [ { @@ -1142,6 +1164,95 @@ "driver_modules": [ "nvme" ] + }, + { + "index": 43, + "attached_to": 16, + "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": "144d", + "value": 5197 + }, + "sub_vendor": { + "hex": "144d", + "value": 5197 + }, + "device": { + "hex": "a808", + "name": "Samsung SSD 970 EVO Plus 1TB", + "value": 43016 + }, + "sub_device": { + "hex": "a801", + "value": 43009 + }, + "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", + "unix_device_number": { + "type": 98, + "major": 259, + "minor": 0, + "range": 0 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/1", + "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NG0RA02239Z", + "/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" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 953869, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 1953525168, + "value_2": 512 + } + ], + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ] } ], "graphics_card": [ @@ -1153,6 +1264,7 @@ "pci" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -1161,31 +1273,39 @@ "number": 0 }, "base_class": { + "hex": "0003", "name": "Display controller", "value": 3 }, "sub_class": { + "hex": "0000", "name": "VGA compatible controller", "value": 0 }, "pci_interface": { + "hex": "0000", "name": "VGA", "value": 0 }, "vendor": { + "hex": "10de", "name": "nVidia Corporation", "value": 4318 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "25a5", "value": 9637 }, "sub_device": { + "hex": "13fc", "value": 5116 }, "revision": { + "hex": "00a1", "value": 161 }, "model": "nVidia VGA compatible controller", @@ -1265,6 +1385,7 @@ "pci" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -1273,31 +1394,39 @@ "number": 2 }, "base_class": { + "hex": "0003", "name": "Display controller", "value": 3 }, "sub_class": { + "hex": "0000", "name": "VGA compatible controller", "value": 0 }, "pci_interface": { + "hex": "0000", "name": "VGA", "value": 0 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "9a68", "value": 39528 }, "sub_device": { + "hex": "13fc", "value": 5116 }, "revision": { + "hex": "0001", "value": 1 }, "model": "Intel VGA compatible controller", @@ -1364,6 +1493,7 @@ "hub" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -1372,17 +1502,21 @@ "number": 0 }, "base_class": { + "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { + "hex": "214b", "value": 8523 }, "device": { + "hex": "7250", "name": "USB2.0 HUB", "value": 29264 }, "revision": { + "hex": "0000", "name": "1.00", "value": 0 }, @@ -1401,19 +1535,23 @@ ], "detail": { "device_class": { + "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 1, "interface_class": { + "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1436,6 +1574,7 @@ "hub" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -1444,23 +1583,27 @@ "number": 0 }, "base_class": { + "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "name": "Linux 6.11.6-cachyos xhci-hcd", + "hex": "1d6b", + "name": "Linux 6.11.7-cachyos xhci-hcd", "value": 7531 }, "device": { + "hex": "0002", "name": "xHCI Host Controller", "value": 2 }, "revision": { + "hex": "0000", "name": "6.11", "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.11.6-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.11.7-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-0:1.0", "sysfs_bus_id": "3-0:1.0", "resources": [ @@ -1475,19 +1618,23 @@ ], "detail": { "device_class": { + "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 1, "interface_class": { + "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1510,6 +1657,7 @@ "hub" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -1518,17 +1666,21 @@ "number": 0 }, "base_class": { + "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { + "hex": "214b", "value": 8523 }, "device": { + "hex": "7250", "name": "USB2.0 HUB", "value": 29264 }, "revision": { + "hex": "0000", "name": "1.00", "value": 0 }, @@ -1547,19 +1699,23 @@ ], "detail": { "device_class": { + "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 1, "interface_class": { + "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1582,6 +1738,7 @@ "hub" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -1590,40 +1747,48 @@ "number": 0 }, "base_class": { + "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "name": "Linux 6.11.6-cachyos xhci-hcd", + "hex": "1d6b", + "name": "Linux 6.11.7-cachyos xhci-hcd", "value": 7531 }, "device": { + "hex": "0003", "name": "xHCI Host Controller", "value": 3 }, "revision": { + "hex": "0000", "name": "6.11", "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.11.6-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.11.7-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb4/4-0:1.0", "sysfs_bus_id": "4-0:1.0", "detail": { "device_class": { + "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 3, "interface_class": { + "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1646,6 +1811,7 @@ "hub" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -1654,23 +1820,27 @@ "number": 0 }, "base_class": { + "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "name": "Linux 6.11.6-cachyos xhci-hcd", + "hex": "1d6b", + "name": "Linux 6.11.7-cachyos xhci-hcd", "value": 7531 }, "device": { + "hex": "0002", "name": "xHCI Host Controller", "value": 2 }, "revision": { + "hex": "0000", "name": "6.11", "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.11.6-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.11.7-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ @@ -1685,19 +1855,23 @@ ], "detail": { "device_class": { + "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 1, "interface_class": { + "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1720,6 +1894,7 @@ "hub" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -1728,40 +1903,48 @@ "number": 0 }, "base_class": { + "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "name": "Linux 6.11.6-cachyos xhci-hcd", + "hex": "1d6b", + "name": "Linux 6.11.7-cachyos xhci-hcd", "value": 7531 }, "device": { + "hex": "0003", "name": "xHCI Host Controller", "value": 3 }, "revision": { + "hex": "0000", "name": "6.11", "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.11.6-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.11.7-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { "device_class": { + "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 3, "interface_class": { + "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1786,6 +1969,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -1794,40 +1978,45 @@ "number": 0 }, "base_class": { + "hex": "0108", "name": "Keyboard", "value": 264 }, "sub_class": { + "hex": "0000", "name": "Keyboard", "value": 0 }, "vendor": { + "hex": "046d", "name": "Logitech Inc.", "value": 1133 }, "device": { + "hex": "c547", "name": "USB Receiver", "value": 50503 }, "revision": { + "hex": "0000", "name": "4.02", "value": 0 }, "model": "Logitech USB Receiver", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.1/3-3.2.1:1.1", "sysfs_bus_id": "3-3.2.1:1.1", - "unix_device_name": "/dev/input/event13", + "unix_device_name": "/dev/input/event9", "unix_device_number": { "type": 99, "major": 13, - "minor": 77, + "minor": 73, "range": 1 }, "unix_device_names": [ "/dev/input/by-id/usb-Logitech_USB_Receiver-if01-event-kbd", "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.1:1.1-event-kbd", "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.1:1.1-event-kbd", - "/dev/input/event13" + "/dev/input/event9" ], "resources": [ { @@ -1841,19 +2030,23 @@ ], "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 }, @@ -1885,6 +2078,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -1893,22 +2087,27 @@ "number": 0 }, "base_class": { + "hex": "0108", "name": "Keyboard", "value": 264 }, "sub_class": { + "hex": "0000", "name": "Keyboard", "value": 0 }, "vendor": { + "hex": "3434", "name": "Keychron", "value": 13364 }, "device": { + "hex": "0260", "name": "Keychron K6 Pro", "value": 608 }, "revision": { + "hex": "0000", "name": "1.01", "value": 0 }, @@ -1940,19 +2139,23 @@ ], "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 }, @@ -1985,10 +2188,12 @@ "memory" ], "base_class": { + "hex": "0101", "name": "Internally Used Class", "value": 257 }, "sub_class": { + "hex": "0002", "name": "Main Memory", "value": 2 }, @@ -1997,7 +2202,7 @@ { "type": "mem", "base": 0, - "range": 67154268160, + "range": 67154280448, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -2017,18 +2222,22 @@ "monitor" ], "base_class": { + "hex": "0100", "name": "Monitor", "value": 256 }, "sub_class": { + "hex": "0002", "name": "LCD Monitor", "value": 2 }, "vendor": { + "hex": "10ac", "name": "DELL", "value": 4268 }, "device": { + "hex": "4239", "name": "DELL S2722DGM", "value": 16953 }, @@ -2191,6 +2400,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -2199,22 +2409,27 @@ "number": 0 }, "base_class": { + "hex": "0105", "name": "Mouse", "value": 261 }, "sub_class": { + "hex": "0003", "name": "USB Mouse", "value": 3 }, "vendor": { + "hex": "046d", "name": "Logitech Inc.", "value": 1133 }, "device": { + "hex": "c547", "name": "USB Receiver", "value": 50503 }, "revision": { + "hex": "0000", "name": "4.02", "value": 0 }, @@ -2233,11 +2448,11 @@ "unix_device_names": [ "/dev/input/mice" ], - "unix_device_name2": "/dev/input/mouse1", + "unix_device_name2": "/dev/input/mouse0", "unix_device_number2": { "type": 99, "major": 13, - "minor": 33, + "minor": 32, "range": 1 }, "resources": [ @@ -2252,19 +2467,23 @@ ], "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 }, @@ -2302,6 +2521,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -2310,22 +2530,27 @@ "number": 0 }, "base_class": { + "hex": "0105", "name": "Mouse", "value": 261 }, "sub_class": { + "hex": "0003", "name": "USB Mouse", "value": 3 }, "vendor": { + "hex": "3434", "name": "Keychron", "value": 13364 }, "device": { + "hex": "0260", "name": "Keychron K6 Pro", "value": 608 }, "revision": { + "hex": "0000", "name": "1.01", "value": 0 }, @@ -2344,11 +2569,11 @@ "unix_device_names": [ "/dev/input/mice" ], - "unix_device_name2": "/dev/input/mouse0", + "unix_device_name2": "/dev/input/mouse1", "unix_device_number2": { "type": 99, "major": 13, - "minor": 32, + "minor": 33, "range": 1 }, "resources": [ @@ -2363,19 +2588,23 @@ ], "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": "0000", "name": "per_interface", "value": 0 }, @@ -2415,6 +2644,7 @@ "pci" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -2423,26 +2653,33 @@ "number": 0 }, "base_class": { + "hex": "0002", "name": "Network controller", "value": 2 }, "sub_class": { + "hex": "0000", "name": "Ethernet controller", "value": 0 }, "vendor": { + "hex": "10ec", "value": 4332 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "8162", "value": 33122 }, "sub_device": { + "hex": "208f", "value": 8335 }, "revision": { + "hex": "0005", "value": 5 }, "model": "Ethernet controller", @@ -2519,6 +2756,7 @@ "wlan_card" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -2527,37 +2765,44 @@ "number": 0 }, "base_class": { + "hex": "0002", "name": "Network controller", "value": 2 }, "sub_class": { + "hex": "0082", "name": "WLAN controller", "value": 130 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "device": { + "hex": "2725", "value": 10021 }, "sub_device": { + "hex": "0024", "value": 36 }, "revision": { + "hex": "001a", "value": 26 }, "model": "Intel WLAN controller", "sysfs_id": "/devices/pci0000:00/0000:00:1c.0/0000:04:00.0", "sysfs_bus_id": "0000:04:00.0", "sysfs_iommu_group_id": 18, - "unix_device_name": "wlp4s0", + "unix_device_name": "wlan0", "unix_device_names": [ - "wlp4s0" + "wlan0" ], "resources": [ { @@ -2688,15 +2933,82 @@ "network_interface": [ { "index": 74, + "attached_to": 36, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "000a", + "name": "WLAN", + "value": 10 + }, + "model": "WLAN network interface", + "sysfs_id": "/class/net/wlan0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:04:00.0", + "unix_device_name": "wlan0", + "unix_device_names": [ + "wlan0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 54 + }, + { + "type": "phwaddr", + "address": 54 + } + ], + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ] + }, + { + "index": 75, + "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_name": "lo", + "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 }, @@ -2725,67 +3037,6 @@ "driver_modules": [ "r8169" ] - }, - { - "index": 75, - "attached_to": 36, - "class_list": [ - "network_interface" - ], - "base_class": { - "name": "Network Interface", - "value": 263 - }, - "sub_class": { - "name": "Ethernet", - "value": 1 - }, - "model": "Ethernet network interface", - "sysfs_id": "/class/net/wlp4s0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:04:00.0", - "unix_device_name": "wlp4s0", - "unix_device_names": [ - "wlp4s0" - ], - "resources": [ - { - "type": "hwaddr", - "address": 54 - }, - { - "type": "phwaddr", - "address": 54 - } - ], - "driver": "iwlwifi", - "driver_module": "iwlwifi", - "drivers": [ - "iwlwifi" - ], - "driver_modules": [ - "iwlwifi" - ] - }, - { - "index": 76, - "attached_to": 0, - "class_list": [ - "network_interface" - ], - "base_class": { - "name": "Network Interface", - "value": 263 - }, - "sub_class": { - "name": "Loopback", - "value": 0 - }, - "model": "Loopback network interface", - "sysfs_id": "/class/net/lo", - "unix_device_name": "lo", - "unix_device_names": [ - "lo" - ] } ], "pci": [ @@ -2797,6 +3048,7 @@ "unknown" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -2805,27 +3057,34 @@ "number": 8 }, "base_class": { + "hex": "0008", "name": "Generic system peripheral", "value": 8 }, "sub_class": { + "hex": "0080", "name": "System peripheral", "value": 128 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "9a11", "value": 39441 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0005", "value": 5 }, "model": "Intel System peripheral", @@ -2867,6 +3126,7 @@ "unknown" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -2875,27 +3135,34 @@ "number": 4 }, "base_class": { + "hex": "0011", "name": "Signal processing controller", "value": 17 }, "sub_class": { + "hex": "0080", "name": "Signal processing controller", "value": 128 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "9a03", "value": 39427 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0005", "value": 5 }, "model": "Intel Signal processing controller", @@ -2945,6 +3212,7 @@ "unknown" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -2953,27 +3221,34 @@ "number": 22 }, "base_class": { + "hex": "0007", "name": "Communication controller", "value": 7 }, "sub_class": { + "hex": "0080", "name": "Communication controller", "value": 128 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "43e0", "value": 17376 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel Communication controller", @@ -3023,6 +3298,7 @@ "unknown" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -3031,26 +3307,33 @@ "number": 31 }, "base_class": { + "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { + "hex": "0080", "value": 128 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "43a4", "value": 17316 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel Serial bus controller", @@ -3094,6 +3377,7 @@ "unknown" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -3102,26 +3386,33 @@ "number": 21 }, "base_class": { + "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { + "hex": "0080", "value": 128 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "43e8", "value": 17384 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel Serial bus controller", @@ -3171,6 +3462,7 @@ "unknown" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -3179,21 +3471,26 @@ "number": 20 }, "base_class": { + "hex": "0005", "name": "Memory controller", "value": 5 }, "sub_class": { + "hex": "0000", "name": "RAM memory", "value": 0 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "device": { + "hex": "43ef", "value": 17391 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel RAM memory", @@ -3237,6 +3534,7 @@ "unknown" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -3245,27 +3543,34 @@ "number": 31 }, "base_class": { + "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { + "hex": "0005", "name": "SMBus", "value": 5 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "43a3", "value": 17315 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel SMBus", @@ -3322,6 +3627,7 @@ "unknown" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -3330,21 +3636,26 @@ "number": 10 }, "base_class": { + "hex": "0011", "name": "Signal processing controller", "value": 17 }, "sub_class": { + "hex": "0080", "name": "Signal processing controller", "value": 128 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "device": { + "hex": "9a0d", "value": 39437 }, "revision": { + "hex": "0001", "value": 1 }, "model": "Intel Signal processing controller", @@ -3390,6 +3701,7 @@ "pci" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -3398,29 +3710,37 @@ "number": 31 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0003", "value": 3 }, "pci_interface": { + "hex": "0080", "value": 128 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "43c8", "value": 17352 }, "sub_device": { + "hex": "16f2", "value": 5874 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel Multimedia controller", @@ -3470,6 +3790,7 @@ "pci" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -3478,26 +3799,33 @@ "number": 0 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0003", "value": 3 }, "vendor": { + "hex": "10de", "name": "nVidia Corporation", "value": 4318 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "2291", "value": 8849 }, "sub_device": { + "hex": "13fc", "value": 5116 }, "revision": { + "hex": "00a1", "value": 161 }, "model": "nVidia Multimedia controller", @@ -3546,6 +3874,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -3554,22 +3883,27 @@ "number": 0 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0001", "name": "Multimedia audio controller", "value": 1 }, "vendor": { + "hex": "1038", "name": "SteelSeries", "value": 4152 }, "device": { + "hex": "12ad", "name": "SteelSeries Arctis 7", "value": 4781 }, "revision": { + "hex": "0000", "name": "1.19", "value": 0 }, @@ -3588,19 +3922,23 @@ ], "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": "0001", "name": "audio", "value": 1 }, "interface_subclass": { + "hex": "0002", "name": "comm", "value": 2 }, @@ -3627,6 +3965,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -3635,22 +3974,27 @@ "number": 0 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0001", "name": "Multimedia audio controller", "value": 1 }, "vendor": { + "hex": "1038", "name": "SteelSeries", "value": 4152 }, "device": { + "hex": "12ad", "name": "SteelSeries Arctis 7", "value": 4781 }, "revision": { + "hex": "0000", "name": "1.19", "value": 0 }, @@ -3669,19 +4013,23 @@ ], "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": "0001", "name": "audio", "value": 1 }, "interface_subclass": { + "hex": "0001", "name": "audio", "value": 1 }, @@ -3708,6 +4056,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -3716,21 +4065,26 @@ "number": 0 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0001", "name": "Multimedia audio controller", "value": 1 }, "vendor": { + "hex": "3142", "value": 12610 }, "device": { + "hex": "a008", "name": "fifine Microphone", "value": 40968 }, "revision": { + "hex": "0000", "name": "1.00", "value": 0 }, @@ -3749,19 +4103,23 @@ ], "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": "0001", "name": "audio", "value": 1 }, "interface_subclass": { + "hex": "0002", "name": "comm", "value": 2 }, @@ -3788,6 +4146,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -3796,22 +4155,27 @@ "number": 0 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0001", "name": "Multimedia audio controller", "value": 1 }, "vendor": { + "hex": "1038", "name": "SteelSeries", "value": 4152 }, "device": { + "hex": "12ad", "name": "SteelSeries Arctis 7", "value": 4781 }, "revision": { + "hex": "0000", "name": "1.19", "value": 0 }, @@ -3830,19 +4194,23 @@ ], "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": "0001", "name": "audio", "value": 1 }, "interface_subclass": { + "hex": "0001", "name": "audio", "value": 1 }, @@ -3869,6 +4237,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -3877,21 +4246,26 @@ "number": 0 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0001", "name": "Multimedia audio controller", "value": 1 }, "vendor": { + "hex": "3142", "value": 12610 }, "device": { + "hex": "a008", "name": "fifine Microphone", "value": 40968 }, "revision": { + "hex": "0000", "name": "1.00", "value": 0 }, @@ -3910,19 +4284,23 @@ ], "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": "0001", "name": "audio", "value": 1 }, "interface_subclass": { + "hex": "0001", "name": "audio", "value": 1 }, @@ -3949,6 +4327,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -3957,22 +4336,27 @@ "number": 0 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0001", "name": "Multimedia audio controller", "value": 1 }, "vendor": { + "hex": "1038", "name": "SteelSeries", "value": 4152 }, "device": { + "hex": "12ad", "name": "SteelSeries Arctis 7", "value": 4781 }, "revision": { + "hex": "0000", "name": "1.19", "value": 0 }, @@ -3991,19 +4375,23 @@ ], "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": "0001", "name": "audio", "value": 1 }, "interface_subclass": { + "hex": "0002", "name": "comm", "value": 2 }, @@ -4030,6 +4418,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4038,22 +4427,27 @@ "number": 0 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0001", "name": "Multimedia audio controller", "value": 1 }, "vendor": { + "hex": "1038", "name": "SteelSeries", "value": 4152 }, "device": { + "hex": "12ad", "name": "SteelSeries Arctis 7", "value": 4781 }, "revision": { + "hex": "0000", "name": "1.19", "value": 0 }, @@ -4072,19 +4466,23 @@ ], "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": "0001", "name": "audio", "value": 1 }, "interface_subclass": { + "hex": "0002", "name": "comm", "value": 2 }, @@ -4111,6 +4509,7 @@ "usb" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4119,21 +4518,26 @@ "number": 0 }, "base_class": { + "hex": "0004", "name": "Multimedia controller", "value": 4 }, "sub_class": { + "hex": "0001", "name": "Multimedia audio controller", "value": 1 }, "vendor": { + "hex": "3142", "value": 12610 }, "device": { + "hex": "a008", "name": "fifine Microphone", "value": 40968 }, "revision": { + "hex": "0000", "name": "1.00", "value": 0 }, @@ -4152,19 +4556,23 @@ ], "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": "0001", "name": "audio", "value": 1 }, "interface_subclass": { + "hex": "0002", "name": "comm", "value": 2 }, @@ -4193,6 +4601,7 @@ "pci" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -4201,25 +4610,32 @@ "number": 0 }, "base_class": { + "hex": "0001", "name": "Mass storage controller", "value": 1 }, "sub_class": { + "hex": "0008", "value": 8 }, "pci_interface": { + "hex": "0002", "value": 2 }, "vendor": { + "hex": "144d", "value": 5197 }, "sub_vendor": { + "hex": "144d", "value": 5197 }, "device": { + "hex": "a808", "value": 43016 }, "sub_device": { + "hex": "a801", "value": 43009 }, "model": "Mass storage controller", @@ -4268,6 +4684,7 @@ "pci" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -4276,25 +4693,32 @@ "number": 0 }, "base_class": { + "hex": "0001", "name": "Mass storage controller", "value": 1 }, "sub_class": { + "hex": "0008", "value": 8 }, "pci_interface": { + "hex": "0002", "value": 2 }, "vendor": { + "hex": "1c5c", "value": 7260 }, "sub_vendor": { + "hex": "1c5c", "value": 7260 }, "device": { + "hex": "174a", "value": 5962 }, "sub_device": { + "hex": "174a", "value": 5962 }, "model": "Mass storage controller", @@ -4364,6 +4788,7 @@ "unknown" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4372,22 +4797,27 @@ "number": 0 }, "base_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { + "hex": "046d", "name": "Logitech Inc.", "value": 1133 }, "device": { + "hex": "c547", "name": "USB Receiver", "value": 50503 }, "revision": { + "hex": "0000", "name": "4.02", "value": 0 }, @@ -4406,19 +4836,23 @@ ], "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": "0000", "name": "per_interface", "value": 0 }, @@ -4445,6 +4879,7 @@ "unknown" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4453,22 +4888,27 @@ "number": 0 }, "base_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { + "hex": "045e", "name": "Microsoft", "value": 1118 }, "device": { + "hex": "0b12", "name": "Controller", "value": 2834 }, "revision": { + "hex": "0000", "name": "5.0d", "value": 0 }, @@ -4488,19 +4928,23 @@ ], "detail": { "device_class": { + "hex": "00ff", "name": "vendor_spec", "value": 255 }, "device_subclass": { + "hex": "0047", "name": "UsbClass(71)", "value": 71 }, "device_protocol": 208, "interface_class": { + "hex": "00ff", "name": "vendor_spec", "value": 255 }, "interface_subclass": { + "hex": "0047", "name": "UsbClass(71)", "value": 71 }, @@ -4519,6 +4963,7 @@ "unknown" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4527,22 +4972,27 @@ "number": 0 }, "base_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { + "hex": "3434", "name": "Keychron", "value": 13364 }, "device": { + "hex": "0260", "name": "Keychron K6 Pro", "value": 608 }, "revision": { + "hex": "0000", "name": "1.01", "value": 0 }, @@ -4561,19 +5011,23 @@ ], "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": "0000", "name": "per_interface", "value": 0 }, @@ -4600,6 +5054,7 @@ "unknown" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4608,40 +5063,42 @@ "number": 0 }, "base_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { + "hex": "1038", "name": "SteelSeries", "value": 4152 }, "device": { + "hex": "12ad", "name": "SteelSeries Arctis 7", "value": 4781 }, "revision": { + "hex": "0000", "name": "1.19", "value": 0 }, "model": "SteelSeries Arctis 7", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.5", "sysfs_bus_id": "3-3.1:1.5", - "unix_device_name": "/dev/input/event11", + "unix_device_name": "/dev/input/event13", "unix_device_number": { "type": 99, "major": 13, - "minor": 75, + "minor": 77, "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.1:1.5-event", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.1:1.5-event", - "/dev/input/event11" + "/dev/input/event13" ], "resources": [ { @@ -4655,19 +5112,23 @@ ], "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": "0000", "name": "per_interface", "value": 0 }, @@ -4694,6 +5155,7 @@ "unknown" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4702,22 +5164,27 @@ "number": 0 }, "base_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { + "hex": "045e", "name": "Microsoft", "value": 1118 }, "device": { + "hex": "0b12", "name": "Controller", "value": 2834 }, "revision": { + "hex": "0000", "name": "5.0d", "value": 0 }, @@ -4737,19 +5204,23 @@ ], "detail": { "device_class": { + "hex": "00ff", "name": "vendor_spec", "value": 255 }, "device_subclass": { + "hex": "0047", "name": "UsbClass(71)", "value": 71 }, "device_protocol": 208, "interface_class": { + "hex": "00ff", "name": "vendor_spec", "value": 255 }, "interface_subclass": { + "hex": "0047", "name": "UsbClass(71)", "value": 71 }, @@ -4768,6 +5239,7 @@ "unknown" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4776,22 +5248,27 @@ "number": 0 }, "base_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { + "hex": "045e", "name": "Microsoft", "value": 1118 }, "device": { + "hex": "0b12", "name": "Controller", "value": 2834 }, "revision": { + "hex": "0000", "name": "5.0d", "value": 0 }, @@ -4824,19 +5301,23 @@ ], "detail": { "device_class": { + "hex": "00ff", "name": "vendor_spec", "value": 255 }, "device_subclass": { + "hex": "0047", "name": "UsbClass(71)", "value": 71 }, "device_protocol": 208, "interface_class": { + "hex": "00ff", "name": "vendor_spec", "value": 255 }, "interface_subclass": { + "hex": "0047", "name": "UsbClass(71)", "value": 71 }, @@ -4863,6 +5344,7 @@ "unknown" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4871,21 +5353,26 @@ "number": 0 }, "base_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { + "hex": "3142", "value": 12610 }, "device": { + "hex": "a008", "name": "fifine Microphone", "value": 40968 }, "revision": { + "hex": "0000", "name": "1.00", "value": 0 }, @@ -4917,19 +5404,23 @@ ], "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": "0000", "name": "per_interface", "value": 0 }, @@ -4956,6 +5447,7 @@ "unknown" ], "bus_type": { + "hex": "0086", "name": "USB", "value": 134 }, @@ -4964,22 +5456,27 @@ "number": 0 }, "base_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { + "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { + "hex": "2109", "name": "VIA Technologies Inc.", "value": 8457 }, "device": { + "hex": "0103", "name": "USB 2.0 BILLBOARD", "value": 259 }, "revision": { + "hex": "0000", "name": "2.00", "value": 0 }, @@ -4999,19 +5496,23 @@ ], "detail": { "device_class": { + "hex": "0011", "name": "billboard", "value": 17 }, "device_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 0, "interface_class": { + "hex": "0011", "name": "billboard", "value": 17 }, "interface_subclass": { + "hex": "0000", "name": "per_interface", "value": 0 }, @@ -5032,6 +5533,7 @@ "pci" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -5040,24 +5542,30 @@ "number": 13 }, "base_class": { + "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { + "hex": "0003", "name": "USB Controller", "value": 3 }, "pci_interface": { + "hex": "0030", "value": 48 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "device": { + "hex": "9a17", "value": 39447 }, "revision": { + "hex": "0005", "value": 5 }, "model": "Intel USB Controller", @@ -5107,6 +5615,7 @@ "pci" ], "bus_type": { + "hex": "0004", "name": "PCI", "value": 4 }, @@ -5115,30 +5624,38 @@ "number": 20 }, "base_class": { + "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { + "hex": "0003", "name": "USB Controller", "value": 3 }, "pci_interface": { + "hex": "0030", "value": 48 }, "vendor": { + "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { + "hex": "1043", "value": 4163 }, "device": { + "hex": "43ed", "value": 17389 }, "sub_device": { + "hex": "201f", "value": 8223 }, "revision": { + "hex": "0011", "value": 17 }, "model": "Intel USB Controller", @@ -5220,6 +5737,7 @@ "product": "FX506HCB", "version": "1.0", "board_type": { + "hex": "000a", "name": "Motherboard", "value": 10 }, @@ -5238,25 +5756,30 @@ "size_current": 288, "speed": 0, "mode": { + "hex": "0001", "name": "Write Back", "value": 1 }, "enabled": true, "location": { + "hex": "0000", "name": "Internal", "value": 0 }, "socketed": false, "level": 0, "ecc": { + "hex": "0004", "name": "Parity", "value": 4 }, "cache_type": { + "hex": "0004", "name": "Data", "value": 4 }, "associativity": { + "hex": "0009", "name": "Other", "value": 9 }, @@ -5274,25 +5797,30 @@ "size_current": 192, "speed": 0, "mode": { + "hex": "0001", "name": "Write Back", "value": 1 }, "enabled": true, "location": { + "hex": "0000", "name": "Internal", "value": 0 }, "socketed": false, "level": 0, "ecc": { + "hex": "0004", "name": "Parity", "value": 4 }, "cache_type": { + "hex": "0003", "name": "Instruction", "value": 3 }, "associativity": { + "hex": "0007", "name": "8-way Set-Associative", "value": 7 }, @@ -5310,25 +5838,30 @@ "size_current": 7680, "speed": 0, "mode": { + "hex": "0001", "name": "Write Back", "value": 1 }, "enabled": true, "location": { + "hex": "0000", "name": "Internal", "value": 0 }, "socketed": false, "level": 1, "ecc": { + "hex": "0005", "name": "Single-bit", "value": 5 }, "cache_type": { + "hex": "0005", "name": "Unified", "value": 5 }, "associativity": { + "hex": "0001", "name": "Other", "value": 1 }, @@ -5346,25 +5879,30 @@ "size_current": 12288, "speed": 0, "mode": { + "hex": "0001", "name": "Write Back", "value": 1 }, "enabled": true, "location": { + "hex": "0000", "name": "Internal", "value": 0 }, "socketed": false, "level": 2, "ecc": { + "hex": "0006", "name": "Multi-bit", "value": 6 }, "cache_type": { + "hex": "0005", "name": "Unified", "value": 5 }, "associativity": { + "hex": "0007", "name": "8-way Set-Associative", "value": 7 }, @@ -5381,23 +5919,28 @@ "manufacturer": "ASUSTeK COMPUTER INC.", "version": "1.0", "chassis_type": { + "hex": "000a", "name": "Notebook", "value": 10 }, "lock_present": false, "bootup_state": { + "hex": "0003", "name": "Safe", "value": 3 }, "power_state": { + "hex": "0003", "name": "Safe", "value": 3 }, "thermal_state": { + "hex": "0003", "name": "Safe", "value": 3 }, "security_state": { + "hex": "0003", "name": "None", "value": 3 }, @@ -5448,14 +5991,17 @@ { "handle": 58, "location": { + "hex": "0003", "name": "Motherboard", "value": 3 }, "usage": { + "hex": "0003", "name": "System memory", "value": 3 }, "ecc": { + "hex": "0003", "name": "None", "value": 3 }, @@ -5486,11 +6032,13 @@ "ecc_bits": 0, "size": 0, "form_factor": { + "hex": "0002", "name": "Unknown", "value": 2 }, "set": 0, "memory_type": { + "hex": "0002", "name": "Unknown", "value": 2 }, @@ -5509,11 +6057,13 @@ "ecc_bits": 0, "size": 0, "form_factor": { + "hex": "0002", "name": "Unknown", "value": 2 }, "set": 0, "memory_type": { + "hex": "0002", "name": "Unknown", "value": 2 }, @@ -5532,11 +6082,13 @@ "ecc_bits": 0, "size": 33554432, "form_factor": { + "hex": "000d", "name": "SODIMM", "value": 13 }, "set": 0, "memory_type": { + "hex": "001a", "name": "Other", "value": 26 }, @@ -5557,11 +6109,13 @@ "ecc_bits": 0, "size": 33554432, "form_factor": { + "hex": "000d", "name": "SODIMM", "value": 13 }, "set": 0, "memory_type": { + "hex": "001a", "name": "Other", "value": 26 }, @@ -5600,6 +6154,7 @@ { "name": "Device 1", "type": { + "hex": "0002", "name": "Unknown", "value": 2 }, @@ -5642,11 +6197,13 @@ { "handle": 105, "port_type": { + "hex": "000d", "name": "Keyboard Port", "value": 13 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "000f", "name": "PS/2", "value": 15 }, @@ -5655,11 +6212,13 @@ { "handle": 106, "port_type": { + "hex": "000e", "name": "Mouse Port", "value": 14 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "000f", "name": "PS/2", "value": 15 }, @@ -5668,10 +6227,12 @@ { "handle": 107, "port_type": { + "hex": "0009", "name": "Serial Port 16550A Compatible", "value": 9 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5681,15 +6242,18 @@ { "handle": 108, "port_type": { + "hex": "001c", "name": "Video Port", "value": 28 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_reference_designator": "J1A2B", "external_connector_type": { + "hex": "0007", "name": "DB-15 pin female", "value": 7 }, @@ -5698,10 +6262,12 @@ { "handle": 109, "port_type": { + "hex": "001c", "name": "Video Port", "value": 28 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5711,11 +6277,13 @@ { "handle": 110, "port_type": { + "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -5724,11 +6292,13 @@ { "handle": 111, "port_type": { + "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -5737,11 +6307,13 @@ { "handle": 112, "port_type": { + "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -5750,11 +6322,13 @@ { "handle": 113, "port_type": { + "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -5763,11 +6337,13 @@ { "handle": 114, "port_type": { + "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -5776,11 +6352,13 @@ { "handle": 115, "port_type": { + "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -5789,11 +6367,13 @@ { "handle": 116, "port_type": { + "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -5802,11 +6382,13 @@ { "handle": 117, "port_type": { + "hex": "001f", "name": "Network Port", "value": 31 }, "internal_reference_designator": "None", "external_connector_type": { + "hex": "000b", "name": "RJ-45", "value": 11 }, @@ -5815,11 +6397,13 @@ { "handle": 118, "port_type": { + "hex": "0020", "name": "Other", "value": 32 }, "internal_reference_designator": "J8J1", "external_connector_type": { + "hex": "0022", "name": "Other", "value": 34 }, @@ -5828,11 +6412,13 @@ { "handle": 119, "port_type": { + "hex": "0020", "name": "Other", "value": 32 }, "internal_reference_designator": "J7J1", "external_connector_type": { + "hex": "0022", "name": "Other", "value": 34 }, @@ -5841,11 +6427,13 @@ { "handle": 120, "port_type": { + "hex": "0020", "name": "Other", "value": 32 }, "internal_reference_designator": "J6J1", "external_connector_type": { + "hex": "0022", "name": "Other", "value": 34 }, @@ -5854,10 +6442,12 @@ { "handle": 121, "port_type": { + "hex": "0020", "name": "Other", "value": 32 }, "internal_connector_type": { + "hex": "0022", "name": "Other", "value": 34 }, @@ -5867,10 +6457,12 @@ { "handle": 122, "port_type": { + "hex": "0020", "name": "Other", "value": 32 }, "internal_connector_type": { + "hex": "0022", "name": "Other", "value": 34 }, @@ -5880,11 +6472,13 @@ { "handle": 123, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_reference_designator": "J1F2", "external_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5893,10 +6487,12 @@ { "handle": 124, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5906,10 +6502,12 @@ { "handle": 125, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5919,10 +6517,12 @@ { "handle": 126, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5932,10 +6532,12 @@ { "handle": 127, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5945,10 +6547,12 @@ { "handle": 128, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5958,10 +6562,12 @@ { "handle": 129, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5971,10 +6577,12 @@ { "handle": 130, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5984,10 +6592,12 @@ { "handle": 131, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -5997,10 +6607,12 @@ { "handle": 132, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6010,10 +6622,12 @@ { "handle": 133, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6023,10 +6637,12 @@ { "handle": 134, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6036,10 +6652,12 @@ { "handle": 135, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6049,10 +6667,12 @@ { "handle": 136, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6062,10 +6682,12 @@ { "handle": 137, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6075,10 +6697,12 @@ { "handle": 138, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6088,10 +6712,12 @@ { "handle": 139, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6101,10 +6727,12 @@ { "handle": 140, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6114,10 +6742,12 @@ { "handle": 141, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6127,10 +6757,12 @@ { "handle": 142, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6140,10 +6772,12 @@ { "handle": 143, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6153,10 +6787,12 @@ { "handle": 144, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6166,10 +6802,12 @@ { "handle": 145, "port_type": { + "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { + "hex": "00ff", "name": "Other", "value": 255 }, @@ -6182,6 +6820,7 @@ "handle": 77, "socket": "U3E1", "socket_type": { + "hex": "0001", "name": "Other", "value": 1 }, @@ -6190,14 +6829,17 @@ "version": "11th Gen Intel(R) Core(TM) i5-11260H @ 2.60GHz", "part": "To Be Filled By O.E.M.", "processor_type": { + "hex": "0003", "name": "CPU", "value": 3 }, "processor_family": { + "hex": "00cd", "name": "Other", "value": 205 }, "processor_status": { + "hex": "0001", "name": "Enabled", "value": 1 }, @@ -6213,18 +6855,22 @@ "handle": 9, "designation": "Slot 1", "slot_type": { + "hex": "00a6", "name": "Other", "value": 166 }, "bus_width": { + "hex": "0005", "name": "32 bit", "value": 5 }, "usage": { + "hex": "0003", "name": "Available", "value": 3 }, "length": { + "hex": "0003", "name": "Short", "value": 3 }, @@ -6238,18 +6884,22 @@ "handle": 16, "designation": "Slot 2", "slot_type": { + "hex": "00a6", "name": "Other", "value": 166 }, "bus_width": { + "hex": "0005", "name": "32 bit", "value": 5 }, "usage": { + "hex": "0003", "name": "Available", "value": 3 }, "length": { + "hex": "0003", "name": "Short", "value": 3 }, @@ -6263,18 +6913,22 @@ "handle": 17, "designation": "Slot 3", "slot_type": { + "hex": "00a6", "name": "Other", "value": 166 }, "bus_width": { + "hex": "0005", "name": "32 bit", "value": 5 }, "usage": { + "hex": "0003", "name": "Available", "value": 3 }, "length": { + "hex": "0003", "name": "Short", "value": 3 }, @@ -6288,18 +6942,22 @@ "handle": 18, "designation": "Slot 4", "slot_type": { + "hex": "00a6", "name": "Other", "value": 166 }, "bus_width": { + "hex": "0005", "name": "32 bit", "value": 5 }, "usage": { + "hex": "0003", "name": "Available", "value": 3 }, "length": { + "hex": "0003", "name": "Short", "value": 3 }, @@ -6313,18 +6971,22 @@ "handle": 19, "designation": "Slot 5", "slot_type": { + "hex": "00a6", "name": "Other", "value": 166 }, "bus_width": { + "hex": "0005", "name": "32 bit", "value": 5 }, "usage": { + "hex": "0003", "name": "Available", "value": 3 }, "length": { + "hex": "0003", "name": "Short", "value": 3 }, @@ -6341,9 +7003,10 @@ "product": "ASUS TUF Gaming F15 FX506HCB_FX506HCB", "version": "1.0", "wake_up": { + "hex": "0006", "name": "Power Switch", "value": 6 } } } -} \ No newline at end of file +} diff --git a/systems/x86_64-linux/polaris-nix/facter.json b/systems/x86_64-linux/polaris-nix/facter.json index b60231c..dec5f88 100644 --- a/systems/x86_64-linux/polaris-nix/facter.json +++ b/systems/x86_64-linux/polaris-nix/facter.json @@ -2007,4 +2007,4 @@ } } } -} \ No newline at end of file +}