pupbrained/nix-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update

Browse source
This commit is contained in:
Mars 2024-12-03 00:53:48 -05:00
parent 27bf6633b2
commit 00ef021927
Signed by: pupbrained
GPG key ID: 0FF5B8826803F895
7 changed files with 569 additions and 301 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
flake.lock
View file

@ -41,11 +41,11 @@
]
},
"locked": {
"lastModified": 1731774881,
"narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=",
"lastModified": 1731959031,
"narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "b31a6a4da8199ae3489057db7d36069a70749a56",
"rev": "4468981c1c50999f315baa1508f0e53c4ee70c52",
"type": "github"
},
"original": {
@ -72,11 +72,11 @@
},
"catppuccin": {
"locked": {
"lastModified": 1732703064,
"narHash": "sha256-n8XOmn0WGtQhAMJKTnhL/3ttV2ZahPRf6gtlqZ6R4QE=",
"lastModified": 1733001911,
"narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=",
"owner": "catppuccin",
"repo": "nix",
"rev": "2e2bdecf0bae287d74947cd5cf967c5c499c23c1",
"rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e",
"type": "github"
},
"original": {
@ -93,11 +93,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1732715105,
"narHash": "sha256-WGf8bzwNEgbWjM9aTFv9ZCGrBQEfg0fYd4FSoVa2gDs=",
"lastModified": 1733158806,
"narHash": "sha256-nRFUS2LR0oWxL14kD8wZ7z/ov5Bh0k6sW1+CSW3uLOc=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "8f153d013632e6036e8bec6377cc5ed7d2ad14df",
"rev": "c60cb1640cf0d1e6d573757f0a45f2de6e8badec",
"type": "github"
},
"original": {
@ -136,11 +136,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1732757557,
"narHash": "sha256-zADldaLfiSb2iGPhcSJPokGypYa1Fix0llhWkMvm8pQ=",
"lastModified": 1733194713,
"narHash": "sha256-zGy98Hs0AUeeHrB1qnohLhOjrBKjA9hTd26QNR5ZI5c=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "5116835b8eb2ec18ec258050a11d374d38ac8764",
"rev": "9edb4815049cf8d7db652915e0555531abc89fa3",
"type": "github"
},
"original": {
@ -178,11 +178,11 @@
]
},
"locked": {
"lastModified": 1732603785,
"narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
"lastModified": 1733105089,
"narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
"rev": "c6b65d946097baf3915dd51373251de98199280d",
"type": "github"
},
"original": {
@ -886,11 +886,11 @@
]
},
"locked": {
"lastModified": 1732482255,
"narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"lastModified": 1732884235,
"narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"rev": "819f682269f4e002884702b87e445c82840c68f2",
"type": "github"
},
"original": {
@ -906,11 +906,11 @@
]
},
"locked": {
"lastModified": 1732482255,
"narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"lastModified": 1733175814,
"narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"rev": "bf23fe41082aa0289c209169302afd3397092f22",
"type": "github"
},
"original": {
@ -984,11 +984,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1732737540,
"narHash": "sha256-9b+cLfJyMluRgC0XVb50mqZA827fSYaRtwovSydu/C0=",
"lastModified": 1733157082,
"narHash": "sha256-wbfUls7vwEs00xdGbYn1L8ZOrMS4zhisq9XVwjND/fc=",
"ref": "refs/heads/main",
"rev": "5329298b522e3cc1201894909443775b00aeb336",
"revCount": 5500,
"rev": "92186898c0ca1b3f72922b72c4af1723f0d9b888",
"revCount": 5509,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -1095,11 +1095,11 @@
]
},
"locked": {
"lastModified": 1731702627,
"narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=",
"lastModified": 1732288281,
"narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1",
"rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
"type": "github"
},
"original": {
@ -1187,11 +1187,11 @@
]
},
"locked": {
"lastModified": 1732648910,
"narHash": "sha256-1F83DUfEHnCZpGY4UOlWaamWoDx8eZ9tHaUF51p2hng=",
"lastModified": 1732739177,
"narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "e86d2ad72094354326887bd6fe156f327d63d491",
"rev": "8d7b2149e618696d5100c2683af1ffa893f02a75",
"type": "github"
},
"original": {
@ -1306,11 +1306,11 @@
]
},
"locked": {
"lastModified": 1732519917,
"narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
"lastModified": 1733024876,
"narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
"rev": "6e0b7f81367069589a480b91603a10bcf71f3103",
"type": "github"
},
"original": {
@ -1422,16 +1422,16 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1731797254,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"lastModified": 1732981179,
"narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
@ -1470,11 +1470,11 @@
},
"nixpkgs_10": {
"locked": {
"lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"lastModified": 1733015953,
"narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"type": "github"
},
"original": {
@ -1579,12 +1579,12 @@
},
"nixpkgs_17": {
"locked": {
"lastModified": 1732238832,
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"revCount": 711046,
"lastModified": 1732937961,
"narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=",
"rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5",
"revCount": 714486,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.711046%2Brev-8edf06bea5bcbee082df1b7369ff973b91618b8d/019366f9-30a0-7cd4-b5a3-b47513aca739/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.714486%2Brev-4703b8d2c708e13a8cab03d865f90973536dcdf5/01937ed6-ab5d-70c6-9cd3-3fdf29985206/source.tar.gz"
},
"original": {
"id": "nixpkgs",
@ -1607,12 +1607,12 @@
},
"nixpkgs_19": {
"locked": {
"lastModified": 1732238832,
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"revCount": 711046,
"lastModified": 1732937961,
"narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=",
"rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5",
"revCount": 714486,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.711046%2Brev-8edf06bea5bcbee082df1b7369ff973b91618b8d/019366f9-30a0-7cd4-b5a3-b47513aca739/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.714486%2Brev-4703b8d2c708e13a8cab03d865f90973536dcdf5/01937ed6-ab5d-70c6-9cd3-3fdf29985206/source.tar.gz"
},
"original": {
"id": "nixpkgs",
@ -1621,11 +1621,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"lastModified": 1733015953,
"narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"type": "github"
},
"original": {
@ -1745,11 +1745,11 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"lastModified": 1732758367,
"narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59",
"type": "github"
},
"original": {
@ -1842,11 +1842,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1731363552,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"lastModified": 1732021966,
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github"
},
"original": {
@ -1889,11 +1889,11 @@
]
},
"locked": {
"lastModified": 1732588352,
"narHash": "sha256-J2/hxOO1VtBA/u+a+9E+3iJpWT3xsBdghgYAVfoGCJo=",
"lastModified": 1732933841,
"narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "414e748aae5c9e6ca63c5aafffda03e5dad57ceb",
"rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1",
"type": "github"
},
"original": {
@ -2199,11 +2199,11 @@
"nixpkgs": "nixpkgs_15"
},
"locked": {
"lastModified": 1732643199,
"narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=",
"lastModified": 1732894027,
"narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c",
"rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"type": "github"
},
"original": {
@ -2214,11 +2214,11 @@
},
"unstable": {
"locked": {
"lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"lastModified": 1733015953,
"narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"type": "github"
},
"original": {
@ -2316,11 +2316,11 @@
"nixpkgs": "nixpkgs_20"
},
"locked": {
"lastModified": 1732756919,
"narHash": "sha256-Phu0JCPmj2Yw7VPUzeJvD/Fc/LB/VywMDYxfrzManY0=",
"lastModified": 1732843311,
"narHash": "sha256-Oe3dPaZP8Bv9QdN+yfWrqJo+rq0irlOKx06dohfb4Ak=",
"owner": "fufexan",
"repo": "zen-browser-flake",
"rev": "6d675fe2d71a6f85e34235f87a19fa0cc0f09e4c",
"rev": "da03eda0c98adcd8b999a21f8e281e82922b6e0c",
"type": "github"
},
"original": {

10
homes/x86_64-linux/marshall@navis/default.nix
View file

@ -21,6 +21,11 @@
};
colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
wayland.windowManager.river = {
enable = true;
systemd.enable = true;
xwayland.enable = true;
};
home = {
packages = with pkgs;
@ -185,6 +190,11 @@
};
programs = {
rio = {
enable = true;
catppuccin.enable = true;
};
xmobar.enable = true;
wezterm.extraConfig = builtins.readFile ./wezterm.lua;

7
homes/x86_64-linux/marshall@navis/hyprland/default.nix
View file

@ -11,7 +11,7 @@ with pkgs; {
];
wayland.windowManager.hyprland = {
enable = false;
enable = true;
systemd.variables = ["--all"];
settings = let
@ -64,6 +64,7 @@ with pkgs; {
screenshot = mode: "${hyprshot}/bin/hyprshot --clipboard-only -m ${mode}";
in {
cursor.no_hardware_cursors = true;
decoration.rounding = 10;
dwindle.preserve_split = true;
gestures.workspace_swipe = true;
@ -133,15 +134,15 @@ with pkgs; {
monitor = [
"eDP-1, disable"
"Unknown-1, disable"
"DP-1, 2560x1440@165, auto, auto"
];
env = [
# Nvidia stuff
"GBM_BACKEND, nvidia-drm"
"__GLX_VENDOR_LIBRARY_NAME, nvidia"
"LIBVA_DRIVER_NAME, nvidia"
"WLR_DRM_DEVICES, $HOME/.config/hypr/card"
"NVD_BACKEND, direct"
# Cursors
"HYPRCURSOR_SIZE, 24"

4
homes/x86_64-linux/marshall@navis/hyprland/services.nix
View file

@ -1,10 +1,10 @@
{...}: {
services = {
cliphist.enable = false;
cliphist.enable = true;
udiskie.enable = false;
swaync = {
enable = false;
enable = true;
style = builtins.fetchurl {
url = "https://github.com/catppuccin/swaync/releases/download/v0.2.3/mocha.css";
sha256 = "1xr1wkg4zb467b35xhsfqiwhimfnn88i3ml5rf173rkm7fyby9qy";

2
homes/x86_64-linux/marshall@navis/hyprland/waybar.nix
View file

@ -8,7 +8,7 @@
betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
in {
programs.waybar = {
enable = false;
enable = true;
package = pkgs.waybar;
settings = [
{

82
systems/x86_64-linux/navis/default.nix
View file

@ -86,8 +86,78 @@
packages = with pkgs;
[
ibm-plex
nerdfonts
recursive
]
++ (with nerd-fonts; [
_0xproto
_3270
agave
anonymice
arimo
aurulent-sans-mono
bigblue-terminal
bitstream-vera-sans-mono
blex-mono
caskaydia-cove
caskaydia-mono
code-new-roman
comic-shanns-mono
commit-mono
cousine
d2coding
daddy-time-mono
dejavu-sans-mono
departure-mono
droid-sans-mono
envy-code-r
fantasque-sans-mono
fira-code
fira-mono
geist-mono
go-mono
gohufont
hack
hasklug
heavy-data
hurmit
im-writing
inconsolata
inconsolata-go
inconsolata-lgc
intone-mono
iosevka
iosevka-term
iosevka-term-slab
jetbrains-mono
lekton
liberation
lilex
martian-mono
meslo-lg
monaspace
monofur
monoid
mononoki
mplus
noto
open-dyslexic
overpass
profont
proggy-clean-tt
recursive-mono
roboto-mono
sauce-code-pro
shure-tech-mono
space-mono
symbols-only
terminess-ttf
tinos
ubuntu
ubuntu-mono
ubuntu-sans
victor-mono
zed-mono
])
++ (with iosevka-comfy; [
comfy
comfy-duo
@ -371,13 +441,15 @@
gnupg.agent.enable = true;
virt-manager.enable = true;
river.enable = true;
appimage = {
enable = true;
binfmt = true;
};
hyprland = {
enable = false;
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
};
@ -499,10 +571,10 @@
nvidia-container-toolkit.enable = true;
nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.latest;
package = config.boot.kernelPackages.nvidiaPackages.beta;
modesetting.enable = true;
powerManagement.enable = true;
open = false;
powerManagement.enable = false;
open = true;
};
};

621
systems/x86_64-linux/navis/facter.json
View file

@ -23,8 +23,8 @@
},
"bluetooth": [
{
"index": 53,
"attached_to": 52,
"index": 55,
"attached_to": 54,
"class_list": [
"usb",
"bluetooth"
@ -102,8 +102,8 @@
"module_alias": "usb:v8087p0032d0000dcE0dsc01dp01icE0isc01ip01in00"
},
{
"index": 66,
"attached_to": 52,
"index": 69,
"attached_to": 54,
"class_list": [
"usb",
"bluetooth"
@ -691,8 +691,8 @@
],
"camera": [
{
"index": 46,
"attached_to": 52,
"index": 47,
"attached_to": 54,
"class_list": [
"camera",
"usb"
@ -792,8 +792,8 @@
"module_alias": "usb:v322Ep202Cd0103dcEFdsc02dp01ic0Eisc01ip00in00"
},
{
"index": 57,
"attached_to": 52,
"index": 59,
"attached_to": 54,
"class_list": [
"camera",
"usb"
@ -1322,7 +1322,7 @@
},
{
"type": "irq",
"base": 186,
"base": 171,
"triggered": 0,
"enabled": true
},
@ -1364,7 +1364,7 @@
"command": 1031,
"header_type": 0,
"secondary_bus": 0,
"irq": 186,
"irq": 171,
"prog_if": 0
},
"driver": "nvidia",
@ -1486,8 +1486,8 @@
],
"hub": [
{
"index": 45,
"attached_to": 52,
"index": 46,
"attached_to": 54,
"class_list": [
"usb",
"hub"
@ -1567,7 +1567,7 @@
"module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00"
},
{
"index": 52,
"index": 54,
"attached_to": 38,
"class_list": [
"usb",
@ -1650,8 +1650,8 @@
"module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00"
},
{
"index": 54,
"attached_to": 45,
"index": 56,
"attached_to": 46,
"class_list": [
"usb",
"hub"
@ -1731,7 +1731,7 @@
"module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00"
},
{
"index": 58,
"index": 60,
"attached_to": 38,
"class_list": [
"usb",
@ -1804,7 +1804,7 @@
"module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00"
},
{
"index": 63,
"index": 66,
"attached_to": 19,
"class_list": [
"usb",
@ -1887,7 +1887,7 @@
"module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00"
},
{
"index": 70,
"index": 72,
"attached_to": 19,
"class_list": [
"usb",
@ -1962,8 +1962,8 @@
],
"keyboard": [
{
"index": 62,
"attached_to": 54,
"index": 65,
"attached_to": 56,
"class_list": [
"keyboard",
"usb"
@ -2005,18 +2005,18 @@
"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/event10",
"unix_device_name": "/dev/input/event6",
"unix_device_number": {
"type": 99,
"major": 13,
"minor": 74,
"minor": 70,
"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/event10"
"/dev/input/event6"
],
"resources": [
{
@ -2071,8 +2071,8 @@
"module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip01in01"
},
{
"index": 65,
"attached_to": 52,
"index": 68,
"attached_to": 54,
"class_list": [
"keyboard",
"usb"
@ -2393,8 +2393,8 @@
],
"mouse": [
{
"index": 51,
"attached_to": 54,
"index": 53,
"attached_to": 56,
"class_list": [
"mouse",
"usb"
@ -2448,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": [
@ -2514,8 +2514,8 @@
"module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip02in00"
},
{
"index": 61,
"attached_to": 52,
"index": 64,
"attached_to": 54,
"class_list": [
"mouse",
"usb"
@ -2569,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": [
@ -2635,7 +2635,7 @@
"module_alias": "usb:v3434p0260d0101dc00dsc00dp00ic03isc00ip00in02"
},
{
"index": 75,
"index": 77,
"attached_to": 0,
"bus_type": {
"hex": "0081",
@ -2660,9 +2660,9 @@
"hex": "307a",
"value": 12410
},
"sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN1203:00/0018:04F3:307A.000A/input/input22",
"sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN1203:00/0018:04F3:307A.0009/input/input27",
"unix_device_names": [
"/dev/input/event19",
"/dev/input/event24",
"/dev/input/ + handler"
]
}
@ -2963,71 +2963,6 @@
}
],
"network_interface": [
{
"index": 72,
"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": 73,
"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": 74,
"attached_to": 32,
@ -3069,6 +3004,71 @@
"driver_modules": [
"r8169"
]
},
{
"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": 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"
]
}
],
"pci": [
@ -3899,8 +3899,8 @@
"module_alias": "pci:v000010DEd00002291sv00001043sd000013FCbc04sc03i00"
},
{
"index": 47,
"attached_to": 54,
"index": 49,
"attached_to": 56,
"class_list": [
"sound",
"usb"
@ -3990,8 +3990,8 @@
"module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc01ip00in03"
},
{
"index": 49,
"attached_to": 54,
"index": 51,
"attached_to": 56,
"class_list": [
"sound",
"usb"
@ -4081,8 +4081,8 @@
"module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in01"
},
{
"index": 55,
"attached_to": 52,
"index": 57,
"attached_to": 54,
"class_list": [
"sound",
"usb"
@ -4171,8 +4171,8 @@
"module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in02"
},
{
"index": 56,
"attached_to": 52,
"index": 58,
"attached_to": 54,
"class_list": [
"sound",
"usb"
@ -4261,8 +4261,8 @@
"module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc01ip00in00"
},
{
"index": 59,
"attached_to": 54,
"index": 62,
"attached_to": 56,
"class_list": [
"sound",
"usb"
@ -4352,8 +4352,8 @@
"module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in04"
},
{
"index": 60,
"attached_to": 54,
"index": 63,
"attached_to": 56,
"class_list": [
"sound",
"usb"
@ -4443,8 +4443,8 @@
"module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in02"
},
{
"index": 64,
"attached_to": 54,
"index": 67,
"attached_to": 56,
"class_list": [
"sound",
"usb"
@ -4534,8 +4534,8 @@
"module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc01ip00in00"
},
{
"index": 69,
"attached_to": 52,
"index": 71,
"attached_to": 54,
"class_list": [
"sound",
"usb"
@ -4814,7 +4814,91 @@
"usb": [
{
"index": 44,
"attached_to": 54,
"attached_to": 46,
"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.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": "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": 45,
"attached_to": 56,
"class_list": [
"usb",
"unknown"
@ -4864,6 +4948,9 @@
"range": 1
},
"unix_device_names": [
"/dev/input/by-id/usb-SteelSeries_SteelSeries_Arctis_7-event-if05",
"/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.3:1.5-event",
"/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.3:1.5-event",
"/dev/input/event9"
],
"resources": [
@ -4915,7 +5002,112 @@
},
{
"index": 48,
"attached_to": 54,
"attached_to": 46,
"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.1/3-3.1:1.0",
"sysfs_bus_id": "3-3.1: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.1:1.0-event-joystick",
"/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.1: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": 50,
"attached_to": 56,
"class_list": [
"usb",
"unknown"
@ -5005,8 +5197,8 @@
"module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc00ip00in02"
},
{
"index": 50,
"attached_to": 52,
"index": 52,
"attached_to": 54,
"class_list": [
"usb",
"unknown"
@ -5096,8 +5288,92 @@
"module_alias": "usb:v3434p0260d0101dc00dsc00dp00ic03isc00ip00in01"
},
{
"index": 67,
"attached_to": 52,
"index": 61,
"attached_to": 46,
"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.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": "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": 70,
"attached_to": 54,
"class_list": [
"usb",
"unknown"
@ -5199,99 +5475,8 @@
"module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic03isc00ip00in03"
},
{
"index": 68,
"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.4/3-3.4:1.0",
"sysfs_bus_id": "3-3.4: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": 71,
"attached_to": 52,
"index": 73,
"attached_to": 54,
"class_list": [
"usb",
"unknown"
@ -5425,7 +5610,7 @@
"resources": [
{
"type": "irq",
"base": 129,
"base": 127,
"triggered": 0,
"enabled": true
},
@ -5443,7 +5628,7 @@
"command": 1030,
"header_type": 0,
"secondary_bus": 0,
"irq": 129,
"irq": 127,
"prog_if": 48
},
"driver": "xhci_hcd",