From 1c04408e9f28cca6bb07a9106613be6edc0a18e3 Mon Sep 17 00:00:00 2001 From: pupbrained Date: Sun, 24 Nov 2024 23:38:18 -0500 Subject: [PATCH] weh --- _sources/generated.json | 344 +-- _sources/generated.nix | 4 +- flake.lock | 194 +- homes/x86_64-linux/marshall@navis/default.nix | 27 +- systems/x86_64-linux/navis/default.nix | 4 +- systems/x86_64-linux/navis/facter.json | 1862 +++-------------- 6 files changed, 641 insertions(+), 1794 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index ce3c3a4..257518a 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" + "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" }, - "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" + "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": "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" + "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": "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" + "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": "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" + "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": "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" + "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": "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" + "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": "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" + "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": "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" + "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" - }, - "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" - } -} + "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 diff --git a/_sources/generated.nix b/_sources/generated.nix index 5a66199..e86c697 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -1,8 +1,6 @@ # This file was generated by nvfetcher, please do not modify it manually. +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { - fetchurl, - fetchFromGitHub, -}: { bang-bang = { pname = "bang-bang"; version = "ec991b80ba7d4dda7a962167b036efc5c2d79419"; diff --git a/flake.lock b/flake.lock index af6a2e5..086817b 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1731496216, - "narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=", + "lastModified": 1731774881, + "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59", + "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1731549423, - "narHash": "sha256-856g6/DYtrC+O9yRlksrKaEWP3jDgJQ9UMmQx/twxBc=", + "lastModified": 1732400024, + "narHash": "sha256-uf1QzIl0Jj5dr7+erWjHWiCUEvywLaR7ir1jcqGgjeQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "c37212a15dd0dc472d75df4c21c092d1cc9df897", + "rev": "376a2e022a5d8fa21cecb5bb0fef0cb54db5cdfc", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731381599, - "narHash": "sha256-W+FuVxCdCiw7IaAWPajq9iOuM57zITFnbkw2ZQXfW9I=", + "lastModified": 1732412226, + "narHash": "sha256-Eb7LqtaCVgZy5Kp3pMrRTAmcnFO7HGj6lpAM2TrQzTA=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "23976d5dac8b0f07187bc3c95e3812304519e5e3", + "rev": "44c9057ebbf4eb41cff08b8fc9c952b3f977656a", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1731454423, - "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", + "lastModified": 1732420287, + "narHash": "sha256-CzvYF4x6jUh/+NEEIFrIY5t1W/N3IA2bNZJiMXu9GTo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", + "rev": "3c52583b99666a349a6219dc1f0dd07d75c82d6a", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1731448710, - "narHash": "sha256-uNxfr/i8m9oyMPUxlagmOm+qQ4erUB0Pq2sRtR4qFV4=", + "lastModified": 1732231026, + "narHash": "sha256-tuqod7g+1+PvtUXUlLl4MwY9B+gr4rAEOGvhmhtWLbE=", "owner": "DeterminateSystems", "repo": "determinate", - "rev": "e8698104b97ce6bce0ce6bbd46d82dccabfffd1d", + "rev": "29b7b7dfb1c878267383aa91c357ef464bef0f0d", "type": "github" }, "original": { @@ -221,37 +221,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-XSYDoC2gHke98y83pABOnNT0E2jGE0qo1yBzY0b7/I0=", + "narHash": "sha256-6E9DFC4lTpjmErG2TvV7rIS1tiyGZZYg0Kd4pT5GOkU=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-MfKT7oYAZ1BxVpsFA4SRNYxh+2fQScESO67UJy+8gQY=", + "narHash": "sha256-CnbFYAL7dAl8qBIvAFMVjW4KpQgmWlghnK3qfoLEP8Q=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-N6ufU3p/8ooUsElSmPTArgfqCWj0emuDdLgkCFZ1ksE=", + "narHash": "sha256-0w3gbvncDwukX4PHVWeOZeD6F6vsEuePoNOIlAvdEq0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" } }, "devshell": { @@ -886,11 +886,11 @@ ] }, "locked": { - "lastModified": 1731535640, - "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", + "lastModified": 1732303962, + "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b055009afd0107b69c286fca34d2ad98940d57", + "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", "type": "github" }, "original": { @@ -906,11 +906,11 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -984,11 +984,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731616696, - "narHash": "sha256-WS7B8lo4zoKZ4K5Djl7GhFdP4trs5TXpKmSTIyNkUCA=", + "lastModified": 1732495835, + "narHash": "sha256-oYYRexPAQ5XpqpwQbr0yU14+UJqEsDHQeBuLEVLx4Bg=", "ref": "refs/heads/main", - "rev": "940ed3d525d838bc255070bd8cfc2f75df04229a", - "revCount": 5454, + "rev": "1930a95000d336b76d18c0c95ef77e138c9a4cd0", + "revCount": 5495, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1016,11 +1016,11 @@ ] }, "locked": { - "lastModified": 1731619734, - "narHash": "sha256-ZroMITOTQ3eu6z+3m7DJtaKePJWDTPuElkgmKl3rl9g=", + "lastModified": 1732053779, + "narHash": "sha256-v9FS0r2XWMf/+uwevvzaF/2TimMFeLEQTf4T8cgc6c0=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2", + "rev": "0bc619b2c3b4f9c2b65247e81d69f8bbc573d991", "type": "github" }, "original": { @@ -1095,11 +1095,11 @@ ] }, "locked": { - "lastModified": 1731518387, - "narHash": "sha256-aZZw1ZvTMLkcA6udlvkA3hrCkuipoWLy8s/JNnIclxY=", + "lastModified": 1731702627, + "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "315fba5d21d87ddb756d4bebdb49f99d86b0ffe8", + "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", "type": "github" }, "original": { @@ -1187,11 +1187,11 @@ ] }, "locked": { - "lastModified": 1731227601, - "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", + "lastModified": 1732032028, + "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", + "rev": "65dc04371cf914c9af4f073638821e4787303005", "type": "github" }, "original": { @@ -1306,11 +1306,11 @@ ] }, "locked": { - "lastModified": 1731593150, - "narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=", + "lastModified": 1732461762, + "narHash": "sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "40d882b55e89add1ded379cc99edaab24983d6d9", + "rev": "bedc30c64442579943c1c6e7579db263d810884f", "type": "github" }, "original": { @@ -1344,11 +1344,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1731425281, - "narHash": "sha256-azk9oxzHkfYZcgBzAK3J9qdUQG0UjLSOjt8KzJ9rb8g=", + "lastModified": 1732288619, + "narHash": "sha256-zSQ2cR+NRJfHUVfkv+O6Wi53wXfzX8KHiO8fRfnvc0M=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "505386dda29452140f93734509b03de57986af57", + "rev": "862648589993a96480c2255197a28feea712f68f", "type": "github" }, "original": { @@ -1422,11 +1422,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -1470,11 +1470,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -1549,11 +1549,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -1579,12 +1579,12 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", - "revCount": 704822, + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "rev": "5083ec887760adfe12af64830a66807423a859a7", + "revCount": 709559, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.704822%2Brev-85f7e662eda4fa3a995556527c87b2524b691933/01931edf-608b-7333-a7d9-7240678d1fba/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.709559%2Brev-5083ec887760adfe12af64830a66807423a859a7/019342ec-4762-77f2-9a11-86e7601b0be4/source.tar.gz" }, "original": { "id": "nixpkgs", @@ -1607,12 +1607,12 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", - "revCount": 704822, + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "rev": "5083ec887760adfe12af64830a66807423a859a7", + "revCount": 709559, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.704822%2Brev-85f7e662eda4fa3a995556527c87b2524b691933/01931edf-608b-7333-a7d9-7240678d1fba/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.709559%2Brev-5083ec887760adfe12af64830a66807423a859a7/019342ec-4762-77f2-9a11-86e7601b0be4/source.tar.gz" }, "original": { "id": "nixpkgs", @@ -1621,11 +1621,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -1683,12 +1683,12 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", - "revCount": 704822, + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "rev": "5083ec887760adfe12af64830a66807423a859a7", + "revCount": 709559, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.704822%2Brev-85f7e662eda4fa3a995556527c87b2524b691933/01931edf-608b-7333-a7d9-7240678d1fba/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.709559%2Brev-5083ec887760adfe12af64830a66807423a859a7/019342ec-4762-77f2-9a11-86e7601b0be4/source.tar.gz" }, "original": { "type": "tarball", @@ -1745,11 +1745,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -1889,11 +1889,11 @@ ] }, "locked": { - "lastModified": 1731292155, - "narHash": "sha256-fYVoUUtSadbOrH0z0epVQDsStBDS/S/fAK//0ECQAAI=", + "lastModified": 1732328983, + "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7c4cd99ed7604b79e8cb721099ac99c66f656b3a", + "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "type": "github" }, "original": { @@ -2199,11 +2199,11 @@ "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1732292307, + "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "705df92694af7093dfbb27109ce16d828a79155f", "type": "github" }, "original": { @@ -2214,11 +2214,11 @@ }, "unstable": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -2256,11 +2256,11 @@ ] }, "locked": { - "lastModified": 1730743262, - "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", + "lastModified": 1731703417, + "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", + "rev": "8070f36deec723de71e7557441acb17e478204d3", "type": "github" }, "original": { @@ -2277,11 +2277,11 @@ "unstable": "unstable" }, "locked": { - "lastModified": 1728318022, - "narHash": "sha256-JYDe/lNgfiWl+QXZDtaLuU3sscybO9XQVupiFsoUInE=", + "lastModified": 1731735867, + "narHash": "sha256-eaC4wCtkpj/jvpc0X+7B/DI7p479lQEq1aPcf52V4EY=", "owner": "xmonad", "repo": "xmonad", - "rev": "eba9e97794705349f9c6a50230bb88b8ef7d539a", + "rev": "81cf71d7c6807fba14c1000aa40bfee84f7fa0e1", "type": "github" }, "original": { @@ -2298,11 +2298,11 @@ "xmonad": "xmonad" }, "locked": { - "lastModified": 1729508337, - "narHash": "sha256-63EwF+O5y/MQm7cBihGpvhl2w7nYUSV9MhpfqooN5UA=", + "lastModified": 1732441885, + "narHash": "sha256-SKl/9dmpWpAs30YgQfB7jpdJuUYcPd50SqqUGGaswr0=", "owner": "xmonad", "repo": "xmonad-contrib", - "rev": "c5032a43fbb95592d6aac4f906878a9abd744cf0", + "rev": "0dc879698def6325352886c3923299cfc951ca8e", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index a950f5c..ee2c896 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -33,6 +33,30 @@ builtins.attrValues { inherit (epkgs.treesit-grammars) with-all-grammars; })) + (callPackage "${inputs.nixpkgs}/pkgs/applications/editors/vscode/generic.nix" rec { + commandLineArgs = ""; + version = "1.0.2"; + pname = "windsurf"; + + executableName = "windsurf"; + longName = "Windsurf"; + shortName = "windsurf"; + + src = fetchurl { + url = "https://windsurf-stable.codeiumdata.com/linux-x64/stable/56025767068f846a4d68adf1914f19f9c34e1375/Windsurf-linux-x64-${version}.tar.gz"; + hash = "sha256-YxXnSwjV8/0O2Slb6opKfEdRiGbtBaAVkRpg/BXlf6g="; + }; + + sourceRoot = "Windsurf"; + + tests = nixosTests.vscodium; + + updateScript = "nil"; + + meta = { + description = "The first agentic IDE, and then some"; + }; + }) emacs-lsp-booster equibop glow @@ -43,8 +67,6 @@ libnotify lm_sensors loupe - mattermost-desktop - neovide nodejs playerctl prismlauncher @@ -111,7 +133,6 @@ enable = true; flavor = "mocha"; accent = "green"; - pointerCursor.enable = true; }; gtk = let diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index 876651b..d8af006 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -213,7 +213,7 @@ boot = { blacklistedKernelModules = ["nouveau" "i915"]; - kernelPackages = pkgs.linuxPackages_cachyos; + kernelPackages = pkgs.linuxPackages_xanmod_latest; supportedFilesystems = ["btrfs" "ntfs"]; tmp.useTmpfs = true; @@ -498,7 +498,7 @@ nvidia-container-toolkit.enable = true; nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.beta; + package = config.boot.kernelPackages.nvidiaPackages.latest; modesetting.enable = true; powerManagement.enable = true; open = false; diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json index 7f3c1f8..718e5bb 100644 --- a/systems/x86_64-linux/navis/facter.json +++ b/systems/x86_64-linux/navis/facter.json @@ -23,8 +23,8 @@ }, "bluetooth": [ { - "index": 53, - "attached_to": 52, + "index": 50, + "attached_to": 49, "class_list": [ "usb", "bluetooth" @@ -102,8 +102,8 @@ "module_alias": "usb:v8087p0032d0000dcE0dsc01dp01icE0isc01ip01in00" }, { - "index": 69, - "attached_to": 52, + "index": 58, + "attached_to": 49, "class_list": [ "usb", "bluetooth" @@ -692,7 +692,7 @@ "camera": [ { "index": 46, - "attached_to": 52, + "attached_to": 49, "class_list": [ "camera", "usb" @@ -792,8 +792,8 @@ "module_alias": "usb:v322Ep202Cd0103dcEFdsc02dp01ic0Eisc01ip00in00" }, { - "index": 59, - "attached_to": 52, + "index": 54, + "attached_to": 49, "class_list": [ "camera", "usb" @@ -1077,7 +1077,7 @@ ], "disk": [ { - "index": 42, + "index": 43, "attached_to": 21, "class_list": [ "disk", @@ -1166,7 +1166,7 @@ ] }, { - "index": 43, + "index": 44, "attached_to": 16, "class_list": [ "disk", @@ -1322,7 +1322,7 @@ }, { "type": "irq", - "base": 186, + "base": 172, "triggered": 0, "enabled": true }, @@ -1364,7 +1364,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 186, + "irq": 172, "prog_if": 0 }, "driver": "nvidia", @@ -1443,7 +1443,7 @@ }, { "type": "irq", - "base": 255, + "base": 173, "triggered": 0, "enabled": true }, @@ -1474,12 +1474,20 @@ ], "detail": { "function": 0, - "command": 7, + "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 255, + "irq": 173, "prog_if": 0 }, + "driver": "i915", + "driver_module": "i915", + "drivers": [ + "i915" + ], + "driver_modules": [ + "i915" + ], "module_alias": "pci:v00008086d00009A68sv00001043sd000013FCbc03sc00i00", "label": "Onboard - Video" } @@ -1487,7 +1495,7 @@ "hub": [ { "index": 45, - "attached_to": 52, + "attached_to": 49, "class_list": [ "usb", "hub" @@ -1567,7 +1575,7 @@ "module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 52, + "index": 49, "attached_to": 38, "class_list": [ "usb", @@ -1589,7 +1597,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.7-cachyos xhci-hcd", + "name": "Linux 6.6.62 xhci-hcd", "value": 7531 }, "device": { @@ -1599,11 +1607,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.06", "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.11.7-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.6.62 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": [ @@ -1647,10 +1655,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 54, + "index": 51, "attached_to": 45, "class_list": [ "usb", @@ -1731,7 +1739,7 @@ "module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 60, + "index": 55, "attached_to": 38, "class_list": [ "usb", @@ -1753,7 +1761,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.7-cachyos xhci-hcd", + "name": "Linux 6.6.62 xhci-hcd", "value": 7531 }, "device": { @@ -1763,11 +1771,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.06", "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.11.7-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.6.62 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": { @@ -1801,10 +1809,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 66, + "index": 57, "attached_to": 19, "class_list": [ "usb", @@ -1826,7 +1834,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.7-cachyos xhci-hcd", + "name": "Linux 6.6.62 xhci-hcd", "value": 7531 }, "device": { @@ -1836,11 +1844,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.06", "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.11.7-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.6.62 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": [ @@ -1884,10 +1892,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 73, + "index": 60, "attached_to": 19, "class_list": [ "usb", @@ -1909,7 +1917,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.7-cachyos xhci-hcd", + "name": "Linux 6.6.62 xhci-hcd", "value": 7531 }, "device": { @@ -1919,11 +1927,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.06", "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.11.7-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.6.62 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": { @@ -1957,122 +1965,13 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" } ], "keyboard": [ { - "index": 65, - "attached_to": 54, - "class_list": [ - "keyboard", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0108", - "name": "Keyboard", - "value": 264 - }, - "sub_class": { - "hex": "0000", - "name": "Keyboard", - "value": 0 - }, - "vendor": { - "hex": "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_number": { - "type": 99, - "major": 13, - "minor": 77, - "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" - ], - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 1, - "interface_number": 1, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "driver_info": { - "type": "keyboard", - "xkb_rules": "xfree86", - "xkb_model": "pc104" - }, - "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip01in01" - }, - { - "index": 68, - "attached_to": 52, + "index": 53, + "attached_to": 49, "class_list": [ "keyboard", "usb" @@ -2112,20 +2011,20 @@ "value": 0 }, "model": "Keychron K6 Pro", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0", - "sysfs_bus_id": "3-2:1.0", - "unix_device_name": "/dev/input/event5", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.0", + "sysfs_bus_id": "3-1:1.0", + "unix_device_name": "/dev/input/event1", "unix_device_number": { "type": 99, "major": 13, - "minor": 69, + "minor": 65, "range": 1 }, "unix_device_names": [ "/dev/input/by-id/usb-Keychron_Keychron_K6_Pro-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:2:1.0-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:2:1.0-event-kbd", - "/dev/input/event5" + "/dev/input/by-path/pci-0000:00:14.0-usb-0:1:1.0-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:1:1.0-event-kbd", + "/dev/input/event1" ], "resources": [ { @@ -2178,6 +2077,115 @@ "xkb_model": "pc104" }, "module_alias": "usb:v3434p0260d0101dc00dsc00dp00ic03isc01ip01in00" + }, + { + "index": 56, + "attached_to": 51, + "class_list": [ + "keyboard", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0108", + "name": "Keyboard", + "value": 264 + }, + "sub_class": { + "hex": "0000", + "name": "Keyboard", + "value": 0 + }, + "vendor": { + "hex": "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/event7", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 71, + "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/event7" + ], + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "keyboard", + "xkb_rules": "xfree86", + "xkb_model": "pc104" + }, + "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip01in01" } ], "memory": [ @@ -2202,7 +2210,7 @@ { "type": "mem", "base": 0, - "range": 67154276352, + "range": 67159429120, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -2389,12 +2397,88 @@ "horizontal_flag": 45, "vertical_flag": 43 } + }, + { + "index": 42, + "attached_to": 37, + "class_list": [ + "monitor" + ], + "base_class": { + "hex": "0100", + "name": "Monitor", + "value": 256 + }, + "sub_class": { + "hex": "0002", + "name": "LCD Monitor", + "value": 2 + }, + "vendor": { + "hex": "30e4", + "name": "LG Display", + "value": 12516 + }, + "device": { + "hex": "0563", + "value": 1379 + }, + "serial": "0", + "model": "LG Display LCD Monitor", + "resources": [ + { + "type": "monitor", + "width": 1920, + "height": 1080, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "size", + "unit": "mm", + "value_1": 344, + "value_2": 194 + } + ], + "detail": { + "manufacture_year": 2018, + "manufacture_week": 0, + "vertical_sync": { + "min": 0, + "max": 0 + }, + "horizontal_sync": { + "min": 0, + "max": 0 + }, + "horizontal_sync_timings": { + "disp": 1920, + "sync_start": 1968, + "sync_end": 2000, + "total": 2080 + }, + "vertical_sync_timings": { + "disp": 1080, + "sync_start": 1083, + "sync_end": 1088, + "total": 1111 + }, + "clock": 138600, + "width": 1920, + "height": 1080, + "width_millimetres": 344, + "height_millimetres": 194, + "horizontal_flag": 45, + "vertical_flag": 45, + "vendor": "LG Display", + "name": "" + } } ], "mouse": [ { - "index": 51, - "attached_to": 54, + "index": 48, + "attached_to": 51, "class_list": [ "mouse", "usb" @@ -2514,8 +2598,8 @@ "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip02in00" }, { - "index": 64, - "attached_to": 52, + "index": 52, + "attached_to": 49, "class_list": [ "mouse", "usb" @@ -2557,8 +2641,8 @@ "compat_vendor": "Unknown", "compat_device": "Generic USB Mouse", "model": "Keychron K6 Pro", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.2", - "sysfs_bus_id": "3-2:1.2", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.2", + "sysfs_bus_id": "3-1:1.2", "unix_device_name": "/dev/input/mice", "unix_device_number": { "type": 99, @@ -2633,6 +2717,38 @@ "wheels": -1 }, "module_alias": "usb:v3434p0260d0101dc00dsc00dp00ic03isc00ip00in02" + }, + { + "index": 65, + "attached_to": 0, + "bus_type": { + "hex": "0081", + "name": "serial", + "value": 129 + }, + "base_class": { + "hex": "0118", + "name": "touchpad", + "value": 280 + }, + "sub_class": { + "hex": "0001", + "name": "bus", + "value": 1 + }, + "vendor": { + "hex": "04f3", + "value": 1267 + }, + "device": { + "hex": "307a", + "value": 12410 + }, + "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN1203:00/0018:04F3:307A.0007/input/input22", + "unix_device_names": [ + "/dev/input/event16", + "/dev/input/ + handler" + ] } ], "network_controller": [ @@ -2932,7 +3048,49 @@ ], "network_interface": [ { - "index": 75, + "index": 62, + "attached_to": 32, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0001", + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/enp5s0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0", + "unix_device_name": "enp5s0", + "unix_device_names": [ + "enp5s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 48 + }, + { + "type": "phwaddr", + "address": 48 + } + ], + "driver": "r8169", + "driver_module": "r8169", + "drivers": [ + "r8169" + ], + "driver_modules": [ + "r8169" + ] + }, + { + "index": 63, "attached_to": 36, "class_list": [ "network_interface" @@ -2974,7 +3132,7 @@ ] }, { - "index": 76, + "index": 64, "attached_to": 0, "class_list": [ "network_interface" @@ -2995,48 +3153,6 @@ "unix_device_names": [ "lo" ] - }, - { - "index": 77, - "attached_to": 32, - "class_list": [ - "network_interface" - ], - "base_class": { - "hex": "0107", - "name": "Network Interface", - "value": 263 - }, - "sub_class": { - "hex": "0001", - "name": "Ethernet", - "value": 1 - }, - "model": "Ethernet network interface", - "sysfs_id": "/class/net/enp5s0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0", - "unix_device_name": "enp5s0", - "unix_device_names": [ - "enp5s0" - ], - "resources": [ - { - "type": "hwaddr", - "address": 48 - }, - { - "type": "phwaddr", - "address": 48 - } - ], - "driver": "r8169", - "driver_module": "r8169", - "drivers": [ - "r8169" - ], - "driver_modules": [ - "r8169" - ] } ], "pci": [ @@ -3258,7 +3374,7 @@ "resources": [ { "type": "irq", - "base": 169, + "base": 155, "triggered": 0, "enabled": true }, @@ -3276,7 +3392,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 169, + "irq": 155, "prog_if": 0 }, "driver": "mei_me", @@ -3750,7 +3866,7 @@ "resources": [ { "type": "irq", - "base": 16, + "base": 174, "triggered": 0, "enabled": true }, @@ -3773,12 +3889,20 @@ ], "detail": { "function": 3, - "command": 2, + "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 16, + "irq": 174, "prog_if": 128 }, + "driver": "snd_hda_intel", + "driver_module": "snd_hda_intel", + "drivers": [ + "snd_hda_intel" + ], + "driver_modules": [ + "snd_hda_intel" + ], "module_alias": "pci:v00008086d000043C8sv00001043sd000016F2bc04sc03i80", "label": "Onboard - Sound" }, @@ -3865,731 +3989,6 @@ "snd_hda_intel" ], "module_alias": "pci:v000010DEd00002291sv00001043sd000013FCbc04sc03i00" - }, - { - "index": 44, - "attached_to": 45, - "class_list": [ - "sound", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "model": "SteelSeries Arctis 7", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.2", - "sysfs_bus_id": "3-3.1:1.2", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 0, - "interface_number": 2, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "snd-usb-audio", - "driver_module": "snd_usb_audio", - "drivers": [ - "snd-usb-audio" - ], - "driver_modules": [ - "snd_usb_audio" - ], - "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in02" - }, - { - "index": 47, - "attached_to": 45, - "class_list": [ - "sound", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "model": "SteelSeries Arctis 7", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.0", - "sysfs_bus_id": "3-3.1:1.0", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "snd-usb-audio", - "driver_module": "snd_usb_audio", - "drivers": [ - "snd-usb-audio" - ], - "driver_modules": [ - "snd_usb_audio" - ], - "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc01ip00in00" - }, - { - "index": 56, - "attached_to": 52, - "class_list": [ - "sound", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "model": "fifine Microphone", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.2", - "sysfs_bus_id": "3-1:1.2", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 0, - "interface_number": 2, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "snd-usb-audio", - "driver_module": "snd_usb_audio", - "drivers": [ - "snd-usb-audio" - ], - "driver_modules": [ - "snd_usb_audio" - ], - "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in02" - }, - { - "index": 57, - "attached_to": 45, - "class_list": [ - "sound", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "model": "SteelSeries Arctis 7", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.3", - "sysfs_bus_id": "3-3.1:1.3", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 0, - "interface_number": 3, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "snd-usb-audio", - "driver_module": "snd_usb_audio", - "drivers": [ - "snd-usb-audio" - ], - "driver_modules": [ - "snd_usb_audio" - ], - "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc01ip00in03" - }, - { - "index": 58, - "attached_to": 52, - "class_list": [ - "sound", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "model": "fifine Microphone", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.0", - "sysfs_bus_id": "3-1:1.0", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "snd-usb-audio", - "driver_module": "snd_usb_audio", - "drivers": [ - "snd-usb-audio" - ], - "driver_modules": [ - "snd_usb_audio" - ], - "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc01ip00in00" - }, - { - "index": 61, - "attached_to": 45, - "class_list": [ - "sound", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "model": "SteelSeries Arctis 7", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.1", - "sysfs_bus_id": "3-3.1:1.1", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 0, - "interface_number": 1, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "snd-usb-audio", - "driver_module": "snd_usb_audio", - "drivers": [ - "snd-usb-audio" - ], - "driver_modules": [ - "snd_usb_audio" - ], - "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in01" - }, - { - "index": 71, - "attached_to": 45, - "class_list": [ - "sound", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "model": "SteelSeries Arctis 7", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.4", - "sysfs_bus_id": "3-3.1:1.4", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 0, - "interface_number": 4, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "snd-usb-audio", - "driver_module": "snd_usb_audio", - "drivers": [ - "snd-usb-audio" - ], - "driver_modules": [ - "snd_usb_audio" - ], - "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in04" - }, - { - "index": 72, - "attached_to": 52, - "class_list": [ - "sound", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "model": "fifine Microphone", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1", - "sysfs_bus_id": "3-1:1.1", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 0, - "interface_number": 1, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "snd-usb-audio", - "driver_module": "snd_usb_audio", - "drivers": [ - "snd-usb-audio" - ], - "driver_modules": [ - "snd_usb_audio" - ], - "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in01" } ], "storage_controller": [ @@ -4781,8 +4180,8 @@ }, "usb": [ { - "index": 48, - "attached_to": 54, + "index": 47, + "attached_to": 51, "class_list": [ "usb", "unknown" @@ -4872,92 +4271,8 @@ "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc00ip00in02" }, { - "index": 49, - "attached_to": 54, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "serial": "3039565836353439313237313235", - "model": "Microsoft Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.3/3-3.2.3:1.1", - "sysfs_bus_id": "3-3.2.3:1.1", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "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 - }, - "interface_protocol": 208, - "interface_number": 1, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in01" - }, - { - "index": 50, - "attached_to": 52, + "index": 59, + "attached_to": 49, "class_list": [ "usb", "unknown" @@ -4997,8 +4312,8 @@ "value": 0 }, "model": "Keychron K6 Pro", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.1", - "sysfs_bus_id": "3-2:1.1", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1", + "sysfs_bus_id": "3-1:1.1", "resources": [ { "type": "baud", @@ -5047,495 +4362,8 @@ "module_alias": "usb:v3434p0260d0101dc00dsc00dp00ic03isc00ip00in01" }, { - "index": 55, - "attached_to": 45, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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_number": { - "type": 99, - "major": 13, - "minor": 75, - "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" - ], - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 5, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic03isc00ip00in05" - }, - { - "index": 62, - "attached_to": 45, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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": "12ae", - "name": "SteelSeries Arctis 7 Bootloader", - "value": 4782 - }, - "revision": { - "hex": "0000", - "name": "1.19", - "value": 0 - }, - "model": "SteelSeries Arctis 7 Bootloader", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.0", - "sysfs_bus_id": "3-3.3:1.0", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "module_alias": "usb:v1038p12AEd0119dc00dsc00dp00ic03isc00ip00in00" - }, - { - "index": 63, - "attached_to": 54, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "serial": "3039565836353439313237313235", - "model": "Microsoft Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.3/3-3.2.3:1.2", - "sysfs_bus_id": "3-3.2.3:1.2", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "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 - }, - "interface_protocol": 208, - "interface_number": 2, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in02" - }, - { - "index": 67, - "attached_to": 54, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "serial": "3039565836353439313237313235", - "model": "Microsoft Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.3/3-3.2.3:1.0", - "sysfs_bus_id": "3-3.2.3:1.0", - "unix_device_name": "/dev/input/event17", - "unix_device_number": { - "type": 99, - "major": 13, - "minor": 81, - "range": 1 - }, - "unix_device_names": [ - "/dev/input/by-id/usb-Microsoft_Controller_3039565836353439313237313235-event-joystick", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.3:1.0-event-joystick", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.3:1.0-event-joystick", - "/dev/input/event17" - ], - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "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 - }, - "interface_protocol": 208, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "xpad", - "driver_module": "xpad", - "drivers": [ - "xpad" - ], - "driver_modules": [ - "xpad" - ], - "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in00" - }, - { - "index": 70, - "attached_to": 52, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "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 - }, - "model": "fifine Microphone", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.3", - "sysfs_bus_id": "3-1:1.3", - "unix_device_name": "/dev/input/event4", - "unix_device_number": { - "type": 99, - "major": 13, - "minor": 68, - "range": 1 - }, - "unix_device_names": [ - "/dev/input/by-id/usb-3142_fifine_Microphone-event-if03", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:1:1.3-event", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:1:1.3-event", - "/dev/input/event4" - ], - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 3, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic03isc00ip00in03" - }, - { - "index": 74, - "attached_to": 52, + "index": 61, + "attached_to": 49, "class_list": [ "usb", "unknown" @@ -5759,7 +4587,7 @@ "resources": [ { "type": "irq", - "base": 135, + "base": 128, "triggered": 0, "enabled": true }, @@ -5777,7 +4605,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 135, + "irq": 128, "prog_if": 48 }, "driver": "xhci_hcd", @@ -7103,4 +5931,4 @@ } } } -} \ No newline at end of file +}