diff --git a/.sops.yaml b/.sops.yaml index a4c1688..19e09c1 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,88 +1,88 @@ # Public keys are combination of host + user keys: - - &laptop_root age1w99m9klvc7m5qtmtmu3l0jx8ksdzp5c4p9rkvh5fdullfc6afemqv5py2q - - &laptop_pim age189laethzry4ylnd790dmpuc4xjjuwqxruc76caj3ceqhqug4g9qs0upuvw + - &sue_root age1w99m9klvc7m5qtmtmu3l0jx8ksdzp5c4p9rkvh5fdullfc6afemqv5py2q + - &sue_pim age189laethzry4ylnd790dmpuc4xjjuwqxruc76caj3ceqhqug4g9qs0upuvw - &gamepc_root age1y5wgcxmn37drmjtpgld3xc76mw8dckhred8hecusywjlvdyfedfse8y60u - &gamepc_pim age1qlldg2c6kptvnmvlkpf9pae3wnczk6eklcmwdvnzyvvnur3aqdcq3c3trt - &warwick_root age1th8rdw4fs3vmgy9gzc0k9xy88tddjj4vasepckfx9h4nlzsg3q3q4cjgwu - &niels age159whjxeyw94xmkkephmtlur8e85xd9d5vnvkwkcayfv7el0neqfq863yga - &atlas_root age1unkshctcpucc298kmw9a0qzvtjzgdnjytrxr5p750dv0z95feymqpn68qf + - &jefke_root age1upnqu4rpxppdw9zmqu8x3rnaqq2r6m82y25zvry5cec63vjsd9gqtl9e02 - &lewis_root age108fn93z2c55g9dm9cv5v4w47pykf3khz7e3dmnpv5dhchwnaau0qs20stq - - &roeland_root age15qrzsk9t7uyuuy7m0xt3qzk3cmcsegt5wfe5zew4d8najwjnm30sfjc3pk creation_rules: - - path_regex: secrets/blocktech/colmena.yaml + - path_regex: secrets/sue/colmena.yaml key_groups: - age: - - *laptop_root - - path_regex: secrets/blocktech/nixos.yaml + - *sue_root + - path_regex: secrets/sue/nixos.yaml key_groups: - age: - - *laptop_root - - path_regex: secrets/blocktech/pkunis.yaml + - *sue_root + - path_regex: secrets/sue/pim.yaml key_groups: - age: - - *laptop_pim - - *laptop_root + - *sue_pim + - *sue_root - path_regex: secrets/gamepc/colmena.yaml key_groups: - age: - - *laptop_pim - - *laptop_root + - *sue_pim + - *sue_root - path_regex: secrets/gamepc/pim.yaml key_groups: - age: - - *laptop_pim - - *laptop_root + - *sue_pim + - *sue_root - *gamepc_root - *gamepc_pim - path_regex: secrets/warwick/colmena.yaml key_groups: - age: - - *laptop_pim - - *laptop_root + - *sue_pim + - *sue_root - *niels - path_regex: secrets/servers.yaml key_groups: - age: - *warwick_root - *atlas_root + - *jefke_root - *lewis_root - - *roeland_root - - *laptop_pim - - *laptop_root + - *sue_pim + - *sue_root - *niels - path_regex: secrets/atlas/colmena.yaml key_groups: - age: - - *laptop_pim - - *laptop_root + - *sue_pim + - *sue_root - *niels - path_regex: secrets/kubernetes.yaml key_groups: - age: - *atlas_root + - *jefke_root - *lewis_root - - *roeland_root - - *laptop_pim - - *laptop_root + - *sue_pim + - *sue_root + - *niels + - path_regex: secrets/jefke/colmena.yaml + key_groups: + - age: + - *sue_pim + - *sue_root - *niels - path_regex: secrets/lewis/colmena.yaml key_groups: - age: - - *laptop_pim - - *laptop_root + - *sue_pim + - *sue_root - *niels - path_regex: secrets/lewis/nixos.yaml key_groups: - age: - *lewis_root - - *laptop_pim - - *laptop_root - - *niels - - path_regex: secrets/roeland/colmena.yaml - key_groups: - - age: - - *laptop_pim - - *laptop_root + - *sue_pim + - *sue_root - *niels diff --git a/README.md b/README.md index 8e04d0d..d31f501 100644 --- a/README.md +++ b/README.md @@ -3,33 +3,33 @@ NixOS configurations for the machines I manage. Currently managed systems: - -- **blocktech**: My current laptop, a ThinkPad P1 running GNOME. -- **gamepc**: My gaming PC running Cosmic +- **sue**: My current laptop, a Dell XPS 9315. It has two flavours: + - Default running GNOME + - Specialisation running Cosmic +- **gamepc**: My gaming PC running Cinnamon - **warwick**: A Raspberry Pi 4 Model B, which mostly does some monitoring - **atlas**: A Gigabyte Brix, one of my Kubernetes nodes -- **lewis**: A Gigabyte Brix, one of my Kubernetes nodes. Additionally, contains - my media collection and does backups. -- **roeland**: A Minisforum UN100P, one of my Kubernetes nodes +- **jefke**: A Gigabyte Brix, one of my Kubernetes nodes +- **lewis**: A Gigabyte Brix, one of my Kubernetes nodes. Additionally, contains my media collection and does backups. ## Deployment I use [Colmena](https://colmena.cli.rs) for deploying my machines. Create garbage collection roots like so: - -```shell -colmena build --keep-result +``` +colmena build --keep-result --experimental-flake-eval ``` To apply to the local machine: - -```shell -sudo colmena apply-local --sudo +``` +sudo colmena apply-local --sudo --experimental-flake-eval ``` To apply to all remotely managed systems: - -```shell -colmena apply ``` +colmena apply --experimental-flake-eval +``` + +> [!NOTE] +> Currently the `--experimental-flake-eval` flag is necessary to properly use Colmena with flakes. See [this PR](https://github.com/zhaofengli/colmena/pull/228). diff --git a/colmena.nix b/colmena.nix index 1a62597..5b427e2 100644 --- a/colmena.nix +++ b/colmena.nix @@ -15,9 +15,9 @@ inputs @ { }; }; - blocktech = { + sue = { imports = [ - (import ./machines).blocktech.nixosModule + (import ./machines).sue.nixosModule ./nixos ]; }; @@ -43,16 +43,16 @@ inputs @ { ]; }; - lewis = { + jefke = { imports = [ - (import ./machines).lewis.nixosModule + (import ./machines).jefke.nixosModule ./nixos ]; }; - roeland = { + lewis = { imports = [ - (import ./machines).roeland.nixosModule + (import ./machines).lewis.nixosModule ./nixos ]; }; diff --git a/flake.lock b/flake.lock index 6d2a6e0..2156f8f 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "665b3c6748534eb766c777298721cece9453fdae", "type": "github" }, "original": { @@ -34,14 +34,30 @@ "type": "github" } }, + "base16-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "base16-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-foot", + "type": "github" + } + }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", "type": "github" }, "original": { @@ -50,20 +66,51 @@ "type": "github" } }, + "base16-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "kdrag0n", + "repo": "base16-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "kdrag0n", + "repo": "base16-kitty", + "type": "github" + } + }, + "base16-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "base16-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-tmux", + "type": "github" + } + }, "base16-vim": { "flake": false, "locked": { - "lastModified": 1732806396, - "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" } }, @@ -76,11 +123,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1746816769, - "narHash": "sha256-ymQzXrfHVT8/RJiGbfrNjEeuzXQan46lUJdxEhgivdM=", + "lastModified": 1731527002, + "narHash": "sha256-dI9I6suECoIAmbS4xcrqF8r2pbmed8WWm5LIF1yWPw8=", "owner": "zhaofengli", "repo": "colmena", - "rev": "df694ee23be7ed7b2d8b42c245a640f0724eb06c", + "rev": "e3ad42138015fcdf2524518dd564a13145c72ea1", "type": "github" }, "original": { @@ -129,11 +176,11 @@ ] }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -142,22 +189,6 @@ "type": "github" } }, - "firefox-gnome-theme": { - "flake": false, - "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -225,11 +256,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -239,12 +270,29 @@ } }, "flake-compat_6": { + "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -282,71 +330,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1704152458, + "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", "type": "github" }, "original": { @@ -408,14 +396,17 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": [ + "stylix", + "systems" + ] }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -427,11 +418,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", "type": "github" }, "original": { @@ -446,40 +437,15 @@ "gitignore": "gitignore", "nixpkgs": [ "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "stylix", - "nixpkgs" - ] + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -531,28 +497,6 @@ "type": "github" } }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "globset": { "inputs": { "nixpkgs-lib": [ @@ -577,16 +521,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", "type": "github" }, "original": { "owner": "GNOME", - "ref": "48.1", + "ref": "46.1", "repo": "gnome-shell", "type": "github" } @@ -598,16 +542,16 @@ ] }, "locked": { - "lastModified": 1748665073, - "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -620,16 +564,15 @@ ] }, "locked": { - "lastModified": 1748665073, - "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -684,47 +627,6 @@ "type": "github" } }, - "mnw": { - "locked": { - "lastModified": 1748278309, - "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", - "owner": "Gerg-L", - "repo": "mnw", - "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "mnw", - "type": "github" - } - }, - "nil": { - "inputs": { - "flake-utils": [ - "nvf", - "flake-utils" - ], - "nixpkgs": [ - "nvf", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", - "owner": "oxalica", - "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -753,11 +655,11 @@ ] }, "locked": { - "lastModified": 1748751003, - "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=", + "lastModified": 1733024876, + "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43", + "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "type": "github" }, "original": { @@ -776,11 +678,11 @@ ] }, "locked": { - "lastModified": 1734289443, - "narHash": "sha256-oU3AGvzByR7622kntPUPIHfAreOIktAsJav2ATHuc18=", + "lastModified": 1730022297, + "narHash": "sha256-eVMEONp3yqu0gy0RtOSEpOAueXuQsGQVqac3qCJixMU=", "owner": "pdtpartners", "repo": "nix-snapshotter", - "rev": "387e220d369dfa0ad093035515e8757f83144be8", + "rev": "c738f1a16a8612dfc474a4424bacff7e89369ca3", "type": "github" }, "original": { @@ -789,14 +691,35 @@ "type": "github" } }, + "nixng": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726571270, + "narHash": "sha256-LEug48WOL+mmFYtKM57e/oudgjBk2Km5zIP3p27hF8I=", + "owner": "pizzapim", + "repo": "NixNG", + "rev": "9538892da603608f0176d07d33b1265e038c0adf", + "type": "github" + }, + "original": { + "owner": "pizzapim", + "ref": "dnsmasq", + "repo": "NixNG", + "type": "github" + } + }, "nixos-artwork": { "flake": false, "locked": { - "lastModified": 1745433976, - "narHash": "sha256-9PCkx6Rn9v4/k7obMI9jl+4L8sVesEJFT8EC/I0OMZw=", + "lastModified": 1731943625, + "narHash": "sha256-XquSEijNYtGDkW35bibT2ki18qicENCsIcDzDxrgQkM=", "ref": "refs/heads/master", - "rev": "4ad062cee62116f6055e2876e9638e7bb399d219", - "revCount": 217, + "rev": "63f68a917f4e8586c5d35e050cdaf1309832272d", + "revCount": 214, "type": "git", "url": "https://github.com/NixOS/nixos-artwork.git" }, @@ -805,13 +728,36 @@ "url": "https://github.com/NixOS/nixos-artwork.git" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat_6", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": [ + "nixpkgs-unstable" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1733328873, + "narHash": "sha256-tvy/IE0qwY37JcSZhhqNbhvVi1xdWrMRsLZ6D/+0Eyw=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "2e87e0f9f40a31396ed94b4a42595662c2eeaf31", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-facter-modules": { "locked": { - "lastModified": 1743671943, - "narHash": "sha256-7sYig0+RcrR3sOL5M+2spbpFUHyEP7cnUvCaqFOBjyU=", + "lastModified": 1732288619, + "narHash": "sha256-zSQ2cR+NRJfHUVfkv+O6Wi53wXfzX8KHiO8fRfnvc0M=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "58ad9691670d293a15221d4a78818e0088d2e086", + "rev": "862648589993a96480c2255197a28feea712f68f", "type": "github" }, "original": { @@ -822,11 +768,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -838,11 +784,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -852,38 +798,23 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-oldstable": { - "locked": { - "lastModified": 1748421225, - "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -901,11 +832,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748662220, - "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=", + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", "type": "github" }, "original": { @@ -917,59 +848,59 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748437600, - "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", - "owner": "nixos", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-25.05", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1748437600, - "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -980,17 +911,12 @@ } }, "nur": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_3", - "treefmt-nix": "treefmt-nix" - }, "locked": { - "lastModified": 1748782935, - "narHash": "sha256-wjo1BhHoBFzdtj92LrAonR1eJ8j5dt1YhnkPpqaam38=", + "lastModified": 1733327348, + "narHash": "sha256-C9cakd/zcXDhzIeHjjzToBx8bEVqWVB53RUzpUcKboM=", "owner": "nix-community", "repo": "NUR", - "rev": "73385c8de1fac0066f513adc9a7e59d69f2327c2", + "rev": "81acc5a20ba2d84d206f61d2784147900965cd9f", "type": "github" }, "original": { @@ -999,57 +925,6 @@ "type": "github" } }, - "nur_2": { - "inputs": { - "flake-parts": [ - "stylix", - "flake-parts" - ], - "nixpkgs": [ - "stylix", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1748730660, - "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", - "owner": "nix-community", - "repo": "NUR", - "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "nvf": { - "inputs": { - "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils_4", - "mnw": "mnw", - "nil": "nil", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_5" - }, - "locked": { - "lastModified": 1748651104, - "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", - "owner": "notashelf", - "repo": "nvf", - "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", - "type": "github" - }, - "original": { - "owner": "notashelf", - "repo": "nvf", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1065,7 +940,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1681413034, @@ -1092,18 +967,17 @@ "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nix-snapshotter": "nix-snapshotter", + "nixng": "nixng", "nixos-artwork": "nixos-artwork", + "nixos-cosmic": "nixos-cosmic", "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", - "nixpkgs-oldstable": "nixpkgs-oldstable", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", - "nvf": "nvf", "sops-nix": "sops-nix", "stylix": "stylix", - "tinted-schemes": "tinted-schemes", - "treefmt-nix": "treefmt-nix_3" + "treefmt-nix": "treefmt-nix" } }, "rust-overlay": { @@ -1134,17 +1008,16 @@ "rust-overlay_2": { "inputs": { "nixpkgs": [ - "nvf", - "nil", + "nixos-cosmic", "nixpkgs" ] }, "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", + "lastModified": 1732933841, + "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", + "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", "type": "github" }, "original": { @@ -1160,11 +1033,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1733128155, + "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "type": "github" }, "original": { @@ -1175,16 +1048,16 @@ }, "stable": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1730883749, + "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1193,36 +1066,29 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", + "base16-foot": "base16-foot", "base16-helix": "base16-helix", + "base16-kitty": "base16-kitty", + "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_5", - "git-hooks": "git-hooks_2", + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_4", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_4", - "nur": "nur_2", - "systems": "systems_6", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-schemes": [ - "tinted-schemes" - ], - "tinted-tmux": "tinted-tmux", - "tinted-zed": "tinted-zed" + "systems": "systems_4" }, "locked": { - "lastModified": 1748798145, - "narHash": "sha256-GPVR1UT1r0J1Lgux0h28CVCqoh0dJ67qKn2k+CTL/TI=", - "owner": "nix-community", + "lastModified": 1726497442, + "narHash": "sha256-fieyqmLEJQqqnuJcg2CAnQ8kHapXHhg9rL48NNWjnPw=", + "owner": "pizzapim", "repo": "stylix", - "rev": "275e1acae94a1c5495352fd317a87377322a5259", + "rev": "149b313ddf91c3cc94309170498b162cec666675", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "release-25.05", + "owner": "pizzapim", + "ref": "master", "repo": "stylix", "type": "github" } @@ -1286,117 +1152,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1735730497, - "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "type": "github" - } - }, - "tinted-schemes": { - "flake": false, - "locked": { - "lastModified": 1748180480, - "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", - "ref": "refs/heads/spec-0.11", - "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", - "revCount": 92, - "type": "git", - "url": "https://github.com/tinted-theming/schemes" - }, - "original": { - "type": "git", - "url": "https://github.com/tinted-theming/schemes" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1748740859, - "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, - "tinted-zed": { - "flake": false, - "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } - }, "treefmt": { "inputs": { "nixpkgs": [ @@ -1419,58 +1174,15 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1748243702, - "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 440ddfd..8533eaa 100644 --- a/flake.nix +++ b/flake.nix @@ -2,26 +2,16 @@ description = "My NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - nixpkgs-oldstable.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nur.url = "github:nix-community/NUR"; + stylix.url = "github:pizzapim/stylix/master"; treefmt-nix.url = "github:numtide/treefmt-nix"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; flake-utils.url = "github:numtide/flake-utils"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; colmena.url = "github:zhaofengli/colmena"; - stylix = { - url = "github:nix-community/stylix/release-25.05"; - inputs.tinted-schemes.follows = "tinted-schemes"; - }; - - nvf = { - url = "github:notashelf/nvf"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - git-hooks = { url = "github:cachix/git-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -33,7 +23,7 @@ }; home-manager = { - url = "github:nix-community/home-manager?ref=release-25.05"; + url = "github:nix-community/home-manager?ref=release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -53,17 +43,16 @@ flake = false; }; - tinted-schemes = { - type = "git"; - url = "https://github.com/tinted-theming/schemes"; - flake = false; - }; - sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs-stable.follows = "nixpkgs-unstable"; + }; + nix-snapshotter = { url = "github:pdtpartners/nix-snapshotter"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -73,6 +62,11 @@ url = "github:pizzapim/kubenix"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + + nixng = { + url = "github:pizzapim/NixNG/dnsmasq"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs @ { diff --git a/formatter.nix b/formatter.nix index e998dd4..74ce5d3 100644 --- a/formatter.nix +++ b/formatter.nix @@ -4,5 +4,5 @@ ... }: flake-utils.lib.eachDefaultSystem (system: { - inherit (self.packages.${system}) formatter; + formatter = self.packages.${system}.formatter; }) diff --git a/home-manager/default.nix b/home-manager/default.nix index c8b4032..7635cad 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -5,6 +5,7 @@ ... }: { imports = [ + ./neovim ./firefox ./tidal.nix ./gnome @@ -12,7 +13,6 @@ ./vscode.nix inputs.nix-index-database.hmModules.nix-index inputs.sops-nix.homeManagerModules.sops - inputs.nvf.homeManagerModules.default ]; xsession.enable = true; diff --git a/home-manager/firefox/default.nix b/home-manager/firefox/default.nix index 3f121d0..3af7f8b 100644 --- a/home-manager/firefox/default.nix +++ b/home-manager/firefox/default.nix @@ -30,7 +30,7 @@ in { id = 0; isDefault = true; settings = firefoxSettings; - extensions.packages = firefoxAddons; + extensions = firefoxAddons; }; }; }; diff --git a/home-manager/neovim/bufferline.lua b/home-manager/neovim/bufferline.lua new file mode 100644 index 0000000..ff9b448 --- /dev/null +++ b/home-manager/neovim/bufferline.lua @@ -0,0 +1,13 @@ +require("bufferline").setup({ + options = { + diagnostics = "nvim_lsp", + diagnostics_indicator = function(count, level, diagnostics_dict, context) + local icon = level:match("error") and " " or " " + return " " .. icon .. count + end, + separator_style = "slant", + hover = { enabled = true, reveal = { "close" } }, + }, +}) + +vim.keymap.set("n", "ft", ":BufferLinePick", {}) diff --git a/home-manager/neovim/cmp.lua b/home-manager/neovim/cmp.lua new file mode 100644 index 0000000..62b772b --- /dev/null +++ b/home-manager/neovim/cmp.lua @@ -0,0 +1,43 @@ +local cmp = require("cmp") +local luasnip = require("luasnip") + +require("luasnip.loaders.from_vscode").lazy_load() +luasnip.config.setup({}) + +cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete({}), + [""] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Replace, + select = true, + }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }), + sources = { { name = "nvim_lsp" }, { name = "luasnip" } }, +}) diff --git a/home-manager/neovim/commentary.lua b/home-manager/neovim/commentary.lua new file mode 100644 index 0000000..ef07ed1 --- /dev/null +++ b/home-manager/neovim/commentary.lua @@ -0,0 +1,2 @@ +vim.cmd([[autocmd FileType nix setlocal commentstring=#%s]]) +vim.cmd([[autocmd FileType terraform setlocal commentstring=#%s]]) diff --git a/home-manager/neovim/core.lua b/home-manager/neovim/core.lua new file mode 100644 index 0000000..93c0dc2 --- /dev/null +++ b/home-manager/neovim/core.lua @@ -0,0 +1,9 @@ +vim.o.background = "dark" +vim.cmd([[colorscheme gruvbox]]) +vim.g.mapleader = ";" +vim.o.signcolumn = "yes" +vim.wo.number = true +vim.wo.relativenumber = true +vim.wo.cursorline = true +vim.opt.termguicolors = true +vim.o.mousemoveevent = true diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix new file mode 100644 index 0000000..3cb10af --- /dev/null +++ b/home-manager/neovim/default.nix @@ -0,0 +1,91 @@ +{ + pkgs, + config, + lib, + ... +}: let + cfg = config.pim.neovim; +in { + options.pim.neovim.enable = lib.mkEnableOption "neovim"; + + config = lib.mkIf cfg.enable { + programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + vimdiffAlias = true; + defaultEditor = true; + extraLuaConfig = builtins.readFile ./core.lua; + + extraPackages = with pkgs; [ + nil + pyright + gopls + terraform-ls + nixfmt-classic + stylua + black + nixpkgs-fmt + ]; + + plugins = with pkgs.vimPlugins; [ + { + plugin = nvim-lspconfig; + type = "lua"; + config = builtins.readFile ./lspconfig.lua; + } + gruvbox-nvim + { + plugin = leap-nvim; + type = "lua"; + config = builtins.readFile ./leap.lua; + } + { + plugin = telescope-nvim; + type = "lua"; + config = builtins.readFile ./telescope.lua; + } + { + plugin = vim-commentary; + type = "lua"; + config = builtins.readFile ./commentary.lua; + } + vim-sleuth + { + plugin = gitsigns-nvim; + type = "lua"; + config = ''require("gitsigns").setup()''; + } + { + plugin = nvim-cmp; + type = "lua"; + config = builtins.readFile ./cmp.lua; + } + cmp-nvim-lsp + friendly-snippets + neodev-nvim + luasnip + cmp_luasnip + { + plugin = nvim-treesitter.withAllGrammars; + type = "lua"; + config = builtins.readFile ./treesitter.lua; + } + { + plugin = bufferline-nvim; + type = "lua"; + config = builtins.readFile ./bufferline.lua; + } + nvim-web-devicons + lsp-format-nvim + { + plugin = pkgs.vimPlugins.none-ls-nvim; + type = "lua"; + config = builtins.readFile ./none-ls.lua; + } + ]; + }; + + programs.git.extraConfig.core.editor = "nvim"; + }; +} diff --git a/home-manager/neovim/leap.lua b/home-manager/neovim/leap.lua new file mode 100644 index 0000000..2b15d73 --- /dev/null +++ b/home-manager/neovim/leap.lua @@ -0,0 +1,4 @@ +require("leap").add_default_mappings() +-- Don't remap 'x' in visual mode. +vim.keymap.del({ "x", "o" }, "x") +vim.keymap.del({ "x", "o" }, "X") diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua new file mode 100644 index 0000000..523ec86 --- /dev/null +++ b/home-manager/neovim/lspconfig.lua @@ -0,0 +1,65 @@ +require("lsp-format").setup({}) + +local on_attach = function(client, bufnr) + local bufmap = function(keys, func) + vim.keymap.set("n", keys, func, { buffer = bufnr }) + end + + bufmap("r", vim.lsp.buf.rename) + bufmap("a", vim.lsp.buf.code_action) + + bufmap("gd", vim.lsp.buf.definition) + bufmap("gD", vim.lsp.buf.declaration) + bufmap("gI", vim.lsp.buf.implementation) + bufmap("D", vim.lsp.buf.type_definition) + + bufmap("gr", require("telescope.builtin").lsp_references) + bufmap("s", require("telescope.builtin").lsp_document_symbols) + bufmap("S", require("telescope.builtin").lsp_dynamic_workspace_symbols) + + bufmap("K", vim.lsp.buf.hover) + + vim.api.nvim_buf_create_user_command(bufnr, "Format", function(_) + vim.lsp.buf.format() + end, {}) +end + +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities) + +require("neodev").setup() +require("lspconfig").nil_ls.setup({ + on_attach = on_attach, + capabilities = capabilities, +}) +require("lspconfig").pyright.setup({ + on_attach = on_attach, + capabilities = capabilities, +}) +require("lspconfig").gopls.setup({ + on_attach = on_attach, + capabilities = capabilities, +}) +require("lspconfig").terraformls.setup({ + on_attach = on_attach, + capabilities = capabilities, +}) + +local function has_treefmt() + local git_root = vim.fn.systemlist("git rev-parse --show-toplevel")[1] + if vim.v.shell_error ~= 0 then + return false + end + local treefmt_path = git_root .. "/treefmt.nix" + return vim.fn.filereadable(treefmt_path) == 1 +end + +vim.api.nvim_create_autocmd("BufWritePost", { + pattern = "*", + callback = function() + if vim.fn.expand("%:p") ~= vim.fn.getcwd() .. "/.git/COMMIT_EDITMSG" and has_treefmt() then + vim.cmd("silent !treefmt > /dev/null 2>&1") + end + end, + group = vim.api.nvim_create_augroup("TreefmtAutoformat", { clear = true }), +}) diff --git a/home-manager/neovim/none-ls.lua b/home-manager/neovim/none-ls.lua new file mode 100644 index 0000000..afc9805 --- /dev/null +++ b/home-manager/neovim/none-ls.lua @@ -0,0 +1,53 @@ +-- renamed to none-ls +local null_ls_status_ok, null_ls = pcall(require, "null-ls") +if not null_ls_status_ok then + return +end + +local formatting = null_ls.builtins.formatting +local diagnostics = null_ls.builtins.diagnostics +local code_actions = null_ls.builtins.code_actions + +-- to setup format on save +local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) + +require("null-ls").setup({ + sources = { + formatting.stylua, + formatting.black, + formatting.nixpkgs_fmt, + formatting.mix, + }, + + -- configure format on save + -- on_attach = function(current_client, bufnr) + -- if current_client.supports_method("textDocument/formatting") then + -- vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) + -- vim.api.nvim_create_autocmd("BufWritePre", { + -- group = augroup, + -- buffer = bufnr, + -- callback = function() + -- vim.lsp.buf.format({ + -- filter = function(client) + -- -- only use null-ls for formatting instead of lsp server + -- return client.name == "null-ls" + -- end, + -- bufnr = bufnr, + -- }) + -- end, + -- }) + -- end + -- end, +}) + +-- formatting command +vim.api.nvim_create_user_command("Format", function() + vim.lsp.buf.format(nil, 10000) +end, {}) + +vim.keymap.set( + "n", + "fm", + ":Format", + { desc = "Format current buffer (also done on save)", noremap = true, silent = true } +) diff --git a/home-manager/neovim/telescope.lua b/home-manager/neovim/telescope.lua new file mode 100644 index 0000000..0dff4b5 --- /dev/null +++ b/home-manager/neovim/telescope.lua @@ -0,0 +1,17 @@ +local builtin = require("telescope.builtin") + +vim.keymap.set("n", "ff", builtin.find_files, {}) +vim.keymap.set("n", "fg", builtin.live_grep, {}) +vim.keymap.set("n", "fb", builtin.buffers, {}) +vim.keymap.set("n", "fr", builtin.lsp_references, {}) +vim.keymap.set("n", "fs", builtin.lsp_document_symbols, {}) + +require("telescope").setup({ + pickers = { + find_files = { theme = "dropdown" }, + live_grep = { theme = "dropdown" }, + buffers = { theme = "dropdown" }, + lsp_references = { theme = "dropdown" }, + lsp_document_symbols = { theme = "dropdown" }, + }, +}) diff --git a/home-manager/neovim/treesitter.lua b/home-manager/neovim/treesitter.lua new file mode 100644 index 0000000..1a873cf --- /dev/null +++ b/home-manager/neovim/treesitter.lua @@ -0,0 +1,9 @@ +require("nvim-treesitter.configs").setup({ + ensure_installed = {}, + + auto_install = false, + + highlight = { enable = true }, + + indent = { enable = true }, +}) diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index 4388f8f..df18541 100644 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -12,22 +12,20 @@ in { programs.vscode = { enable = true; package = pkgs.vscodium; - profiles.default = { - extensions = with pkgs.vscode-extensions; [ - vscodevim.vim - marp-team.marp-vscode - jnoortheen.nix-ide - mkhl.direnv - ]; + extensions = with pkgs.vscode-extensions; [ + vscodevim.vim + marp-team.marp-vscode + jnoortheen.nix-ide + mkhl.direnv + ]; - userSettings = { - "nix.enableLanguageServer" = true; - "nix.serverPath" = lib.getExe pkgs.nil; - "terminal.integrated.defaultProfile.linux" = "fish"; - "explorer.confirmDragAndDrop" = false; - "explorer.confirmPasteNative" = false; - "explorer.confirmDelete" = false; - }; + userSettings = { + "nix.enableLanguageServer" = true; + "nix.serverPath" = lib.getExe pkgs.nil; + "terminal.integrated.defaultProfile.linux" = "fish"; + "explorer.confirmDragAndDrop" = false; + "explorer.confirmPasteNative" = false; + "explorer.confirmDelete" = false; }; }; }; diff --git a/machines/atlas/configuration.nix b/machines/atlas/configuration.nix index 24a6495..eb1dda3 100644 --- a/machines/atlas/configuration.nix +++ b/machines/atlas/configuration.nix @@ -1,129 +1,27 @@ -{config, ...}: { +{ + config, + pkgs, + ... +}: { + imports = [./jellyseerr-module.nix]; + + disabledModules = ["services/misc/jellyseerr.nix"]; + config = { facter.reportPath = ./facter.json; system.stateVersion = "23.05"; users.users.root.openssh.authorizedKeys.keys = config.pim.ssh.keys.pim ++ config.pim.ssh.keys.niels; - pim.k3s.serverAddr = "https://lewis.dmz:6443"; - - pim.backups.borgBackups = { - freshrss = { - paths = ["/mnt/longhorn/persistent/volumes/freshrss"]; - deploymentName = "server"; - deploymentNamespace = "freshrss"; - }; - - nextcloud = { - paths = ["/mnt/longhorn/persistent/volumes/nextcloud"]; - deploymentName = "server"; - deploymentNamespace = "nextcloud"; - }; - - nextcloud-db = { - paths = ["/mnt/longhorn/persistent/volumes/nextcloud-db"]; - deploymentName = "database"; - deploymentNamespace = "nextcloud"; - }; - - authentik = { - paths = ["/mnt/longhorn/persistent/volumes/authentik-db" "/mnt/longhorn/persistent/volumes/authentik-redis"]; - scaleDeployments = false; - }; - - radicale = { - paths = ["/mnt/longhorn/persistent/volumes/radicale"]; - deploymentName = "server"; - deploymentNamespace = "radicale"; - }; - - forgejo = { - paths = ["/mnt/longhorn/persistent/volumes/forgejo"]; - deploymentName = "server"; - deploymentNamespace = "forgejo"; - }; - - syncthing = { - paths = ["/mnt/longhorn/persistent/volumes/syncthing" "/mnt/longhorn/persistent/volumes/keepassxc"]; - deploymentName = "syncthing"; - deploymentNamespace = "syncthing"; - }; - - ntfy = { - paths = ["/mnt/longhorn/persistent/volumes/ntfy"]; - deploymentName = "ntfy"; - deploymentNamespace = "ntfy"; - }; - - hedgedoc-uploads = { - paths = ["/mnt/longhorn/persistent/volumes/hedgedoc-uploads"]; - deploymentName = "server"; - deploymentNamespace = "hedgedoc"; - }; - - hedgedoc-db = { - paths = ["/mnt/longhorn/persistent/volumes/hedgedoc-db"]; - deploymentName = "database"; - deploymentNamespace = "hedgedoc"; - }; - - atuin-db = { - paths = ["/mnt/longhorn/persistent/volumes/atuin-db"]; - deploymentName = "server"; - deploymentNamespace = "atuin"; - }; - - paperless-data = { - paths = ["/mnt/longhorn/persistent/volumes/paperless-data"]; - deploymentName = "server"; - deploymentNamespace = "paperless"; - }; - - paperless-redisdata = { - paths = ["/mnt/longhorn/persistent/volumes/paperless-redisdata"]; - deploymentName = "redis"; - deploymentNamespace = "paperless"; - }; - - paperless-db = { - paths = ["/mnt/longhorn/persistent/volumes/paperless-db"]; - deploymentName = "database"; - deploymentNamespace = "paperless"; - }; - - immich = { - paths = ["/mnt/longhorn/persistent/volumes/immich"]; - deploymentName = "immich"; - deploymentNamespace = "immich"; - }; - - immich-db = { - paths = ["/mnt/longhorn/persistent/volumes/immich-db"]; - deploymentName = "database"; - deploymentNamespace = "immich"; - }; - - attic = { - paths = ["/mnt/longhorn/persistent/volumes/attic"]; - deploymentName = "attic"; - deploymentNamespace = "attic"; - }; - - attic-db = { - paths = ["/mnt/longhorn/persistent/volumes/attic-db"]; - deploymentName = "attic-db"; - deploymentNamespace = "attic"; - }; - - kitchenowl = { - paths = ["/mnt/longhorn/persistent/volumes/kitchenowl"]; - deploymentName = "server"; - deploymentNamespace = "kitchenowl"; - }; - }; + pim.k3s.serverAddr = "https://jefke.dmz:6443"; deployment = { targetHost = "atlas"; targetUser = "root"; tags = ["server" "kubernetes"]; }; + + services.jellyseerr = { + enable = true; + package = pkgs.callPackage ./jellyseerr.nix {}; + }; }; } diff --git a/machines/atlas/facter.json b/machines/atlas/facter.json index 03da58b..200d9bd 100644 --- a/machines/atlas/facter.json +++ b/machines/atlas/facter.json @@ -23,14 +23,9 @@ }, "bluetooth": [ { - "index": 27, - "attached_to": 28, - "class_list": [ - "usb", - "bluetooth" - ], + "index": 45, + "attached_to": 46, "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -39,20 +34,16 @@ "number": 0 }, "base_class": { - "hex": "0115", "name": "Bluetooth Device", "value": 277 }, "vendor": { - "hex": "8087", "value": 32903 }, "device": { - "hex": "0aa7", "value": 2727 }, "revision": { - "hex": "0000", "name": "0.01", "value": 0 }, @@ -71,23 +62,19 @@ ], "detail": { "device_class": { - "hex": "00e0", "name": "wireless", "value": 224 }, "device_subclass": { - "hex": "0001", "name": "audio", "value": 1 }, "device_protocol": 1, "interface_class": { - "hex": "00e0", "name": "wireless", "value": 224 }, "interface_subclass": { - "hex": "0001", "name": "audio", "value": 1 }, @@ -107,14 +94,9 @@ "module_alias": "usb:v8087p0AA7d0001dcE0dsc01dp01icE0isc01ip01in00" }, { - "index": 29, - "attached_to": 28, - "class_list": [ - "usb", - "bluetooth" - ], + "index": 47, + "attached_to": 46, "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -123,20 +105,16 @@ "number": 0 }, "base_class": { - "hex": "0115", "name": "Bluetooth Device", "value": 277 }, "vendor": { - "hex": "8087", "value": 32903 }, "device": { - "hex": "0aa7", "value": 2727 }, "revision": { - "hex": "0000", "name": "0.01", "value": 0 }, @@ -155,23 +133,19 @@ ], "detail": { "device_class": { - "hex": "00e0", "name": "wireless", "value": 224 }, "device_subclass": { - "hex": "0001", "name": "audio", "value": 1 }, "device_protocol": 1, "interface_class": { - "hex": "00e0", "name": "wireless", "value": 224 }, "interface_subclass": { - "hex": "0001", "name": "audio", "value": 1 }, @@ -195,12 +169,7 @@ { "index": 10, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -209,34 +178,27 @@ "number": 31 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0001", "name": "ISA bridge", "value": 1 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31e8", "value": 12776 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel ISA bridge", @@ -250,26 +212,13 @@ "irq": 0, "prog_if": 0 }, - "driver": "lpc_ich", - "driver_module": "lpc_ich", - "drivers": [ - "lpc_ich" - ], - "driver_modules": [ - "lpc_ich" - ], "module_alias": "pci:v00008086d000031E8sv00001458sd00001000bc06sc01i00", "label": "Onboard - Other" }, { "index": 11, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -278,39 +227,31 @@ "number": 19 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { - "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31da", "value": 12762 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "00f3", "value": 243 }, "model": "Intel PCI bridge", @@ -319,7 +260,7 @@ "resources": [ { "type": "irq", - "base": 121, + "base": 123, "triggered": 0, "enabled": true } @@ -329,28 +270,19 @@ "command": 1031, "header_type": 1, "secondary_bus": 2, - "irq": 121, + "irq": 123, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], "module_alias": "pci:v00008086d000031DAsv00001458sd00001000bc06sc04i00" }, { "index": 13, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -359,39 +291,31 @@ "number": 19 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { - "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31d8", "value": 12760 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "00f3", "value": 243 }, "model": "Intel PCI bridge", @@ -400,7 +324,7 @@ "resources": [ { "type": "irq", - "base": 120, + "base": 122, "triggered": 0, "enabled": true } @@ -410,28 +334,19 @@ "command": 1031, "header_type": 1, "secondary_bus": 1, - "irq": 120, + "irq": 122, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], "module_alias": "pci:v00008086d000031D8sv00001458sd00001000bc06sc04i00" }, { "index": 17, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -440,34 +355,27 @@ "number": 0 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0000", "name": "Host bridge", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31f0", "value": 12784 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel Host bridge", @@ -487,12 +395,7 @@ { "index": 20, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -501,39 +404,31 @@ "number": 19 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { - "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31db", "value": 12763 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "00f3", "value": 243 }, "model": "Intel PCI bridge", @@ -542,7 +437,7 @@ "resources": [ { "type": "irq", - "base": 122, + "base": 124, "triggered": 0, "enabled": true } @@ -552,17 +447,13 @@ "command": 1031, "header_type": 1, "secondary_bus": 3, - "irq": 122, + "irq": 124, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], "module_alias": "pci:v00008086d000031DBsv00001458sd00001000bc06sc04i00" } ], @@ -570,7 +461,6 @@ { "architecture": "x86_64", "vendor_name": "GenuineIntel", - "model_name": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz", "family": 6, "model": 122, "stepping": 1, @@ -692,38 +582,112 @@ "rfds", "bhi" ], - "power_management": [ - "" - ], "bogo": 2995.2, "cache": 4096, "units": 64, "physical_id": 0, "siblings": 4, "cores": 4, - "fpu": false, - "fpu_exception": false, + "fpu": true, + "fpu_exception": true, "cpuid_level": 24, "write_protect": false, "clflush_size": 64, "cache_alignment": 64, "address_sizes": { - "physical": "0x27", - "virtual": "0x30" + "physical": 39, + "virtual": 48 } } ], "disk": [ { "index": 25, - "attached_to": 14, - "class_list": [ - "disk", - "block_device", - "nvme" - ], + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 7, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf61", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdf", + "sysfs_bus_id": "7:0:0:1", + "sysfs_device_link": "/devices/platform/host7/session47/target7:0:0/7:0:0:1", + "unix_device_name": "/dev/sdf", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 80, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/62", + "/dev/disk/by-id/scsi-360000000000000000e00000000060001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000060001", + "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:pvc-9a1d2ca8-edce-416c-b41b-42bcd3380887-lun-1", + "/dev/disk/by-uuid/35036532-23d4-4038-bfe6-15a86e793ed5", + "/dev/sdf" + ], + "unix_device_name2": "/dev/sg14", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 14, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1018, + "heads": 166, + "sectors": 62, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 10485760, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 26, + "attached_to": 14, "bus_type": { - "hex": "0096", "name": "NVME", "value": 150 }, @@ -732,30 +696,24 @@ "number": 0 }, "base_class": { - "hex": "0106", "name": "Mass Storage Device", "value": 262 }, "sub_class": { - "hex": "0000", "name": "Disk", "value": 0 }, "vendor": { - "hex": "2646", "value": 9798 }, "sub_vendor": { - "hex": "2646", "value": 9798 }, "device": { - "hex": "5017", "name": "KINGSTON SNV2S1000G", "value": 20503 }, "sub_device": { - "hex": "5017", "value": 20503 }, "serial": "50026B7784EB3FFB", @@ -771,6 +729,7 @@ "range": 0 }, "unix_device_names": [ + "/dev/disk/by-diskseq/1", "/dev/disk/by-id/nvme-KINGSTON_SNV2S1000G_50026B7784EB3FFB", "/dev/disk/by-id/nvme-KINGSTON_SNV2S1000G_50026B7784EB3FFB_1", "/dev/disk/by-id/nvme-eui.00000000000000000026b7784eb3ffb5", @@ -783,7 +742,7 @@ "cylinders": 953869, "heads": 64, "sectors": 32, - "size": "0x0", + "size": 0, "geo_type": "logical" }, { @@ -803,15 +762,584 @@ ] }, { - "index": 26, - "attached_to": 18, - "class_list": [ - "disk", - "ide", - "block_device" - ], + "index": 27, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 5, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf41", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdd", + "sysfs_bus_id": "5:0:0:1", + "sysfs_device_link": "/devices/platform/host5/session46/target5:0:0/5:0:0:1", + "unix_device_name": "/dev/sdd", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 48, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/61", + "/dev/disk/by-id/scsi-360000000000000000e00000000040001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000040001", + "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:radicale-lun-1", + "/dev/disk/by-uuid/6378cbe8-6c3e-4a9c-8397-9530d32668fb", + "/dev/sdd" + ], + "unix_device_name2": "/dev/sg12", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 12, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1008, + "heads": 7, + "sectors": 58, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 409600, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 28, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 3, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf31", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdb", + "sysfs_bus_id": "3:0:0:1", + "sysfs_device_link": "/devices/platform/host3/session31/target3:0:0/3:0:0:1", + "unix_device_name": "/dev/sdb", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 16, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/46", + "/dev/disk/by-id/scsi-360000000000000000e00000000030001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000030001", + "/dev/disk/by-path/ip-10.42.1.148:3260-iscsi-iqn.2019-10.io.longhorn:freshrss-lun-1", + "/dev/disk/by-uuid/dd58e1cc-0b35-43e8-b267-c899b93bfb58", + "/dev/sdb" + ], + "unix_device_name2": "/dev/sg4", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 4, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1011, + "heads": 34, + "sectors": 61, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 2097152, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 29, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 11, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf51", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdk", + "sysfs_bus_id": "11:0:0:1", + "sysfs_device_link": "/devices/platform/host11/session45/target11:0:0/11:0:0:1", + "unix_device_name": "/dev/sdk", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 160, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/60", + "/dev/disk/by-id/scsi-360000000000000000e00000000050001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000050001", + "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:atuin-db-lun-1", + "/dev/disk/by-uuid/2f56d1b7-45ad-4a6f-b1f7-fcfa01ef03af", + "/dev/sdk" + ], + "unix_device_name2": "/dev/sg10", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 10, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 10, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 614400, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 30, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 2, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf21", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdi", + "sysfs_bus_id": "2:0:0:1", + "sysfs_device_link": "/devices/platform/host2/session37/target2:0:0/2:0:0:1", + "unix_device_name": "/dev/sdi", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 128, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/52", + "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:attic-lun-1", + "/dev/disk/by-uuid/bd47a75f-71d2-4e73-85e1-65997fcef2c2", + "/dev/sdi" + ], + "unix_device_name2": "/dev/sg6", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 6, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 15360, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 31457280, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 31, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 8, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf11", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdg", + "sysfs_bus_id": "8:0:0:1", + "sysfs_device_link": "/devices/platform/host8/session48/target8:0:0/8:0:0:1", + "unix_device_name": "/dev/sdg", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 96, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/63", + "/dev/disk/by-id/scsi-360000000000000000e00000000010001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000010001", + "/dev/disk/by-path/ip-10.42.1.5:3260-iscsi-iqn.2019-10.io.longhorn:prowlarr-lun-1", + "/dev/disk/by-uuid/485930ae-2fe2-4470-b99a-dc61a93d921c", + "/dev/sdg" + ], + "unix_device_name2": "/dev/sg16", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 16, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 5, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 307200, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 32, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 6, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf11", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sde", + "sysfs_bus_id": "6:0:0:1", + "sysfs_device_link": "/devices/platform/host6/session42/target6:0:0/6:0:0:1", + "unix_device_name": "/dev/sde", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 64, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/57", + "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:forgejo-lun-1", + "/dev/disk/by-uuid/0448fef2-ca9e-4a75-9d21-e148e3e9fe34", + "/dev/sde" + ], + "unix_device_name2": "/dev/sg8", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 8, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 20480, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 41943040, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 33, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf21", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdc", + "sysfs_bus_id": "4:0:0:1", + "sysfs_device_link": "/devices/platform/host4/session29/target4:0:0/4:0:0:1", + "unix_device_name": "/dev/sdc", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 32, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/44", + "/dev/disk/by-path/ip-10.42.1.148:3260-iscsi-iqn.2019-10.io.longhorn:atuin-lun-1", + "/dev/disk/by-uuid/f4def3ee-1977-48a5-8c34-badb13c8e3b1", + "/dev/sdc" + ], + "unix_device_name2": "/dev/sg2", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 2, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 10, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 614400, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 34, + "attached_to": 18, "bus_type": { - "hex": "0085", "name": "IDE", "value": 133 }, @@ -820,27 +1348,22 @@ "number": 0 }, "base_class": { - "hex": "0106", "name": "Mass Storage Device", "value": 262 }, "sub_class": { - "hex": "0000", "name": "Disk", "value": 0 }, "vendor": { - "hex": "0000", "name": "Hitachi", "value": 0 }, "device": { - "hex": "0000", "name": "HTS72755", "value": 0 }, "revision": { - "hex": "0000", "name": "A0E0", "value": 0 }, @@ -857,6 +1380,7 @@ "range": 16 }, "unix_device_names": [ + "/dev/disk/by-diskseq/2", "/dev/disk/by-id/ata-Hitachi_HTS727550A9E364_J33B0084GPB4PB", "/dev/disk/by-id/wwn-0x5000cca68cc9b5a7", "/dev/disk/by-path/pci-0000:00:12.0-ata-1", @@ -869,7 +1393,7 @@ "cylinders": 60801, "heads": 255, "sectors": 63, - "size": "0x0", + "size": 0, "geo_type": "logical" }, { @@ -889,18 +1413,96 @@ "ahci", "sd_mod" ] + }, + { + "index": 35, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 9, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf21", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdh", + "sysfs_bus_id": "9:0:0:1", + "sysfs_device_link": "/devices/platform/host9/session50/target9:0:0/9:0:0:1", + "unix_device_name": "/dev/sdh", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 112, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/65", + "/dev/disk/by-id/scsi-360000000000000000e00000000020001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000020001", + "/dev/disk/by-path/ip-10.42.1.5:3260-iscsi-iqn.2019-10.io.longhorn:paperless-data-lun-1", + "/dev/disk/by-uuid/682d7efc-356e-4180-aff9-e5e6a7792702", + "/dev/sdh" + ], + "unix_device_name2": "/dev/sg18", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 18, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 10240, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 20971520, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] } ], "graphics_card": [ { "index": 23, "attached_to": 0, - "class_list": [ - "graphics_card", - "pci" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -909,39 +1511,31 @@ "number": 2 }, "base_class": { - "hex": "0003", "name": "Display controller", "value": 3 }, "sub_class": { - "hex": "0000", "name": "VGA compatible controller", "value": 0 }, "pci_interface": { - "hex": "0000", "name": "VGA", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "3185", "value": 12677 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel VGA compatible controller", @@ -957,7 +1551,7 @@ }, { "type": "irq", - "base": 136, + "base": 134, "triggered": 0, "enabled": true }, @@ -991,7 +1585,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 136, + "irq": 134, "prog_if": 0 }, "driver": "i915", @@ -1008,14 +1602,9 @@ ], "hub": [ { - "index": 28, + "index": 46, "attached_to": 21, - "class_list": [ - "usb", - "hub" - ], "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -1024,27 +1613,23 @@ "number": 0 }, "base_class": { - "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "hex": "1d6b", - "name": "Linux 6.14.8 xhci-hcd", + "name": "Linux 6.6.43 xhci-hcd", "value": 7531 }, "device": { - "hex": "0002", "name": "xHCI Host Controller", "value": 2 }, "revision": { - "hex": "0000", - "name": "6.14", + "name": "6.06", "value": 0 }, "serial": "0000:00:15.0", - "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller", + "model": "Linux 6.6.43 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ @@ -1059,23 +1644,19 @@ ], "detail": { "device_class": { - "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 1, "interface_class": { - "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1085,24 +1666,15 @@ }, "hotplug": "usb", "driver": "hub", - "driver_module": "usbcore", "drivers": [ "hub" ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 30, + "index": 48, "attached_to": 21, - "class_list": [ - "usb", - "hub" - ], "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -1111,48 +1683,40 @@ "number": 0 }, "base_class": { - "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "hex": "1d6b", - "name": "Linux 6.14.8 xhci-hcd", + "name": "Linux 6.6.43 xhci-hcd", "value": 7531 }, "device": { - "hex": "0003", "name": "xHCI Host Controller", "value": 3 }, "revision": { - "hex": "0000", - "name": "6.14", + "name": "6.06", "value": 0 }, "serial": "0000:00:15.0", - "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller", + "model": "Linux 6.6.43 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { "device_class": { - "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 3, "interface_class": { - "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1162,30 +1726,21 @@ }, "hotplug": "usb", "driver": "hub", - "driver_module": "usbcore", "drivers": [ "hub" ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" } ], "memory": [ { "index": 7, "attached_to": 0, - "class_list": [ - "memory" - ], "base_class": { - "hex": "0101", "name": "Internally Used Class", "value": 257 }, "sub_class": { - "hex": "0002", "name": "Main Memory", "value": 2 }, @@ -1194,7 +1749,7 @@ { "type": "mem", "base": 0, - "range": 25003536384, + "range": 25008361472, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -1210,12 +1765,7 @@ { "index": 8, "attached_to": 20, - "class_list": [ - "network_controller", - "pci" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1224,33 +1774,26 @@ "number": 0 }, "base_class": { - "hex": "0002", "name": "Network controller", "value": 2 }, "sub_class": { - "hex": "0000", "name": "Ethernet controller", "value": 0 }, "vendor": { - "hex": "10ec", "value": 4332 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "8168", "value": 33128 }, "sub_device": { - "hex": "e000", "value": 57344 }, "revision": { - "hex": "0015", "value": 21 }, "model": "Ethernet controller", @@ -1320,13 +1863,7 @@ { "index": 12, "attached_to": 11, - "class_list": [ - "network_controller", - "pci", - "wlan_card" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1335,52 +1872,37 @@ "number": 0 }, "base_class": { - "hex": "0002", "name": "Network controller", "value": 2 }, "sub_class": { - "hex": "0082", - "name": "WLAN controller", - "value": 130 + "name": "Network controller", + "value": 128 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "device": { - "hex": "24fb", "value": 9467 }, "sub_device": { - "hex": "2110", "value": 8464 }, "revision": { - "hex": "0010", "value": 16 }, - "model": "Intel WLAN controller", + "model": "Intel Network controller", "sysfs_id": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0", "sysfs_bus_id": "0000:02:00.0", - "unix_device_name": "wlo1", - "unix_device_names": [ - "wlo1" - ], "resources": [ - { - "type": "hwaddr", - "address": 102 - }, { "type": "irq", - "base": 135, + "base": 20, "triggered": 0, "enabled": true }, @@ -1391,171 +1913,47 @@ "enabled": true, "access": "read_write", "prefetch": "no" - }, - { - "type": "phwaddr", - "address": 102 - }, - { - "type": "wlan", - "channels": [ - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "13", - "14", - "36", - "40", - "44", - "48", - "52", - "56", - "60", - "64", - "100", - "104", - "108", - "112", - "116", - "120", - "124", - "128", - "132", - "136" - ], - "frequencies": [ - "2.412", - "2.417", - "2.422", - "2.427", - "2.432", - "2.437", - "2.442", - "2.447", - "2.452", - "2.457", - "2.462", - "2.467", - "2.472", - "2.484", - "5.18", - "5.2", - "5.22", - "5.24", - "5.26", - "5.28", - "5.3", - "5.32", - "5.5", - "5.52", - "5.54", - "5.56", - "5.58", - "5.6", - "5.62", - "5.64", - "5.66", - "5.68" - ], - "auth_modes": [ - "open", - "sharedkey", - "wpa-psk", - "wpa-eap" - ], - "enc_modes": [ - "WEP40", - "WEP104", - "TKIP", - "CCMP" - ] } ], "detail": { "function": 0, - "command": 1030, + "command": 2, "header_type": 0, "secondary_bus": 0, - "irq": 135, + "irq": 20, "prog_if": 0 }, - "driver": "iwlwifi", - "driver_module": "iwlwifi", - "drivers": [ - "iwlwifi" - ], - "driver_modules": [ - "iwlwifi" - ], "module_alias": "pci:v00008086d000024FBsv00008086sd00002110bc02sc80i00", "label": "Onboard - RTK Ethernet" } ], "network_interface": [ { - "index": 35, - "attached_to": 12, - "class_list": [ - "network_interface" - ], + "index": 59, + "attached_to": 0, "base_class": { - "hex": "0107", "name": "Network Interface", "value": 263 }, "sub_class": { - "hex": "0001", - "name": "Ethernet", - "value": 1 + "name": "Loopback", + "value": 0 }, - "model": "Ethernet network interface", - "sysfs_id": "/class/net/wlo1", - "sysfs_device_link": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0", - "unix_device_name": "wlo1", + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", "unix_device_names": [ - "wlo1" - ], - "resources": [ - { - "type": "hwaddr", - "address": 102 - }, - { - "type": "phwaddr", - "address": 102 - } - ], - "driver": "iwlwifi", - "driver_module": "iwlwifi", - "drivers": [ - "iwlwifi" - ], - "driver_modules": [ - "iwlwifi" + "lo" ] }, { - "index": 43, + "index": 90, "attached_to": 8, - "class_list": [ - "network_interface" - ], "base_class": { - "hex": "0107", "name": "Network Interface", "value": 263 }, "sub_class": { - "hex": "0001", "name": "Ethernet", "value": 1 }, @@ -1584,41 +1982,203 @@ "driver_modules": [ "r8169" ] - }, - { - "index": 53, - "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" - ] } ], - "pci": [ + "storage_controller": [ + { + "index": 14, + "attached_to": 13, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 1, + "number": 0 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "value": 8 + }, + "pci_interface": { + "value": 2 + }, + "vendor": { + "value": 9798 + }, + "sub_vendor": { + "value": 9798 + }, + "device": { + "value": 20503 + }, + "sub_device": { + "value": 20503 + }, + "revision": { + "value": 3 + }, + "model": "Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0", + "sysfs_bus_id": "0000:01:00.0", + "resources": [ + { + "type": "irq", + "base": 22, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2703228928, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 22, + "prog_if": 2 + }, + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ], + "module_alias": "pci:v00002646d00005017sv00002646sd00005017bc01sc08i02" + }, + { + "index": 18, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 18 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "value": 6 + }, + "pci_interface": { + "value": 1 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12771 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:12.0", + "sysfs_bus_id": "0000:00:12.0", + "resources": [ + { + "type": "io", + "base": 61536, + "range": 32, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 61568, + "range": 4, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 61584, + "range": 8, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 131, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2704343040, + "range": 8192, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2704371712, + "range": 2048, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2704375808, + "range": 256, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 131, + "prog_if": 1 + }, + "driver": "ahci", + "driver_module": "ahci", + "drivers": [ + "ahci" + ], + "driver_modules": [ + "ahci" + ], + "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01", + "label": "Onboard - SATA" + } + ], + "system": { + "form_factor": "desktop" + }, + "unknown": [ { "index": 9, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1627,37 +2187,29 @@ "number": 28 }, "base_class": { - "hex": "0008", "name": "Generic system peripheral", "value": 8 }, "sub_class": { - "hex": "0005", "value": 5 }, "pci_interface": { - "hex": "0001", "value": 1 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31cc", "value": 12748 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel Generic system peripheral", @@ -1709,12 +2261,7 @@ { "index": 15, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1723,37 +2270,29 @@ "number": 30 }, "base_class": { - "hex": "0008", "name": "Generic system peripheral", "value": 8 }, "sub_class": { - "hex": "0005", "value": 5 }, "pci_interface": { - "hex": "0001", "value": 1 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31d0", "value": 12752 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel Generic system peripheral", @@ -1805,12 +2344,7 @@ { "index": 16, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1819,34 +2353,27 @@ "number": 15 }, "base_class": { - "hex": "0007", "name": "Communication controller", "value": 7 }, "sub_class": { - "hex": "0080", "name": "Communication controller", "value": 128 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "319a", "value": 12698 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel Communication controller", @@ -1855,7 +2382,7 @@ "resources": [ { "type": "irq", - "base": 134, + "base": 132, "triggered": 0, "enabled": true }, @@ -1873,7 +2400,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 134, + "irq": 132, "prog_if": 0 }, "driver": "mei_me", @@ -1890,12 +2417,7 @@ { "index": 19, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1904,34 +2426,27 @@ "number": 31 }, "base_class": { - "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { - "hex": "0005", "name": "SMBus", "value": 5 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31d4", "value": 12756 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel SMBus", @@ -1982,12 +2497,7 @@ { "index": 22, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1996,34 +2506,27 @@ "number": 0 }, "base_class": { - "hex": "0008", "name": "Generic system peripheral", "value": 8 }, "sub_class": { - "hex": "0080", "name": "System peripheral", "value": 128 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "3190", "value": 12688 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel System peripheral", @@ -2055,248 +2558,23 @@ }, "module_alias": "pci:v00008086d00003190sv00001458sd00001000bc08sc80i00", "label": "Onboard - Other" - } - ], - "storage_controller": [ - { - "index": 14, - "attached_to": 13, - "class_list": [ - "storage_controller", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 1, - "number": 0 - }, - "base_class": { - "hex": "0001", - "name": "Mass storage controller", - "value": 1 - }, - "sub_class": { - "hex": "0008", - "value": 8 - }, - "pci_interface": { - "hex": "0002", - "value": 2 - }, - "vendor": { - "hex": "2646", - "value": 9798 - }, - "sub_vendor": { - "hex": "2646", - "value": 9798 - }, - "device": { - "hex": "5017", - "value": 20503 - }, - "sub_device": { - "hex": "5017", - "value": 20503 - }, - "revision": { - "hex": "0003", - "value": 3 - }, - "model": "Mass storage controller", - "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0", - "sysfs_bus_id": "0000:01:00.0", - "resources": [ - { - "type": "irq", - "base": 22, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 2703228928, - "range": 16384, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1030, - "header_type": 0, - "secondary_bus": 0, - "irq": 22, - "prog_if": 2 - }, - "driver": "nvme", - "driver_module": "nvme", - "drivers": [ - "nvme" - ], - "driver_modules": [ - "nvme" - ], - "module_alias": "pci:v00002646d00005017sv00002646sd00005017bc01sc08i02" }, - { - "index": 18, - "attached_to": 0, - "class_list": [ - "storage_controller", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 18 - }, - "base_class": { - "hex": "0001", - "name": "Mass storage controller", - "value": 1 - }, - "sub_class": { - "hex": "0006", - "value": 6 - }, - "pci_interface": { - "hex": "0001", - "value": 1 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "sub_vendor": { - "hex": "1458", - "value": 5208 - }, - "device": { - "hex": "31e3", - "value": 12771 - }, - "sub_device": { - "hex": "1000", - "value": 4096 - }, - "revision": { - "hex": "0003", - "value": 3 - }, - "model": "Intel Mass storage controller", - "sysfs_id": "/devices/pci0000:00/0000:00:12.0", - "sysfs_bus_id": "0000:00:12.0", - "resources": [ - { - "type": "io", - "base": 61536, - "range": 32, - "enabled": true, - "access": "read_write" - }, - { - "type": "io", - "base": 61568, - "range": 4, - "enabled": true, - "access": "read_write" - }, - { - "type": "io", - "base": 61584, - "range": 8, - "enabled": true, - "access": "read_write" - }, - { - "type": "irq", - "base": 133, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 2704343040, - "range": 8192, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 2704371712, - "range": 2048, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 2704375808, - "range": 256, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1031, - "header_type": 0, - "secondary_bus": 0, - "irq": 133, - "prog_if": 1 - }, - "driver": "ahci", - "driver_module": "ahci", - "drivers": [ - "ahci" - ], - "driver_modules": [ - "ahci" - ], - "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01", - "label": "Onboard - SATA" - } - ], - "system": { - "form_factor": "desktop" - }, - "unknown": [ { "index": 24, "attached_to": 0, - "class_list": [ - "unknown" - ], "base_class": { - "hex": "0007", "name": "Communication controller", "value": 7 }, "sub_class": { - "hex": "0000", "name": "Serial controller", "value": 0 }, "pci_interface": { - "hex": "0002", "name": "16550", "value": 2 }, "device": { - "hex": "0000", "name": "16550A", "value": 0 }, @@ -2320,18 +2598,418 @@ "enabled": true } ] + }, + { + "index": 36, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 11, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg9", + "sysfs_bus_id": "11:0:0:0", + "unix_device_name": "/dev/sg9", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 9, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg9" + ] + }, + { + "index": 37, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 6, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg7", + "sysfs_bus_id": "6:0:0:0", + "unix_device_name": "/dev/sg7", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 7, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg7" + ] + }, + { + "index": 38, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 9, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg17", + "sysfs_bus_id": "9:0:0:0", + "unix_device_name": "/dev/sg17", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 17, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg17" + ] + }, + { + "index": 39, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 2, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg5", + "sysfs_bus_id": "2:0:0:0", + "unix_device_name": "/dev/sg5", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 5, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg5" + ] + }, + { + "index": 40, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 8, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg15", + "sysfs_bus_id": "8:0:0:0", + "unix_device_name": "/dev/sg15", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 15, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg15" + ] + }, + { + "index": 41, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 3, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg3", + "sysfs_bus_id": "3:0:0:0", + "unix_device_name": "/dev/sg3", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 3, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg3" + ] + }, + { + "index": 42, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 7, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg13", + "sysfs_bus_id": "7:0:0:0", + "unix_device_name": "/dev/sg13", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 13, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg13" + ] + }, + { + "index": 43, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg1", + "sysfs_bus_id": "4:0:0:0", + "unix_device_name": "/dev/sg1", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 1, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg1" + ] + }, + { + "index": 44, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 5, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg11", + "sysfs_bus_id": "5:0:0:0", + "unix_device_name": "/dev/sg11", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 11, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg11" + ] } ], "usb_controller": [ { "index": 21, "attached_to": 0, - "class_list": [ - "usb_controller", - "pci" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -2340,38 +3018,30 @@ "number": 21 }, "base_class": { - "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { - "hex": "0003", "name": "USB Controller", "value": 3 }, "pci_interface": { - "hex": "0030", "value": 48 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31a8", "value": 12712 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel USB Controller", @@ -2380,7 +3050,7 @@ "resources": [ { "type": "irq", - "base": 123, + "base": 125, "triggered": 0, "enabled": true }, @@ -2398,7 +3068,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 123, + "irq": 125, "prog_if": 48 }, "driver": "xhci_hcd", @@ -2448,7 +3118,6 @@ "product": "MZGLKAP-00", "version": "1.x", "board_type": { - "hex": "000a", "name": "Motherboard", "value": 10 }, @@ -2467,30 +3136,25 @@ "size_current": 224, "speed": 0, "mode": { - "hex": "0001", "name": "Write Back", "value": 1 }, "enabled": true, "location": { - "hex": "0000", "name": "Internal", "value": 0 }, "socketed": false, "level": 0, "ecc": { - "hex": "0004", "name": "Parity", "value": 4 }, "cache_type": { - "hex": "0001", "name": "Other", "value": 1 }, "associativity": { - "hex": "0001", "name": "Other", "value": 1 }, @@ -2508,30 +3172,25 @@ "size_current": 4096, "speed": 0, "mode": { - "hex": "0001", "name": "Write Back", "value": 1 }, "enabled": true, "location": { - "hex": "0000", "name": "Internal", "value": 0 }, "socketed": false, "level": 1, "ecc": { - "hex": "0005", "name": "Single-bit", "value": 5 }, "cache_type": { - "hex": "0005", "name": "Unified", "value": 5 }, "associativity": { - "hex": "0008", "name": "16-way Set-Associative", "value": 8 }, @@ -2543,40 +3202,33 @@ ] } ], - "chassis": [ - { - "handle": 3, - "manufacturer": "Default string", - "version": "Default string", - "chassis_type": { - "hex": "0003", - "name": "Desktop", - "value": 3 - }, - "lock_present": false, - "bootup_state": { - "hex": "0003", - "name": "Safe", - "value": 3 - }, - "power_state": { - "hex": "0003", - "name": "Safe", - "value": 3 - }, - "thermal_state": { - "hex": "0003", - "name": "Safe", - "value": 3 - }, - "security_state": { - "hex": "0003", - "name": "None", - "value": 3 - }, - "oem": "0x0" - } - ], + "chassis": { + "handle": 3, + "manufacturer": "Default string", + "version": "Default string", + "chassis_type": { + "name": "Desktop", + "value": 3 + }, + "lock_present": false, + "bootup_state": { + "name": "Safe", + "value": 3 + }, + "power_state": { + "name": "Safe", + "value": 3 + }, + "thermal_state": { + "name": "Safe", + "value": 3 + }, + "security_state": { + "name": "None", + "value": 3 + }, + "oem": "0x0" + }, "config": { "handle": 34, "options": [ @@ -2595,21 +3247,18 @@ { "handle": 35, "location": { - "hex": "0003", "name": "Motherboard", "value": 3 }, "usage": { - "hex": "0003", "name": "System memory", "value": 3 }, "ecc": { - "hex": "0003", "name": "None", "value": 3 }, - "max_size": "0x2000000", + "max_size": 33554432, "error_handle": 65534, "slots": 2 } @@ -2618,8 +3267,8 @@ { "handle": 36, "array_handle": 35, - "start_address": "0x0", - "end_address": "0x600000000", + "start_address": 0, + "end_address": 25769803776, "part_width": 2 } ], @@ -2636,13 +3285,11 @@ "ecc_bits": 0, "size": 16777216, "form_factor": { - "hex": "000d", "name": "SODIMM", "value": 13 }, "set": 0, "memory_type": { - "hex": "001a", "name": "Other", "value": 26 }, @@ -2663,13 +3310,11 @@ "ecc_bits": 0, "size": 8388608, "form_factor": { - "hex": "000d", "name": "SODIMM", "value": 13 }, "set": 0, "memory_type": { - "hex": "001a", "name": "Other", "value": 26 }, @@ -2684,8 +3329,8 @@ "handle": 38, "memory_device_handle": 37, "array_map_handle": 36, - "start_address": "0x0", - "end_address": "0x400000000", + "start_address": 0, + "end_address": 17179869184, "row_position": 255, "interleave_position": 1, "interleave_depth": 2 @@ -2694,8 +3339,8 @@ "handle": 40, "memory_device_handle": 39, "array_map_handle": 36, - "start_address": "0x400000000", - "end_address": "0x600000000", + "start_address": 17179869184, + "end_address": 25769803776, "row_position": 255, "interleave_position": 2, "interleave_depth": 2 @@ -2708,7 +3353,6 @@ { "name": "To Be Filled By O.E.M.", "type": { - "hex": "0003", "name": "Video", "value": 3 }, @@ -2721,13 +3365,11 @@ { "handle": 8, "port_type": { - "hex": "000e", "name": "Mouse Port", "value": 14 }, "internal_reference_designator": "J1A1", "external_connector_type": { - "hex": "000f", "name": "PS/2", "value": 15 }, @@ -2736,13 +3378,11 @@ { "handle": 9, "port_type": { - "hex": "000d", "name": "Keyboard Port", "value": 13 }, "internal_reference_designator": "J1A1", "external_connector_type": { - "hex": "000f", "name": "PS/2", "value": 15 }, @@ -2751,13 +3391,11 @@ { "handle": 10, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_reference_designator": "J2A1", "external_connector_type": { - "hex": "001d", "name": "Mini-Centronics Type-14", "value": 29 }, @@ -2766,13 +3404,11 @@ { "handle": 11, "port_type": { - "hex": "0009", "name": "Serial Port 16550A Compatible", "value": 9 }, "internal_reference_designator": "J2A2A", "external_connector_type": { - "hex": "0008", "name": "DB-9 pin male", "value": 8 }, @@ -2781,13 +3417,11 @@ { "handle": 12, "port_type": { - "hex": "001c", "name": "Video Port", "value": 28 }, "internal_reference_designator": "J2A2B", "external_connector_type": { - "hex": "0007", "name": "DB-15 pin female", "value": 7 }, @@ -2796,13 +3430,11 @@ { "handle": 13, "port_type": { - "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "J3A1", "external_connector_type": { - "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -2811,13 +3443,11 @@ { "handle": 14, "port_type": { - "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "J3A1", "external_connector_type": { - "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -2826,13 +3456,11 @@ { "handle": 15, "port_type": { - "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "J3A1", "external_connector_type": { - "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -2841,12 +3469,10 @@ { "handle": 16, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2855,12 +3481,10 @@ { "handle": 17, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2869,12 +3493,10 @@ { "handle": 18, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2883,12 +3505,10 @@ { "handle": 19, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2897,12 +3517,10 @@ { "handle": 20, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2911,12 +3529,10 @@ { "handle": 21, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2925,12 +3541,10 @@ { "handle": 22, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2939,12 +3553,10 @@ { "handle": 23, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2953,12 +3565,10 @@ { "handle": 24, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2967,12 +3577,10 @@ { "handle": 25, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2981,12 +3589,10 @@ { "handle": 26, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2995,12 +3601,10 @@ { "handle": 27, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -3009,12 +3613,10 @@ { "handle": 28, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -3023,12 +3625,10 @@ { "handle": 29, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -3037,12 +3637,10 @@ { "handle": 30, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -3051,12 +3649,10 @@ { "handle": 31, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -3068,7 +3664,6 @@ "handle": 49, "socket": "SOCKET 0", "socket_type": { - "hex": "0001", "name": "Other", "value": 1 }, @@ -3077,17 +3672,14 @@ "version": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz", "part": "Fill By OEM", "processor_type": { - "hex": "0003", "name": "CPU", "value": 3 }, "processor_family": { - "hex": "000f", "name": "Celeron", "value": 15 }, "processor_status": { - "hex": "0001", "name": "Enabled", "value": 1 }, @@ -3103,22 +3695,18 @@ "handle": 64, "designation": "J7H1", "slot_type": { - "hex": "00ae", "name": "Other", "value": 174 }, "bus_width": { - "hex": "000a", "name": "Other", "value": 10 }, "usage": { - "hex": "0004", "name": "In Use", "value": 4 }, "length": { - "hex": "0003", "name": "Short", "value": 3 }, @@ -3133,22 +3721,18 @@ "handle": 65, "designation": "J8H1", "slot_type": { - "hex": "00ad", "name": "Other", "value": 173 }, "bus_width": { - "hex": "0009", "name": "Other", "value": 9 }, "usage": { - "hex": "0003", "name": "Available", "value": 3 }, "length": { - "hex": "0003", "name": "Short", "value": 3 }, @@ -3166,7 +3750,6 @@ "product": "MZGLKAP-00", "version": "1.x", "wake_up": { - "hex": "0006", "name": "Power Switch", "value": 6 } diff --git a/machines/atlas/jellyseerr-module.nix b/machines/atlas/jellyseerr-module.nix new file mode 100644 index 0000000..05d5364 --- /dev/null +++ b/machines/atlas/jellyseerr-module.nix @@ -0,0 +1,76 @@ +{ + config, + pkgs, + lib, + ... +}: let + cfg = config.services.jellyseerr; +in { + meta.maintainers = with lib.maintainers; [camillemndn pizzapim]; + + options.services.jellyseerr = { + enable = lib.mkEnableOption ''Jellyseerr, a requests manager for Jellyfin''; + package = lib.mkPackageOption pkgs "jellyseerr" {}; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = ''Open port in the firewall for the Jellyseerr web interface.''; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 5055; + description = ''The port which the Jellyseerr web UI should listen to.''; + }; + + config_directory = lib.mkOption { + description = '' + The directory to save run-time configuration. + ''; + type = lib.types.str; + example = "/jellyseerr"; + default = "/var/lib/jellyseerr"; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.jellyseerr = { + description = "Jellyseerr, a requests manager for Jellyfin"; + after = ["network.target"]; + wantedBy = ["multi-user.target"]; + environment = { + PORT = toString cfg.port; + CONFIG_DIRECTORY = cfg.config_directory; + }; + serviceConfig = { + Type = "exec"; + StateDirectory = "jellyseerr"; + # WorkingDirectory = "${cfg.package}/libexec/jellyseerr/deps/jellyseerr"; + DynamicUser = true; + ExecStart = lib.getExe cfg.package; + # BindPaths = ["/var/lib/jellyseerr/:${cfg.package}/libexec/jellyseerr/deps/jellyseerr/config/"]; + Restart = "on-failure"; + ProtectHome = true; + ProtectSystem = "strict"; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + NoNewPrivileges = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + }; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [cfg.port]; + }; + }; +} diff --git a/machines/atlas/jellyseerr.nix b/machines/atlas/jellyseerr.nix new file mode 100644 index 0000000..2b3b52f --- /dev/null +++ b/machines/atlas/jellyseerr.nix @@ -0,0 +1,89 @@ +{ + lib, + fetchFromGitHub, + makeWrapper, + node-pre-gyp, + nodejs, + pnpm_9, + python3, + stdenv, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "jellyseerr"; + version = "2.1.0"; + + src = with finalAttrs; + fetchFromGitHub { + owner = "Fallenbagel"; + repo = "jellyseerr"; + rev = "v${version}"; + hash = "sha256-5kaeqhjUy9Lgx4/uFcGRlAo+ROEOdTWc2m49rq8R8Hs="; + }; + + nativeBuildInputs = [ + nodejs + makeWrapper + pnpm_9.configHook + + # Needed for compiling sqlite3 and bcrypt from source + node-pre-gyp + python3 + ]; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-xu6DeaBArQmnqEnIgjc1DTZujQebSkjuai9tMHeQWCk="; + }; + + buildPhase = '' + runHook preBuild + pnpm build + + # Fixes "SQLite package has not been found installed" at launch + pushd node_modules/sqlite3 + export CPPFLAGS="-I${nodejs}/include/node" + npm run install --build-from-source --nodedir=${nodejs}/include/node + popd + + pushd node_modules/bcrypt + export CPPFLAGS="-I${nodejs}/include/node" + npm run install --build-from-source --nodedir=${nodejs}/include/node + popd + + runHook postBuild + ''; + + preInstall = '' + mkdir $out + cp ./package.json $out + rm -r .next/cache + cp -R ./.next $out + cp -R ./dist $out + cp ./overseerr-api.yml $out + cp -R ./node_modules $out + ''; + + postInstall = '' + makeWrapper '${nodejs}/bin/node' "$out/bin/jellyseerr" \ + --chdir $out \ + --add-flags "$out/dist/index.js" \ + --set NODE_ENV production + ''; + + meta = with lib; { + description = "Fork of overseerr for jellyfin support"; + homepage = "https://github.com/Fallenbagel/jellyseerr"; + longDescription = '' + Jellyseerr is a free and open source software application for managing + requests for your media library. It is a a fork of Overseerr built to + bring support for Jellyfin & Emby media servers! + ''; + license = licenses.mit; + maintainers = with maintainers; [ + camillemndn + pizzapim + ]; + platforms = platforms.linux; + mainProgram = "jellyseerr"; + }; +}) diff --git a/machines/blocktech/configuration.nix b/machines/blocktech/configuration.nix deleted file mode 100644 index 1d2eae5..0000000 --- a/machines/blocktech/configuration.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - self, - pkgs, - lib, - inputs, - config, - ... -}: { - config = { - pim = { - lanzaboote.enable = false; - tidal.enable = false; - gnome.enable = true; - stylix.enable = true; - wireguard.enable = true; - sops-nix.usersWithSopsKeys = ["pkunis"]; - }; - - users.users.pkunis = { - isNormalUser = true; - extraGroups = ["wheel" "docker" "input" "wireshark" "dialout"]; - }; - - deployment = { - allowLocalDeployment = true; - targetHost = null; - tags = ["desktop"]; - }; - - facter.reportPath = ./facter.json; - home-manager.users.pkunis.imports = [./pkunis.home.nix]; - nix.settings.trusted-users = ["pkunis"]; - system.stateVersion = "23.05"; - sops.defaultSopsFile = "${self}/secrets/blocktech/nixos.yaml"; - - environment.systemPackages = with pkgs; [ - borgbackup - kubectl - nmap - poppler_utils # For pdfunite - silicon - units - ]; - - virtualisation = { - libvirtd.enable = true; - - docker = { - enable = true; - - rootless = { - enable = true; - setSocketVariable = true; - }; - }; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/949815d4-cfc4-4cf3-bbbe-22516f91119c";} - ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/06710546-327b-402a-b221-8d88b75301d2"; - fsType = "ext4"; - }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/E547-7E6C"; - fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; - }; - - boot = { - initrd.luks.devices."luks-4cc1ad7c-a794-4c54-adc8-c9f666c9b781".device = "/dev/disk/by-uuid/4cc1ad7c-a794-4c54-adc8-c9f666c9b781"; - initrd.luks.devices."luks-161f5109-c2d7-4307-91f6-27c655d6ab3e".device = "/dev/disk/by-uuid/161f5109-c2d7-4307-91f6-27c655d6ab3e"; - - loader.systemd-boot.enable = true; - loader.efi.canTouchEfiVariables = true; - }; - }; -} diff --git a/machines/default.nix b/machines/default.nix index 62b2f4e..bdb2a8f 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -1,7 +1,7 @@ { - blocktech = { + sue = { system = "x86_64-linux"; - nixosModule = import ./blocktech/configuration.nix; + nixosModule = import ./sue/configuration.nix; }; gamepc = { @@ -19,13 +19,13 @@ nixosModule = import ./atlas/configuration.nix; }; + jefke = { + system = "x86_64-linux"; + nixosModule = import ./jefke/configuration.nix; + }; + lewis = { system = "x86_64-linux"; nixosModule = import ./lewis/configuration.nix; }; - - roeland = { - system = "x86_64-linux"; - nixosModule = import ./roeland/configuration.nix; - }; } diff --git a/machines/gamepc/configuration.nix b/machines/gamepc/configuration.nix index 3fe2568..88997f8 100644 --- a/machines/gamepc/configuration.nix +++ b/machines/gamepc/configuration.nix @@ -5,6 +5,7 @@ }: { config = { pim = { + cinnamon.enable = true; sops-nix.usersWithSopsKeys = ["pim"]; }; @@ -31,24 +32,27 @@ services = { openssh.enable = true; - displayManager.cosmic-greeter.enable = true; - desktopManager.cosmic.enable = true; xserver.displayManager.lightdm.extraSeatDefaults = '' autologin-user=pim ''; + + sunshine = { + enable = true; + openFirewall = true; + + settings = { + sunshine_name = config.networking.hostName; + origin_web_ui_allowed = "wan"; + credentials_file = "/home/pim/.config/sunshine/sunshine_credentials.json"; + }; + }; }; - boot = { - loader.grub = { - enable = true; - efiSupport = true; - efiInstallAsRemovable = true; - }; - - swraid.mdadmConf = '' - MAILADDR pim@kunis.nl - ''; + boot.loader.grub = { + enable = true; + efiSupport = true; + efiInstallAsRemovable = true; }; disko.devices.disk = lib.genAttrs ["0" "1"] (name: { diff --git a/machines/gamepc/pim.home.nix b/machines/gamepc/pim.home.nix index dc7d1e9..cf831fb 100644 --- a/machines/gamepc/pim.home.nix +++ b/machines/gamepc/pim.home.nix @@ -14,7 +14,6 @@ vlc handbrake lutris - chromium ]; }; @@ -22,5 +21,6 @@ defaultSopsFile = "${self}/secrets/gamepc/pim.yaml"; # TODO: should be set automatically? age.keyFile = "${config.xdg.configHome}/sops/age/keys.txt"; + secrets."sunshine_credentials".path = "${config.xdg.configHome}/sunshine/sunshine_credentials.json"; }; } diff --git a/machines/jefke/configuration.nix b/machines/jefke/configuration.nix new file mode 100644 index 0000000..f569389 --- /dev/null +++ b/machines/jefke/configuration.nix @@ -0,0 +1,14 @@ +{config, ...}: { + config = { + pim.k3s.clusterInit = true; + facter.reportPath = ./facter.json; + system.stateVersion = "23.05"; + users.users.root.openssh.authorizedKeys.keys = config.pim.ssh.keys.pim ++ config.pim.ssh.keys.niels; + + deployment = { + targetHost = "jefke"; + targetUser = "root"; + tags = ["server" "kubernetes"]; + }; + }; +} diff --git a/machines/jefke/facter.json b/machines/jefke/facter.json new file mode 100644 index 0000000..c38ac98 --- /dev/null +++ b/machines/jefke/facter.json @@ -0,0 +1,3593 @@ +{ + "version": 1, + "system": "x86_64-linux", + "virtualisation": "none", + "hardware": { + "bios": { + "apm_info": { + "supported": false, + "enabled": false, + "version": 0, + "sub_version": 0, + "bios_flags": 0 + }, + "vbe_info": { + "version": 0, + "video_memory": 0 + }, + "pnp": false, + "pnp_id": 0, + "lba_support": false, + "low_memory_size": 0, + "smbios_version": 770 + }, + "bluetooth": [ + { + "index": 42, + "attached_to": 43, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "value": 32903 + }, + "device": { + "value": 2727 + }, + "revision": { + "name": "0.01", + "value": 0 + }, + "model": "Bluetooth Device", + "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb1/1-3/1-3:1.0", + "sysfs_bus_id": "1-3:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v8087p0AA7d0001dcE0dsc01dp01icE0isc01ip01in00" + }, + { + "index": 44, + "attached_to": 43, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "value": 32903 + }, + "device": { + "value": 2727 + }, + "revision": { + "name": "0.01", + "value": 0 + }, + "model": "Bluetooth Device", + "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb1/1-3/1-3:1.1", + "sysfs_bus_id": "1-3:1.1", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v8087p0AA7d0001dcE0dsc01dp01icE0isc01ip01in01" + } + ], + "bridge": [ + { + "index": 10, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "ISA bridge", + "value": 1 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12776 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel ISA bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.0", + "sysfs_bus_id": "0000:00:1f.0", + "detail": { + "function": 0, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d000031E8sv00001458sd00001000bc06sc01i00", + "label": "Onboard - Other" + }, + { + "index": 11, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 19 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12762 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 243 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:13.2", + "sysfs_bus_id": "0000:00:13.2", + "resources": [ + { + "type": "irq", + "base": 123, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 2, + "command": 1031, + "header_type": 1, + "secondary_bus": 2, + "irq": 123, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00008086d000031DAsv00001458sd00001000bc06sc04i00" + }, + { + "index": 13, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 19 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12760 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 243 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:13.0", + "sysfs_bus_id": "0000:00:13.0", + "resources": [ + { + "type": "irq", + "base": 122, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 1, + "secondary_bus": 1, + "irq": 122, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00008086d000031D8sv00001458sd00001000bc06sc04i00" + }, + { + "index": 17, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12784 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:00.0", + "sysfs_bus_id": "0000:00:00.0", + "detail": { + "function": 0, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d000031F0sv00001458sd00001000bc06sc00i00", + "label": "Onboard - Other" + }, + { + "index": 20, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 19 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12763 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 243 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:13.3", + "sysfs_bus_id": "0000:00:13.3", + "resources": [ + { + "type": "irq", + "base": 124, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 3, + "command": 1031, + "header_type": 1, + "secondary_bus": 3, + "irq": 124, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00008086d000031DBsv00001458sd00001000bc06sc04i00" + } + ], + "cpu": [ + { + "architecture": "x86_64", + "vendor_name": "GenuineIntel", + "family": 6, + "model": 122, + "stepping": 1, + "features": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "dts", + "acpi", + "mmx", + "fxsr", + "sse", + "sse2", + "ss", + "ht", + "tm", + "pbe", + "syscall", + "nx", + "pdpe1gb", + "rdtscp", + "lm", + "constant_tsc", + "art", + "arch_perfmon", + "pebs", + "bts", + "rep_good", + "nopl", + "xtopology", + "nonstop_tsc", + "cpuid", + "aperfmperf", + "tsc_known_freq", + "pni", + "pclmulqdq", + "dtes64", + "monitor", + "ds_cpl", + "vmx", + "est", + "tm2", + "ssse3", + "sdbg", + "cx16", + "xtpr", + "pdcm", + "sse4_1", + "sse4_2", + "x2apic", + "movbe", + "popcnt", + "tsc_deadline_timer", + "aes", + "xsave", + "rdrand", + "lahf_lm", + "3dnowprefetch", + "cpuid_fault", + "cat_l2", + "pti", + "cdp_l2", + "ssbd", + "ibrs", + "ibpb", + "stibp", + "ibrs_enhanced", + "tpr_shadow", + "flexpriority", + "ept", + "vpid", + "ept_ad", + "fsgsbase", + "tsc_adjust", + "smep", + "erms", + "mpx", + "rdt_a", + "rdseed", + "smap", + "clflushopt", + "intel_pt", + "sha_ni", + "xsaveopt", + "xsavec", + "xgetbv1", + "xsaves", + "dtherm", + "ida", + "arat", + "pln", + "pts", + "vnmi", + "umip", + "rdpid", + "md_clear", + "arch_capabilities" + ], + "bugs": [ + "cpu_meltdown", + "spectre_v1", + "spectre_v2", + "spec_store_bypass", + "rfds", + "bhi" + ], + "bogo": 2995.2, + "cache": 4096, + "units": 64, + "physical_id": 0, + "siblings": 4, + "cores": 4, + "fpu": true, + "fpu_exception": true, + "cpuid_level": 24, + "write_protect": false, + "clflush_size": 64, + "cache_alignment": 64, + "address_sizes": { + "physical": 39, + "virtual": 48 + } + } + ], + "disk": [ + { + "index": 24, + "attached_to": 14, + "bus_type": { + "name": "NVME", + "value": 150 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "value": 9798 + }, + "sub_vendor": { + "value": 9798 + }, + "device": { + "name": "KINGSTON SA2000M8500G", + "value": 8803 + }, + "sub_device": { + "value": 8803 + }, + "serial": "50026B7282414E01", + "model": "KINGSTON SA2000M8500G", + "sysfs_id": "/class/block/nvme0n1", + "sysfs_bus_id": "nvme0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0/nvme/nvme0", + "unix_device_name": "/dev/nvme0n1", + "unix_device_number": { + "type": 98, + "major": 259, + "minor": 0, + "range": 0 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/1", + "/dev/disk/by-id/nvme-KINGSTON_SA2000M8500G_50026B7282414E01", + "/dev/disk/by-id/nvme-KINGSTON_SA2000M8500G_50026B7282414E01_1", + "/dev/disk/by-id/nvme-eui.0026b7282414e015", + "/dev/disk/by-path/pci-0000:01:00.0-nvme-1", + "/dev/nvme0n1" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 476940, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 976773168, + "value_2": 512 + } + ], + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ] + }, + { + "index": 25, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 15, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf141", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdo", + "sysfs_bus_id": "15:0:0:1", + "sysfs_device_link": "/devices/platform/host15/session111/target15:0:0/15:0:0:1", + "unix_device_name": "/dev/sdo", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 224, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/124", + "/dev/disk/by-id/scsi-360000000000000000e000000000e0001", + "/dev/disk/by-id/wwn-0x60000000000000000e000000000e0001", + "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:kitchenowl-lun-1", + "/dev/disk/by-uuid/8946a256-09b8-4ca5-b18a-fbde2f0bd674", + "/dev/sdo" + ], + "unix_device_name2": "/dev/sg12", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 12, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 4, + "sectors": 50, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 204800, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 26, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf31", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdd", + "sysfs_bus_id": "4:0:0:1", + "sysfs_device_link": "/devices/platform/host4/session23/target4:0:0/4:0:0:1", + "unix_device_name": "/dev/sdd", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 48, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/36", + "/dev/disk/by-id/scsi-360000000000000000e00000000030001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000030001", + "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:bazarr-lun-1", + "/dev/sdd" + ], + "unix_device_name2": "/dev/sg6", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 6, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 1, + "sectors": 52, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 53248, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 27, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 2, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf11", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdb", + "sysfs_bus_id": "2:0:0:1", + "sysfs_device_link": "/devices/platform/host2/session1/target2:0:0/2:0:0:1", + "unix_device_name": "/dev/sdb", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 16, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/14", + "/dev/disk/by-id/scsi-360000000000000000e00000000010001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000010001", + "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:pvc-9701d2f8-4cf0-490b-a0ad-2c1151bbf15f-lun-1", + "/dev/sdb" + ], + "unix_device_name2": "/dev/sg2", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 2, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1018, + "heads": 166, + "sectors": 62, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 10485760, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 28, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 11, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf101", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdk", + "sysfs_bus_id": "11:0:0:1", + "sysfs_device_link": "/devices/platform/host11/session83/target11:0:0/11:0:0:1", + "unix_device_name": "/dev/sdk", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 160, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/96", + "/dev/disk/by-id/scsi-360000000000000000e000000000a0001", + "/dev/disk/by-id/wwn-0x60000000000000000e000000000a0001", + "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:pihole-dnsmasq-lun-1", + "/dev/disk/by-uuid/636d77cf-0418-43fb-b86c-22cde408cf08", + "/dev/sdk" + ], + "unix_device_name2": "/dev/sg10", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 10, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 1, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 32768, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 29, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 17, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf161", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdq", + "sysfs_bus_id": "17:0:0:1", + "sysfs_device_link": "/devices/platform/host17/session113/target17:0:0/17:0:0:1", + "unix_device_name": "/dev/sdq", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 0, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/126", + "/dev/disk/by-id/scsi-360000000000000000e00000000100001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000100001", + "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:nextcloud-db-lun-1", + "/dev/disk/by-uuid/751984ab-5b1a-4109-9c75-2babdccede30", + "/dev/sdq" + ], + "unix_device_name2": "/dev/sg14", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 14, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1016, + "heads": 13, + "sectors": 62, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 819200, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 30, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 3, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf21", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdc", + "sysfs_bus_id": "3:0:0:1", + "sysfs_device_link": "/devices/platform/host3/session15/target3:0:0/3:0:0:1", + "unix_device_name": "/dev/sdc", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 32, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/28", + "/dev/disk/by-id/scsi-360000000000000000e00000000020001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000020001", + "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:radicale-lun-1", + "/dev/sdc" + ], + "unix_device_name2": "/dev/sg4", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 4, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1008, + "heads": 7, + "sectors": 58, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 409600, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 31, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 20, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf191", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdt", + "sysfs_bus_id": "20:0:0:1", + "sysfs_device_link": "/devices/platform/host20/session116/target20:0:0/20:0:0:1", + "unix_device_name": "/dev/sdt", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 48, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/129", + "/dev/disk/by-id/scsi-360000000000000000e00000000130001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000130001", + "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:hedgedoc-db-lun-1", + "/dev/disk/by-uuid/758d3a46-6501-432f-b839-8dfb3767bf03", + "/dev/sdt" + ], + "unix_device_name2": "/dev/sg16", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 16, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 4, + "sectors": 50, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 204800, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 32, + "attached_to": 18, + "bus_type": { + "name": "IDE", + "value": 133 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "Samsung", + "value": 0 + }, + "device": { + "name": "SSD 860", + "value": 0 + }, + "revision": { + "name": "4B6Q", + "value": 0 + }, + "serial": "S3YJNB0K486420W", + "model": "Samsung SSD 860", + "sysfs_id": "/class/block/sda", + "sysfs_bus_id": "0:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:12.0/ata1/host0/target0:0:0/0:0:0:0", + "unix_device_name": "/dev/sda", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 0, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/2", + "/dev/disk/by-id/ata-Samsung_SSD_860_EVO_250GB_S3YJNB0K486420W", + "/dev/disk/by-id/wwn-0x5002538e40364c21", + "/dev/disk/by-path/pci-0000:00:12.0-ata-1", + "/dev/disk/by-path/pci-0000:00:12.0-ata-1.0", + "/dev/sda" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 30401, + "heads": 255, + "sectors": 63, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 488397168, + "value_2": 512 + } + ], + "driver": "ahci", + "driver_module": "ahci", + "drivers": [ + "ahci", + "sd" + ], + "driver_modules": [ + "ahci", + "sd_mod" + ] + }, + { + "index": 33, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 8, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf71", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdh", + "sysfs_bus_id": "8:0:0:1", + "sysfs_device_link": "/devices/platform/host8/session82/target8:0:0/8:0:0:1", + "unix_device_name": "/dev/sdh", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 112, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/95", + "/dev/disk/by-id/scsi-360000000000000000e00000000070001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000070001", + "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:pihole-data-lun-1", + "/dev/disk/by-uuid/c323da21-9775-4c9d-8825-89b981680747", + "/dev/sdh" + ], + "unix_device_name2": "/dev/sg8", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 8, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 25, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 1536000, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + } + ], + "graphics_card": [ + { + "index": 23, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 2 + }, + "base_class": { + "name": "Display controller", + "value": 3 + }, + "sub_class": { + "name": "VGA compatible controller", + "value": 0 + }, + "pci_interface": { + "name": "VGA", + "value": 0 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12677 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel VGA compatible controller", + "sysfs_id": "/devices/pci0000:00/0000:00:02.0", + "sysfs_bus_id": "0000:00:02.0", + "resources": [ + { + "type": "io", + "base": 61440, + "range": 64, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 134, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2415919104, + "range": 268435456, + "enabled": true, + "access": "read_only", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2684354560, + "range": 16777216, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 786432, + "range": 131072, + "enabled": false, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 134, + "prog_if": 0 + }, + "driver": "i915", + "driver_module": "i915", + "drivers": [ + "i915" + ], + "driver_modules": [ + "i915" + ], + "module_alias": "pci:v00008086d00003185sv00001458sd00001000bc03sc00i00", + "label": "Onboard - Video" + } + ], + "hub": [ + { + "index": 43, + "attached_to": 21, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Hub", + "value": 266 + }, + "vendor": { + "name": "Linux 6.6.32 xhci-hcd", + "value": 7531 + }, + "device": { + "name": "xHCI Host Controller", + "value": 2 + }, + "revision": { + "name": "6.06", + "value": 0 + }, + "serial": "0000:00:15.0", + "model": "Linux 6.6.32 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb1/1-0:1.0", + "sysfs_bus_id": "1-0:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "hub", + "value": 9 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 1, + "interface_class": { + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" + }, + { + "index": 45, + "attached_to": 21, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Hub", + "value": 266 + }, + "vendor": { + "name": "Linux 6.6.32 xhci-hcd", + "value": 7531 + }, + "device": { + "name": "xHCI Host Controller", + "value": 3 + }, + "revision": { + "name": "6.06", + "value": 0 + }, + "serial": "0000:00:15.0", + "model": "Linux 6.6.32 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb2/2-0:1.0", + "sysfs_bus_id": "2-0:1.0", + "detail": { + "device_class": { + "name": "hub", + "value": 9 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" + } + ], + "memory": [ + { + "index": 7, + "attached_to": 0, + "base_class": { + "name": "Internally Used Class", + "value": 257 + }, + "sub_class": { + "name": "Main Memory", + "value": 2 + }, + "model": "Main Memory", + "resources": [ + { + "type": "mem", + "base": 0, + "range": 16577695744, + "enabled": true, + "access": "read_write", + "prefetch": "unknown" + }, + { + "type": "phys_mem", + "range": 16106127360 + } + ] + } + ], + "network_controller": [ + { + "index": 8, + "attached_to": 20, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 3, + "number": 0 + }, + "base_class": { + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "name": "Ethernet controller", + "value": 0 + }, + "vendor": { + "value": 4332 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 33128 + }, + "sub_device": { + "value": 57344 + }, + "revision": { + "value": 21 + }, + "model": "Ethernet controller", + "sysfs_id": "/devices/pci0000:00/0000:00:13.3/0000:03:00.0", + "sysfs_bus_id": "0000:03:00.0", + "unix_device_name": "enp3s0", + "unix_device_names": [ + "enp3s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 98 + }, + { + "type": "io", + "base": 57344, + "range": 256, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 21, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2701131776, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2701148160, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "phwaddr", + "address": 98 + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 21, + "prog_if": 0 + }, + "driver": "r8169", + "driver_module": "r8169", + "drivers": [ + "r8169" + ], + "driver_modules": [ + "r8169" + ], + "module_alias": "pci:v000010ECd00008168sv00001458sd0000E000bc02sc00i00" + }, + { + "index": 12, + "attached_to": 11, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 2, + "number": 0 + }, + "base_class": { + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "name": "Network controller", + "value": 128 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "value": 9467 + }, + "sub_device": { + "value": 8464 + }, + "revision": { + "value": 16 + }, + "model": "Intel Network controller", + "sysfs_id": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0", + "sysfs_bus_id": "0000:02:00.0", + "resources": [ + { + "type": "irq", + "base": 20, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2702180352, + "range": 8192, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 2, + "header_type": 0, + "secondary_bus": 0, + "irq": 20, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d000024FBsv00008086sd00002110bc02sc80i00", + "label": "Onboard - RTK Ethernet" + } + ], + "network_interface": [ + { + "index": 52, + "attached_to": 8, + "base_class": { + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/enp3s0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:13.3/0000:03:00.0", + "unix_device_name": "enp3s0", + "unix_device_names": [ + "enp3s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 98 + }, + { + "type": "phwaddr", + "address": 98 + } + ], + "driver": "r8169", + "driver_module": "r8169", + "drivers": [ + "r8169" + ], + "driver_modules": [ + "r8169" + ] + }, + { + "index": 75, + "attached_to": 0, + "base_class": { + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] + } + ], + "storage_controller": [ + { + "index": 14, + "attached_to": 13, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 1, + "number": 0 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "value": 8 + }, + "pci_interface": { + "value": 2 + }, + "vendor": { + "value": 9798 + }, + "sub_vendor": { + "value": 9798 + }, + "device": { + "value": 8803 + }, + "sub_device": { + "value": 8803 + }, + "revision": { + "value": 3 + }, + "model": "Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0", + "sysfs_bus_id": "0000:01:00.0", + "resources": [ + { + "type": "irq", + "base": 22, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2703228928, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 22, + "prog_if": 2 + }, + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ], + "module_alias": "pci:v00002646d00002263sv00002646sd00002263bc01sc08i02" + }, + { + "index": 18, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 18 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "value": 6 + }, + "pci_interface": { + "value": 1 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12771 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:12.0", + "sysfs_bus_id": "0000:00:12.0", + "resources": [ + { + "type": "io", + "base": 61536, + "range": 32, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 61568, + "range": 4, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 61584, + "range": 8, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 131, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2704343040, + "range": 8192, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2704371712, + "range": 2048, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2704375808, + "range": 256, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 131, + "prog_if": 1 + }, + "driver": "ahci", + "driver_module": "ahci", + "drivers": [ + "ahci" + ], + "driver_modules": [ + "ahci" + ], + "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01", + "label": "Onboard - SATA" + } + ], + "system": { + "form_factor": "desktop" + }, + "unknown": [ + { + "index": 9, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 28 + }, + "base_class": { + "name": "Generic system peripheral", + "value": 8 + }, + "sub_class": { + "value": 5 + }, + "pci_interface": { + "value": 1 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12748 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel Generic system peripheral", + "sysfs_id": "/devices/pci0000:00/0000:00:1c.0", + "sysfs_bus_id": "0000:00:1c.0", + "resources": [ + { + "type": "irq", + "base": 39, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2704363520, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2704367616, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 6, + "header_type": 0, + "secondary_bus": 0, + "irq": 39, + "prog_if": 1 + }, + "driver": "sdhci-pci", + "driver_module": "sdhci_pci", + "drivers": [ + "sdhci-pci" + ], + "driver_modules": [ + "sdhci_pci" + ], + "module_alias": "pci:v00008086d000031CCsv00001458sd00001000bc08sc05i01", + "label": "Onboard - Other" + }, + { + "index": 15, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 30 + }, + "base_class": { + "name": "Generic system peripheral", + "value": 8 + }, + "sub_class": { + "value": 5 + }, + "pci_interface": { + "value": 1 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12752 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel Generic system peripheral", + "sysfs_id": "/devices/pci0000:00/0000:00:1e.0", + "sysfs_bus_id": "0000:00:1e.0", + "resources": [ + { + "type": "irq", + "base": 42, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2704355328, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2704359424, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 6, + "header_type": 0, + "secondary_bus": 0, + "irq": 42, + "prog_if": 1 + }, + "driver": "sdhci-pci", + "driver_module": "sdhci_pci", + "drivers": [ + "sdhci-pci" + ], + "driver_modules": [ + "sdhci_pci" + ], + "module_alias": "pci:v00008086d000031D0sv00001458sd00001000bc08sc05i01", + "label": "Onboard - Other" + }, + { + "index": 16, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 15 + }, + "base_class": { + "name": "Communication controller", + "value": 7 + }, + "sub_class": { + "name": "Communication controller", + "value": 128 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12698 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel Communication controller", + "sysfs_id": "/devices/pci0000:00/0000:00:0f.0", + "sysfs_bus_id": "0000:00:0f.0", + "resources": [ + { + "type": "irq", + "base": 132, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2704379904, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 132, + "prog_if": 0 + }, + "driver": "mei_me", + "driver_module": "mei_me", + "drivers": [ + "mei_me" + ], + "driver_modules": [ + "mei_me" + ], + "module_alias": "pci:v00008086d0000319Asv00001458sd00001000bc07sc80i00", + "label": "Onboard - Other" + }, + { + "index": 19, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "name": "SMBus", + "value": 5 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12756 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel SMBus", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.1", + "sysfs_bus_id": "0000:00:1f.1", + "resources": [ + { + "type": "io", + "base": 61504, + "range": 32, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 20, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2704351232, + "range": 256, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 1, + "command": 3, + "header_type": 0, + "secondary_bus": 0, + "irq": 20, + "prog_if": 0 + }, + "driver": "i801_smbus", + "driver_module": "i2c_i801", + "drivers": [ + "i801_smbus" + ], + "driver_modules": [ + "i2c_i801" + ], + "module_alias": "pci:v00008086d000031D4sv00001458sd00001000bc0Csc05i00", + "label": "Onboard - Other" + }, + { + "index": 22, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Generic system peripheral", + "value": 8 + }, + "sub_class": { + "name": "System peripheral", + "value": 128 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12688 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel System peripheral", + "sysfs_id": "/devices/pci0000:00/0000:00:00.3", + "sysfs_bus_id": "0000:00:00.3", + "resources": [ + { + "type": "irq", + "base": 23, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2704384000, + "range": 4096, + "enabled": false, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 3, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 23, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d00003190sv00001458sd00001000bc08sc80i00", + "label": "Onboard - Other" + }, + { + "index": 34, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 11, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg9", + "sysfs_bus_id": "11:0:0:0", + "unix_device_name": "/dev/sg9", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 9, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg9" + ] + }, + { + "index": 35, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 8, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg7", + "sysfs_bus_id": "8:0:0:0", + "unix_device_name": "/dev/sg7", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 7, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg7" + ] + }, + { + "index": 36, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg5", + "sysfs_bus_id": "4:0:0:0", + "unix_device_name": "/dev/sg5", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 5, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg5" + ] + }, + { + "index": 37, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 20, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg15", + "sysfs_bus_id": "20:0:0:0", + "unix_device_name": "/dev/sg15", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 15, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg15" + ] + }, + { + "index": 38, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 3, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg3", + "sysfs_bus_id": "3:0:0:0", + "unix_device_name": "/dev/sg3", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 3, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg3" + ] + }, + { + "index": 39, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 17, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg13", + "sysfs_bus_id": "17:0:0:0", + "unix_device_name": "/dev/sg13", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 13, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg13" + ] + }, + { + "index": 40, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 2, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg1", + "sysfs_bus_id": "2:0:0:0", + "unix_device_name": "/dev/sg1", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 1, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg1" + ] + }, + { + "index": 41, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 15, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg11", + "sysfs_bus_id": "15:0:0:0", + "unix_device_name": "/dev/sg11", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 11, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg11" + ] + } + ], + "usb_controller": [ + { + "index": 21, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 21 + }, + "base_class": { + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "name": "USB Controller", + "value": 3 + }, + "pci_interface": { + "value": 48 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12712 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel USB Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:15.0", + "sysfs_bus_id": "0000:00:15.0", + "resources": [ + { + "type": "irq", + "base": 130, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2704277504, + "range": 65536, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 130, + "prog_if": 48 + }, + "driver": "xhci_hcd", + "driver_module": "xhci_pci", + "drivers": [ + "xhci_hcd" + ], + "driver_modules": [ + "xhci_pci" + ], + "module_alias": "pci:v00008086d000031A8sv00001458sd00001000bc0Csc03i30", + "label": "Onboard - Other" + } + ] + }, + "smbios": { + "bios": { + "handle": 0, + "vendor": "American Megatrends Inc.", + "version": "F8", + "date": "12/13/2019", + "features": [ + "PCI supported", + "BIOS flashable", + "BIOS shadowing allowed", + "CD boot supported", + "Selectable boot supported", + "BIOS ROM socketed", + "EDD spec supported", + "1.2MB Floppy supported", + "720kB Floppy supported", + "2.88MB Floppy supported", + "Print Screen supported", + "8042 Keyboard Services supported", + "Serial Services supported", + "Printer Services supported", + "ACPI supported", + "USB Legacy supported", + "BIOS Boot Spec supported" + ], + "start_address": "0xf0000", + "rom_size": 6291456 + }, + "board": { + "handle": 2, + "manufacturer": "GIGABYTE", + "product": "MZGLKAP-00", + "version": "1.x", + "board_type": { + "name": "Motherboard", + "value": 10 + }, + "features": [ + "Hosting Board", + "Replaceable" + ], + "location": "Default string", + "chassis": 3 + }, + "cache": [ + { + "handle": 47, + "socket": "CPU Internal L1", + "size_max": 224, + "size_current": 224, + "speed": 0, + "mode": { + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 0, + "ecc": { + "name": "Parity", + "value": 4 + }, + "cache_type": { + "name": "Other", + "value": 1 + }, + "associativity": { + "name": "Other", + "value": 1 + }, + "sram_type_current": [ + "Synchronous" + ], + "sram_type_supported": [ + "Synchronous" + ] + }, + { + "handle": 48, + "socket": "CPU Internal L2", + "size_max": 4096, + "size_current": 4096, + "speed": 0, + "mode": { + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 1, + "ecc": { + "name": "Single-bit", + "value": 5 + }, + "cache_type": { + "name": "Unified", + "value": 5 + }, + "associativity": { + "name": "16-way Set-Associative", + "value": 8 + }, + "sram_type_current": [ + "Synchronous" + ], + "sram_type_supported": [ + "Synchronous" + ] + } + ], + "chassis": { + "handle": 3, + "manufacturer": "Default string", + "version": "Default string", + "chassis_type": { + "name": "Desktop", + "value": 3 + }, + "lock_present": false, + "bootup_state": { + "name": "Safe", + "value": 3 + }, + "power_state": { + "name": "Safe", + "value": 3 + }, + "thermal_state": { + "name": "Safe", + "value": 3 + }, + "security_state": { + "name": "None", + "value": 3 + }, + "oem": "0x0" + }, + "config": { + "handle": 34, + "options": [ + "Default string" + ] + }, + "language": [ + { + "handle": 63, + "languages": [ + "en|US|iso8859-1" + ] + } + ], + "memory_array": [ + { + "handle": 35, + "location": { + "name": "Motherboard", + "value": 3 + }, + "usage": { + "name": "System memory", + "value": 3 + }, + "ecc": { + "name": "None", + "value": 3 + }, + "max_size": 33554432, + "error_handle": 65534, + "slots": 2 + } + ], + "memory_array_mapped_address": [ + { + "handle": 36, + "array_handle": 35, + "start_address": 0, + "end_address": 17179869184, + "part_width": 2 + } + ], + "memory_device": [ + { + "handle": 37, + "location": "A1_DIMM0", + "bank_location": "A1_BANK0", + "manufacturer": "Crucial", + "part_number": "CT8G4SFS824A.M8FR", + "array_handle": 35, + "error_handle": 65534, + "width": 64, + "ecc_bits": 0, + "size": 8388608, + "form_factor": { + "name": "SODIMM", + "value": 13 + }, + "set": 0, + "memory_type": { + "name": "Other", + "value": 26 + }, + "memory_type_details": [ + "Synchronous" + ], + "speed": 2400 + }, + { + "handle": 39, + "location": "A1_DIMM1", + "bank_location": "A1_BANK1", + "manufacturer": "Crucial", + "part_number": "CT8G4SFS824A.M8FR", + "array_handle": 35, + "error_handle": 65534, + "width": 64, + "ecc_bits": 0, + "size": 8388608, + "form_factor": { + "name": "SODIMM", + "value": 13 + }, + "set": 0, + "memory_type": { + "name": "Other", + "value": 26 + }, + "memory_type_details": [ + "Synchronous" + ], + "speed": 2400 + } + ], + "memory_device_mapped_address": [ + { + "handle": 38, + "memory_device_handle": 37, + "array_map_handle": 36, + "start_address": 0, + "end_address": 8589934592, + "row_position": 255, + "interleave_position": 1, + "interleave_depth": 2 + }, + { + "handle": 40, + "memory_device_handle": 39, + "array_map_handle": 36, + "start_address": 8589934592, + "end_address": 17179869184, + "row_position": 255, + "interleave_position": 2, + "interleave_depth": 2 + } + ], + "onboard": [ + { + "handle": 32, + "devices": [ + { + "name": "To Be Filled By O.E.M.", + "type": { + "name": "Video", + "value": 3 + }, + "enabled": true + } + ] + } + ], + "port_connector": [ + { + "handle": 8, + "port_type": { + "name": "Mouse Port", + "value": 14 + }, + "internal_reference_designator": "J1A1", + "external_connector_type": { + "name": "PS/2", + "value": 15 + }, + "external_reference_designator": "PS2Mouse" + }, + { + "handle": 9, + "port_type": { + "name": "Keyboard Port", + "value": 13 + }, + "internal_reference_designator": "J1A1", + "external_connector_type": { + "name": "PS/2", + "value": 15 + }, + "external_reference_designator": "Keyboard" + }, + { + "handle": 10, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J2A1", + "external_connector_type": { + "name": "Mini-Centronics Type-14", + "value": 29 + }, + "external_reference_designator": "TV Out" + }, + { + "handle": 11, + "port_type": { + "name": "Serial Port 16550A Compatible", + "value": 9 + }, + "internal_reference_designator": "J2A2A", + "external_connector_type": { + "name": "DB-9 pin male", + "value": 8 + }, + "external_reference_designator": "COM A" + }, + { + "handle": 12, + "port_type": { + "name": "Video Port", + "value": 28 + }, + "internal_reference_designator": "J2A2B", + "external_connector_type": { + "name": "DB-15 pin female", + "value": 7 + }, + "external_reference_designator": "Video" + }, + { + "handle": 13, + "port_type": { + "name": "USB", + "value": 16 + }, + "internal_reference_designator": "J3A1", + "external_connector_type": { + "name": "Access Bus [USB]", + "value": 18 + }, + "external_reference_designator": "USB1" + }, + { + "handle": 14, + "port_type": { + "name": "USB", + "value": 16 + }, + "internal_reference_designator": "J3A1", + "external_connector_type": { + "name": "Access Bus [USB]", + "value": 18 + }, + "external_reference_designator": "USB2" + }, + { + "handle": 15, + "port_type": { + "name": "USB", + "value": 16 + }, + "internal_reference_designator": "J3A1", + "external_connector_type": { + "name": "Access Bus [USB]", + "value": 18 + }, + "external_reference_designator": "USB3" + }, + { + "handle": 16, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J9A1 - TPM HDR" + }, + { + "handle": 17, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J9C1 - PCIE DOCKING CONN" + }, + { + "handle": 18, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J2B3 - CPU FAN" + }, + { + "handle": 19, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J6C2 - EXT HDMI" + }, + { + "handle": 20, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J3C1 - GMCH FAN" + }, + { + "handle": 21, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J1D1 - ITP" + }, + { + "handle": 22, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J9E2 - MDC INTPSR" + }, + { + "handle": 23, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J9E4 - MDC INTPSR" + }, + { + "handle": 24, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J9E3 - LPC HOT DOCKING" + }, + { + "handle": 25, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J9E1 - SCAN MATRIX" + }, + { + "handle": 26, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J9G1 - LPC SIDE BAND" + }, + { + "handle": 27, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J8F1 - UNIFIED" + }, + { + "handle": 28, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J6F1 - LVDS" + }, + { + "handle": 29, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J2F1 - LAI FAN" + }, + { + "handle": 30, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J2G1 - GFX VID" + }, + { + "handle": 31, + "port_type": { + "name": "Other", + "value": 255 + }, + "internal_connector_type": { + "name": "Other", + "value": 255 + }, + "internal_reference_designator": "J1G6 - AC JACK" + } + ], + "processor": [ + { + "handle": 49, + "socket": "SOCKET 0", + "socket_type": { + "name": "Other", + "value": 1 + }, + "socket_populated": true, + "manufacturer": "Intel", + "version": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz", + "part": "Fill By OEM", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Celeron", + "value": 15 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 100, + "clock_max": 2700, + "cache_handle_l1": 47, + "cache_handle_l2": 48, + "cache_handle_l3": 0 + } + ], + "slot": [ + { + "handle": 64, + "designation": "J7H1", + "slot_type": { + "name": "Other", + "value": 174 + }, + "bus_width": { + "name": "Other", + "value": 10 + }, + "usage": { + "name": "In Use", + "value": 4 + }, + "length": { + "name": "Short", + "value": 3 + }, + "id": 0, + "features": [ + "3.3 V", + "Shared", + "PME#" + ] + }, + { + "handle": 65, + "designation": "J8H1", + "slot_type": { + "name": "Other", + "value": 173 + }, + "bus_width": { + "name": "Other", + "value": 9 + }, + "usage": { + "name": "Available", + "value": 3 + }, + "length": { + "name": "Short", + "value": 3 + }, + "id": 1, + "features": [ + "3.3 V", + "Shared", + "PME#" + ] + } + ], + "system": { + "handle": 1, + "manufacturer": "GIGABYTE", + "product": "MZGLKAP-00", + "version": "1.x", + "wake_up": { + "name": "Power Switch", + "value": 6 + } + } + } +} diff --git a/machines/lewis/configuration.nix b/machines/lewis/configuration.nix index 23b25aa..fc069bf 100644 --- a/machines/lewis/configuration.nix +++ b/machines/lewis/configuration.nix @@ -2,7 +2,6 @@ self, config, pkgs, - lib, ... }: { config = { @@ -19,100 +18,9 @@ }; pim = { - k3s.serverAddr = "https://atlas.dmz:6443"; - - backups.borgBackups = { - bazarr = { - paths = ["/mnt/longhorn/persistent/volumes/bazarr"]; - deploymentName = "bazarr"; - deploymentNamespace = "media"; - }; - - deluge = { - paths = ["/mnt/longhorn/persistent/volumes/deluge"]; - deploymentName = "deluge"; - deploymentNamespace = "media"; - }; - - jellyfin = { - paths = ["/mnt/longhorn/persistent/volumes/jellyfin"]; - deploymentName = "jellyfin"; - deploymentNamespace = "media"; - }; - - jellyseerr = { - paths = ["/mnt/longhorn/persistent/volumes/jellyseerr"]; - deploymentName = "jellyseerr"; - deploymentNamespace = "media"; - }; - - prowlarr = { - paths = ["/mnt/longhorn/persistent/volumes/prowlarr"]; - deploymentName = "prowlarr"; - deploymentNamespace = "media"; - }; - - radarr = { - paths = ["/mnt/longhorn/persistent/volumes/radarr"]; - deploymentName = "radarr"; - deploymentNamespace = "media"; - }; - - sonarr = { - paths = ["/mnt/longhorn/persistent/volumes/sonarr"]; - deploymentName = "sonarr"; - deploymentNamespace = "media"; - }; - }; + k3s.serverAddr = "https://jefke.dmz:6443"; + data-sharing.enable = true; + backups.enable = true; }; - - systemd = { - timers.read-dir-sizes = { - wantedBy = ["timers.target"]; - timerConfig = { - OnBootSec = "5m"; - OnUnitActiveSec = "5m"; - Unit = "read-dir-sizes.service"; - }; - }; - - services."read-dir-sizes" = { - script = let - script = pkgs.writeShellScriptBin "read-dir-sizes.sh" '' - DIRS=( - "/mnt/longhorn/persistent/media/movies" - "/mnt/longhorn/persistent/media/shows" - ) - - temp_file=$(mktemp) - trap 'rm -f "$temp_file"' EXIT - - for DIR_PATH in "''${DIRS[@]}"; do - # Find all top-level subdirectories and calculate their size - find "$DIR_PATH" -mindepth 1 -maxdepth 1 -type d | while read -r subdir; do - # Calculate the size of the top-level subdirectory - du --block-size=1 -s "$subdir" | while read -r size path; do - # Print size in Prometheus format - echo "directory_size_bytes{dir=\"$path\"} $size" >> $temp_file - done - done - done - mkdir -p /var/lib/node_exporter/textfile_collector - cp $temp_file /var/lib/node_exporter/textfile_collector/dir_sizes.prom - chmod o=r /var/lib/node_exporter/textfile_collector/dir_sizes.prom - ''; - in "${lib.getExe script}"; - serviceConfig = { - Type = "oneshot"; - User = "root"; - }; - }; - - tmpfiles.rules = [ - "d /mnt/longhorn/persistent/media/torrents 775 414 51 8d" - ]; - }; - - services.prometheus.exporters.node.extraFlags = ["--collector.textfile.directory=/var/lib/node_exporter/textfile_collector"]; }; } diff --git a/machines/lewis/facter.json b/machines/lewis/facter.json index 6bb3a7e..3c634c5 100644 --- a/machines/lewis/facter.json +++ b/machines/lewis/facter.json @@ -23,14 +23,9 @@ }, "bluetooth": [ { - "index": 26, - "attached_to": 27, - "class_list": [ - "usb", - "bluetooth" - ], + "index": 72, + "attached_to": 73, "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -39,20 +34,16 @@ "number": 0 }, "base_class": { - "hex": "0115", "name": "Bluetooth Device", "value": 277 }, "vendor": { - "hex": "8087", "value": 32903 }, "device": { - "hex": "0aa7", "value": 2727 }, "revision": { - "hex": "0000", "name": "0.01", "value": 0 }, @@ -71,23 +62,19 @@ ], "detail": { "device_class": { - "hex": "00e0", "name": "wireless", "value": 224 }, "device_subclass": { - "hex": "0001", "name": "audio", "value": 1 }, "device_protocol": 1, "interface_class": { - "hex": "00e0", "name": "wireless", "value": 224 }, "interface_subclass": { - "hex": "0001", "name": "audio", "value": 1 }, @@ -107,14 +94,9 @@ "module_alias": "usb:v8087p0AA7d0001dcE0dsc01dp01icE0isc01ip01in00" }, { - "index": 28, - "attached_to": 27, - "class_list": [ - "usb", - "bluetooth" - ], + "index": 74, + "attached_to": 73, "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -123,20 +105,16 @@ "number": 0 }, "base_class": { - "hex": "0115", "name": "Bluetooth Device", "value": 277 }, "vendor": { - "hex": "8087", "value": 32903 }, "device": { - "hex": "0aa7", "value": 2727 }, "revision": { - "hex": "0000", "name": "0.01", "value": 0 }, @@ -155,23 +133,19 @@ ], "detail": { "device_class": { - "hex": "00e0", "name": "wireless", "value": 224 }, "device_subclass": { - "hex": "0001", "name": "audio", "value": 1 }, "device_protocol": 1, "interface_class": { - "hex": "00e0", "name": "wireless", "value": 224 }, "interface_subclass": { - "hex": "0001", "name": "audio", "value": 1 }, @@ -195,12 +169,7 @@ { "index": 10, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -209,34 +178,27 @@ "number": 31 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0001", "name": "ISA bridge", "value": 1 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31e8", "value": 12776 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel ISA bridge", @@ -250,26 +212,13 @@ "irq": 0, "prog_if": 0 }, - "driver": "lpc_ich", - "driver_module": "lpc_ich", - "drivers": [ - "lpc_ich" - ], - "driver_modules": [ - "lpc_ich" - ], "module_alias": "pci:v00008086d000031E8sv00001458sd00001000bc06sc01i00", "label": "Onboard - Other" }, { "index": 11, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -278,39 +227,31 @@ "number": 19 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { - "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31da", "value": 12762 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "00f3", "value": 243 }, "model": "Intel PCI bridge", @@ -319,7 +260,7 @@ "resources": [ { "type": "irq", - "base": 121, + "base": 123, "triggered": 0, "enabled": true } @@ -329,28 +270,19 @@ "command": 1031, "header_type": 1, "secondary_bus": 2, - "irq": 121, + "irq": 123, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], "module_alias": "pci:v00008086d000031DAsv00001458sd00001000bc06sc04i00" }, { "index": 13, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -359,39 +291,31 @@ "number": 19 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { - "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31d8", "value": 12760 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "00f3", "value": 243 }, "model": "Intel PCI bridge", @@ -400,7 +324,7 @@ "resources": [ { "type": "irq", - "base": 120, + "base": 122, "triggered": 0, "enabled": true } @@ -410,28 +334,19 @@ "command": 1031, "header_type": 1, "secondary_bus": 1, - "irq": 120, + "irq": 122, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], "module_alias": "pci:v00008086d000031D8sv00001458sd00001000bc06sc04i00" }, { "index": 17, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -440,34 +355,27 @@ "number": 0 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0000", "name": "Host bridge", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31f0", "value": 12784 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel Host bridge", @@ -487,12 +395,7 @@ { "index": 20, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -501,39 +404,31 @@ "number": 19 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { - "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31db", "value": 12763 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "00f3", "value": 243 }, "model": "Intel PCI bridge", @@ -542,7 +437,7 @@ "resources": [ { "type": "irq", - "base": 122, + "base": 124, "triggered": 0, "enabled": true } @@ -552,17 +447,13 @@ "command": 1031, "header_type": 1, "secondary_bus": 3, - "irq": 122, + "irq": 124, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], "module_alias": "pci:v00008086d000031DBsv00001458sd00001000bc06sc04i00" } ], @@ -570,7 +461,6 @@ { "architecture": "x86_64", "vendor_name": "GenuineIntel", - "model_name": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz", "family": 6, "model": 122, "stepping": 1, @@ -692,38 +582,278 @@ "rfds", "bhi" ], - "power_management": [ - "" - ], "bogo": 2995.2, "cache": 4096, "units": 64, "physical_id": 0, "siblings": 4, "cores": 4, - "fpu": false, - "fpu_exception": false, + "fpu": true, + "fpu_exception": true, "cpuid_level": 24, "write_protect": false, "clflush_size": 64, "cache_alignment": 64, "address_sizes": { - "physical": "0x27", - "virtual": "0x30" + "physical": 39, + "virtual": 48 } } ], "disk": [ { "index": 24, - "attached_to": 14, - "class_list": [ - "disk", - "block_device", - "nvme" - ], + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 25, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf231", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdy", + "sysfs_bus_id": "25:0:0:1", + "sysfs_device_link": "/devices/platform/host25/session163/target25:0:0/25:0:0:1", + "unix_device_name": "/dev/sdy", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 128, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/176", + "/dev/disk/by-id/scsi-360000000000000000e00000000170001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000170001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:ntfy-lun-1", + "/dev/disk/by-uuid/7ae09e5a-8909-416c-903e-faeaf8b9ebf7", + "/dev/sdy" + ], + "unix_device_name2": "/dev/sg36", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 36, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 10, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 614400, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 25, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 6, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf31", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdf", + "sysfs_bus_id": "6:0:0:1", + "sysfs_device_link": "/devices/platform/host6/session521/target6:0:0/6:0:0:1", + "unix_device_name": "/dev/sdf", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 80, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/552", + "/dev/disk/by-id/scsi-360000000000000000e00000000030001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000030001", + "/dev/disk/by-path/ip-10.42.2.229:3260-iscsi-iqn.2019-10.io.longhorn:nextcloud-lun-1", + "/dev/disk/by-uuid/9ad442ea-127e-4f66-8cf8-4f7a69932806", + "/dev/sdf" + ], + "unix_device_name2": "/dev/sg40", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 40, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 51200, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 104857600, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 26, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 28, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf271", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdab", + "sysfs_bus_id": "28:0:0:1", + "sysfs_device_link": "/devices/platform/host28/session123/target28:0:0/28:0:0:1", + "unix_device_name": "/dev/sdab", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 176, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/136", + "/dev/disk/by-id/scsi-360000000000000000e000000001b0001", + "/dev/disk/by-id/wwn-0x60000000000000000e000000001b0001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:attic-db-lun-1", + "/dev/disk/by-uuid/6940ecd4-614f-41db-a4f5-9171f5498519", + "/dev/sdab" + ], + "unix_device_name2": "/dev/sg10", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 10, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 5, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 307200, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 27, + "attached_to": 14, "bus_type": { - "hex": "0096", "name": "NVME", "value": 150 }, @@ -732,30 +862,24 @@ "number": 0 }, "base_class": { - "hex": "0106", "name": "Mass Storage Device", "value": 262 }, "sub_class": { - "hex": "0000", "name": "Disk", "value": 0 }, "vendor": { - "hex": "2646", "value": 9798 }, "sub_vendor": { - "hex": "2646", "value": 9798 }, "device": { - "hex": "5017", "name": "KINGSTON SNV2S1000G", "value": 20503 }, "sub_device": { - "hex": "5017", "value": 20503 }, "serial": "50026B76862833F0", @@ -771,6 +895,7 @@ "range": 0 }, "unix_device_names": [ + "/dev/disk/by-diskseq/1", "/dev/disk/by-id/nvme-KINGSTON_SNV2S1000G_50026B76862833F0", "/dev/disk/by-id/nvme-KINGSTON_SNV2S1000G_50026B76862833F0_1", "/dev/disk/by-id/nvme-eui.00000000000000000026b76862833f05", @@ -783,7 +908,7 @@ "cylinders": 953869, "heads": 64, "sectors": 32, - "size": "0x0", + "size": 0, "geo_type": "logical" }, { @@ -803,15 +928,1414 @@ ] }, { - "index": 25, - "attached_to": 18, - "class_list": [ - "disk", - "ide", - "block_device" - ], + "index": 28, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 15, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf181", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdo", + "sysfs_bus_id": "15:0:0:1", + "sysfs_device_link": "/devices/platform/host15/session141/target15:0:0/15:0:0:1", + "unix_device_name": "/dev/sdo", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 224, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/154", + "/dev/disk/by-id/scsi-360000000000000000e00000000120001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000120001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:hedgedoc-uploads-lun-1", + "/dev/disk/by-uuid/a852f0d1-e4fa-43c4-9789-270d29a24025", + "/dev/sdo" + ], + "unix_device_name2": "/dev/sg12", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 12, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 2, + "sectors": 50, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 102400, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 29, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 23, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf211", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdw", + "sysfs_bus_id": "23:0:0:1", + "sysfs_device_link": "/devices/platform/host23/session161/target23:0:0/23:0:0:1", + "unix_device_name": "/dev/sdw", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 96, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/174", + "/dev/disk/by-id/scsi-360000000000000000e00000000150001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000150001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:pvc-8562af07-b250-4e87-9ebd-3bcad23a3b54-lun-1", + "/dev/disk/by-uuid/614ccde9-d82f-4b8d-bffe-f427743618de", + "/dev/sdw" + ], + "unix_device_name2": "/dev/sg32", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 32, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1020, + "heads": 17, + "sectors": 59, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 1024000, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 30, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf151", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdd", + "sysfs_bus_id": "4:0:0:1", + "sysfs_device_link": "/devices/platform/host4/session37/target4:0:0/4:0:0:1", + "unix_device_name": "/dev/sdd", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 48, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/50", + "/dev/disk/by-id/scsi-360000000000000000e000000000f0001", + "/dev/disk/by-id/wwn-0x60000000000000000e000000000f0001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:hedgedoc-db-lun-1", + "/dev/sdd" + ], + "unix_device_name2": "/dev/sg6", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 6, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 4, + "sectors": 50, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 204800, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 31, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 13, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf121", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdm", + "sysfs_bus_id": "13:0:0:1", + "sysfs_device_link": "/devices/platform/host13/session156/target13:0:0/13:0:0:1", + "unix_device_name": "/dev/sdm", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 192, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/169", + "/dev/disk/by-id/scsi-360000000000000000e000000000c0001", + "/dev/disk/by-id/wwn-0x60000000000000000e000000000c0001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:prowlarr-lun-1", + "/dev/disk/by-uuid/485930ae-2fe2-4470-b99a-dc61a93d921c", + "/dev/sdm" + ], + "unix_device_name2": "/dev/sg24", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 24, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 5, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 307200, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 32, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 21, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf191", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdu", + "sysfs_bus_id": "21:0:0:1", + "sysfs_device_link": "/devices/platform/host21/session159/target21:0:0/21:0:0:1", + "unix_device_name": "/dev/sdu", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 64, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/172", + "/dev/disk/by-id/scsi-360000000000000000e00000000130001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000130001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:pvc-2848b393-989a-4a12-b155-59d67313c20b-lun-1", + "/dev/disk/by-uuid/4ffb4dc3-e48b-4e74-9678-5693227cb1cf", + "/dev/sdu" + ], + "unix_device_name2": "/dev/sg30", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 30, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 10, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 614400, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 33, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 2, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf11", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdb", + "sysfs_bus_id": "2:0:0:1", + "sysfs_device_link": "/devices/platform/host2/session1/target2:0:0/2:0:0:1", + "unix_device_name": "/dev/sdb", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 16, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/14", + "/dev/disk/by-id/scsi-360000000000000000e00000000010001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000010001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:pvc-09c264fc-dace-4bbe-88ae-555d96e6c956-lun-1", + "/dev/sdb" + ], + "unix_device_name2": "/dev/sg2", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 2, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 20480, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 41943040, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 34, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 11, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf101", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdk", + "sysfs_bus_id": "11:0:0:1", + "sysfs_device_link": "/devices/platform/host11/session51/target11:0:0/11:0:0:1", + "unix_device_name": "/dev/sdk", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 160, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/64", + "/dev/disk/by-id/scsi-360000000000000000e000000000a0001", + "/dev/disk/by-id/wwn-0x60000000000000000e000000000a0001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:immich-db-lun-1", + "/dev/disk/by-uuid/b2aeda75-49fa-4d68-8949-9effd8931753", + "/dev/sdk" + ], + "unix_device_name2": "/dev/sg8", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 8, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1018, + "heads": 166, + "sectors": 62, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 10485760, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 35, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 19, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf161", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sds", + "sysfs_bus_id": "19:0:0:1", + "sysfs_device_link": "/devices/platform/host19/session158/target19:0:0/19:0:0:1", + "unix_device_name": "/dev/sds", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 32, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/171", + "/dev/disk/by-id/scsi-360000000000000000e00000000100001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000100001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:jellyseerr-lun-1", + "/dev/disk/by-uuid/2fbc120d-0631-4d48-814a-49fa1c91c607", + "/dev/sds" + ], + "unix_device_name2": "/dev/sg28", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 28, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1017, + "heads": 3, + "sectors": 51, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 155648, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 36, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 9, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf71", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdi", + "sysfs_bus_id": "9:0:0:1", + "sysfs_device_link": "/devices/platform/host9/session153/target9:0:0/9:0:0:1", + "unix_device_name": "/dev/sdi", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 128, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/166", + "/dev/disk/by-id/scsi-360000000000000000e00000000070001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000070001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:paperless-redisdata-lun-1", + "/dev/disk/by-uuid/0f49df82-6a76-453d-bdaf-0a9332d204b8", + "/dev/sdi" + ], + "unix_device_name2": "/dev/sg20", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 20, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 1, + "sectors": 40, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 40960, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 37, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 17, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf131", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdq", + "sysfs_bus_id": "17:0:0:1", + "sysfs_device_link": "/devices/platform/host17/session157/target17:0:0/17:0:0:1", + "unix_device_name": "/dev/sdq", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 0, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/170", + "/dev/disk/by-id/scsi-360000000000000000e000000000d0001", + "/dev/disk/by-id/wwn-0x60000000000000000e000000000d0001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:bazarr-lun-1", + "/dev/disk/by-uuid/358898d4-e920-414a-b1c8-3e2a6af401ab", + "/dev/sdq" + ], + "unix_device_name2": "/dev/sg26", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 26, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 1, + "sectors": 52, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 53248, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 38, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 7, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf51", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdg", + "sysfs_bus_id": "7:0:0:1", + "sysfs_device_link": "/devices/platform/host7/session151/target7:0:0/7:0:0:1", + "unix_device_name": "/dev/sdg", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 96, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/164", + "/dev/disk/by-id/scsi-360000000000000000e00000000050001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000050001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:deluge-lun-1", + "/dev/disk/by-uuid/84cc595f-a85d-4aea-a9b6-b2f2ac5e402e", + "/dev/sdg" + ], + "unix_device_name2": "/dev/sg18", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 18, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1020, + "heads": 17, + "sectors": 59, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 1024000, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 39, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 24, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf221", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdx", + "sysfs_bus_id": "24:0:0:1", + "sysfs_device_link": "/devices/platform/host24/session162/target24:0:0/24:0:0:1", + "unix_device_name": "/dev/sdx", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 112, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/175", + "/dev/disk/by-id/scsi-360000000000000000e00000000160001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000160001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:paperless-db-lun-1", + "/dev/disk/by-uuid/6a149153-655e-4561-a8c0-c7d19074cce9", + "/dev/sdx" + ], + "unix_device_name2": "/dev/sg34", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 34, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 5, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 307200, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 40, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 5, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf31", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sde", + "sysfs_bus_id": "5:0:0:1", + "sysfs_device_link": "/devices/platform/host5/session147/target5:0:0/5:0:0:1", + "unix_device_name": "/dev/sde", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 64, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/160", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:pvc-1251134d-6da6-4aae-9b7c-770aa76fffd9-lun-1", + "/dev/disk/by-uuid/d0342ab1-820d-4fa8-baf9-d1cfd6441b8e", + "/dev/sde" + ], + "unix_device_name2": "/dev/sg16", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 16, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 20480, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 41943040, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 41, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 14, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf11", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdn", + "sysfs_bus_id": "14:0:0:1", + "sysfs_device_link": "/devices/platform/host14/session759/target14:0:0/14:0:0:1", + "unix_device_name": "/dev/sdn", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 208, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/790", + "/dev/disk/by-path/ip-10.42.2.68:3260-iscsi-iqn.2019-10.io.longhorn:forgejo-lun-1", + "/dev/disk/by-uuid/0448fef2-ca9e-4a75-9d21-e148e3e9fe34", + "/dev/sdn" + ], + "unix_device_name2": "/dev/sg46", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 46, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 20480, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 41943040, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 42, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 22, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf61", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdv", + "sysfs_bus_id": "22:0:0:1", + "sysfs_device_link": "/devices/platform/host22/session587/target22:0:0/22:0:0:1", + "unix_device_name": "/dev/sdv", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 80, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/618", + "/dev/disk/by-id/scsi-360000000000000000e00000000060001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000060001", + "/dev/disk/by-path/ip-10.42.2.229:3260-iscsi-iqn.2019-10.io.longhorn:sonarr-lun-1", + "/dev/disk/by-uuid/b362beb2-a0d6-4fad-97e6-9d234c122aa9", + "/dev/sdv" + ], + "unix_device_name2": "/dev/sg44", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 44, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 5, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 307200, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 43, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 3, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf21", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdc", + "sysfs_bus_id": "3:0:0:1", + "sysfs_device_link": "/devices/platform/host3/session146/target3:0:0/3:0:0:1", + "unix_device_name": "/dev/sdc", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 32, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/159", + "/dev/disk/by-id/scsi-360000000000000000e00000000020001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000020001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:jellyfin-lun-1", + "/dev/disk/by-uuid/48bef742-1b0e-4417-bfac-3d0d59e4baeb", + "/dev/sdc" + ], + "unix_device_name2": "/dev/sg14", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 14, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1018, + "heads": 166, + "sectors": 62, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 10485760, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 44, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 12, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf111", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdl", + "sysfs_bus_id": "12:0:0:1", + "sysfs_device_link": "/devices/platform/host12/session155/target12:0:0/12:0:0:1", + "unix_device_name": "/dev/sdl", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 176, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/168", + "/dev/disk/by-id/scsi-360000000000000000e000000000b0001", + "/dev/disk/by-id/wwn-0x60000000000000000e000000000b0001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:radarr-lun-1", + "/dev/disk/by-uuid/ec9d35c0-6ee7-4b3f-8b87-3fc1703c62ce", + "/dev/sdl" + ], + "unix_device_name2": "/dev/sg22", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 22, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 10, + "sectors": 60, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 614400, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 45, + "attached_to": 18, "bus_type": { - "hex": "0085", "name": "IDE", "value": 133 }, @@ -820,27 +2344,22 @@ "number": 0 }, "base_class": { - "hex": "0106", "name": "Mass Storage Device", "value": 262 }, "sub_class": { - "hex": "0000", "name": "Disk", "value": 0 }, "vendor": { - "hex": "0000", "name": "Samsung", "value": 0 }, "device": { - "hex": "0000", "name": "SSD 870", "value": 0 }, "revision": { - "hex": "0000", "name": "2B6Q", "value": 0 }, @@ -857,6 +2376,7 @@ "range": 16 }, "unix_device_names": [ + "/dev/disk/by-diskseq/2", "/dev/disk/by-id/ata-Samsung_SSD_870_QVO_1TB_S5RRNF0W629236X", "/dev/disk/by-id/wwn-0x5002538f43621654", "/dev/disk/by-path/pci-0000:00:12.0-ata-1", @@ -869,7 +2389,7 @@ "cylinders": 121601, "heads": 255, "sectors": 63, - "size": "0x0", + "size": 0, "geo_type": "logical" }, { @@ -889,18 +2409,259 @@ "ahci", "sd_mod" ] + }, + { + "index": 46, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 10, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf41", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdj", + "sysfs_bus_id": "10:0:0:1", + "sysfs_device_link": "/devices/platform/host10/session522/target10:0:0/10:0:0:1", + "unix_device_name": "/dev/sdj", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 144, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/553", + "/dev/disk/by-id/scsi-360000000000000000e00000000040001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000040001", + "/dev/disk/by-path/ip-10.42.2.229:3260-iscsi-iqn.2019-10.io.longhorn:syncthing-lun-1", + "/dev/disk/by-uuid/6cbd7d44-7471-42f0-a325-7fefe1f63960", + "/dev/sdj" + ], + "unix_device_name2": "/dev/sg42", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 42, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1016, + "heads": 13, + "sectors": 62, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 819200, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 47, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 18, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf171", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdr", + "sysfs_bus_id": "18:0:0:1", + "sysfs_device_link": "/devices/platform/host18/session35/target18:0:0/18:0:0:1", + "unix_device_name": "/dev/sdr", + "unix_device_number": { + "type": 98, + "major": 65, + "minor": 16, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/48", + "/dev/disk/by-id/scsi-360000000000000000e00000000110001", + "/dev/disk/by-id/wwn-0x60000000000000000e00000000110001", + "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:nextcloud-db-lun-1", + "/dev/sdr" + ], + "unix_device_name2": "/dev/sg4", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 4, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 1016, + "heads": 13, + "sectors": 62, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 819200, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] + }, + { + "index": 48, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 8, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "VIRTUAL-DISK", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "serial": "beaf11", + "model": "IET VIRTUAL-DISK", + "sysfs_id": "/class/block/sdh", + "sysfs_bus_id": "8:0:0:1", + "sysfs_device_link": "/devices/platform/host8/session519/target8:0:0/8:0:0:1", + "unix_device_name": "/dev/sdh", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 112, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/550", + "/dev/disk/by-path/ip-10.42.2.229:3260-iscsi-iqn.2019-10.io.longhorn:immich-lun-1", + "/dev/disk/by-uuid/a274d2e4-c595-48ae-be32-15f7084aedce", + "/dev/sdh" + ], + "unix_device_name2": "/dev/sg38", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 38, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 51200, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 104857600, + "value_2": 512 + } + ], + "driver": "sd", + "driver_module": "sd_mod", + "drivers": [ + "sd" + ], + "driver_modules": [ + "sd_mod" + ] } ], "graphics_card": [ { "index": 23, "attached_to": 0, - "class_list": [ - "graphics_card", - "pci" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -909,39 +2670,31 @@ "number": 2 }, "base_class": { - "hex": "0003", "name": "Display controller", "value": 3 }, "sub_class": { - "hex": "0000", "name": "VGA compatible controller", "value": 0 }, "pci_interface": { - "hex": "0000", "name": "VGA", "value": 0 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "3185", "value": 12677 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel VGA compatible controller", @@ -957,7 +2710,7 @@ }, { "type": "irq", - "base": 137, + "base": 134, "triggered": 0, "enabled": true }, @@ -991,7 +2744,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 137, + "irq": 134, "prog_if": 0 }, "driver": "i915", @@ -1008,14 +2761,9 @@ ], "hub": [ { - "index": 27, + "index": 73, "attached_to": 21, - "class_list": [ - "usb", - "hub" - ], "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -1024,27 +2772,23 @@ "number": 0 }, "base_class": { - "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "hex": "1d6b", - "name": "Linux 6.14.8 xhci-hcd", + "name": "Linux 6.6.32 xhci-hcd", "value": 7531 }, "device": { - "hex": "0002", "name": "xHCI Host Controller", "value": 2 }, "revision": { - "hex": "0000", - "name": "6.14", + "name": "6.06", "value": 0 }, "serial": "0000:00:15.0", - "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller", + "model": "Linux 6.6.32 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ @@ -1059,23 +2803,19 @@ ], "detail": { "device_class": { - "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 1, "interface_class": { - "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1085,24 +2825,15 @@ }, "hotplug": "usb", "driver": "hub", - "driver_module": "usbcore", "drivers": [ "hub" ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 29, + "index": 75, "attached_to": 21, - "class_list": [ - "usb", - "hub" - ], "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -1111,48 +2842,40 @@ "number": 0 }, "base_class": { - "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "hex": "1d6b", - "name": "Linux 6.14.8 xhci-hcd", + "name": "Linux 6.6.32 xhci-hcd", "value": 7531 }, "device": { - "hex": "0003", "name": "xHCI Host Controller", "value": 3 }, "revision": { - "hex": "0000", - "name": "6.14", + "name": "6.06", "value": 0 }, "serial": "0000:00:15.0", - "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller", + "model": "Linux 6.6.32 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { "device_class": { - "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 3, "interface_class": { - "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, @@ -1162,30 +2885,21 @@ }, "hotplug": "usb", "driver": "hub", - "driver_module": "usbcore", "drivers": [ "hub" ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" } ], "memory": [ { "index": 7, "attached_to": 0, - "class_list": [ - "memory" - ], "base_class": { - "hex": "0101", "name": "Internally Used Class", "value": 257 }, "sub_class": { - "hex": "0002", "name": "Main Memory", "value": 2 }, @@ -1194,7 +2908,7 @@ { "type": "mem", "base": 0, - "range": 25003442176, + "range": 25008177152, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -1210,12 +2924,7 @@ { "index": 8, "attached_to": 20, - "class_list": [ - "network_controller", - "pci" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1224,33 +2933,26 @@ "number": 0 }, "base_class": { - "hex": "0002", "name": "Network controller", "value": 2 }, "sub_class": { - "hex": "0000", "name": "Ethernet controller", "value": 0 }, "vendor": { - "hex": "10ec", "value": 4332 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "8168", "value": 33128 }, "sub_device": { - "hex": "e000", "value": 57344 }, "revision": { - "hex": "0015", "value": 21 }, "model": "Ethernet controller", @@ -1320,13 +3022,7 @@ { "index": 12, "attached_to": 11, - "class_list": [ - "network_controller", - "pci", - "wlan_card" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1335,52 +3031,37 @@ "number": 0 }, "base_class": { - "hex": "0002", "name": "Network controller", "value": 2 }, "sub_class": { - "hex": "0082", - "name": "WLAN controller", - "value": 130 + "name": "Network controller", + "value": 128 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "device": { - "hex": "24fb", "value": 9467 }, "sub_device": { - "hex": "2110", "value": 8464 }, "revision": { - "hex": "0010", "value": 16 }, - "model": "Intel WLAN controller", + "model": "Intel Network controller", "sysfs_id": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0", "sysfs_bus_id": "0000:02:00.0", - "unix_device_name": "wlo1", - "unix_device_names": [ - "wlo1" - ], "resources": [ - { - "type": "hwaddr", - "address": 102 - }, { "type": "irq", - "base": 135, + "base": 20, "triggered": 0, "enabled": true }, @@ -1391,194 +3072,29 @@ "enabled": true, "access": "read_write", "prefetch": "no" - }, - { - "type": "phwaddr", - "address": 102 - }, - { - "type": "wlan", - "channels": [ - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "13", - "14", - "36", - "40", - "44", - "48", - "52", - "56", - "60", - "64", - "100", - "104", - "108", - "112", - "116", - "120", - "124", - "128", - "132", - "136" - ], - "frequencies": [ - "2.412", - "2.417", - "2.422", - "2.427", - "2.432", - "2.437", - "2.442", - "2.447", - "2.452", - "2.457", - "2.462", - "2.467", - "2.472", - "2.484", - "5.18", - "5.2", - "5.22", - "5.24", - "5.26", - "5.28", - "5.3", - "5.32", - "5.5", - "5.52", - "5.54", - "5.56", - "5.58", - "5.6", - "5.62", - "5.64", - "5.66", - "5.68" - ], - "auth_modes": [ - "open", - "sharedkey", - "wpa-psk", - "wpa-eap" - ], - "enc_modes": [ - "WEP40", - "WEP104", - "TKIP", - "CCMP" - ] } ], "detail": { "function": 0, - "command": 1030, + "command": 2, "header_type": 0, "secondary_bus": 0, - "irq": 135, + "irq": 20, "prog_if": 0 }, - "driver": "iwlwifi", - "driver_module": "iwlwifi", - "drivers": [ - "iwlwifi" - ], - "driver_modules": [ - "iwlwifi" - ], "module_alias": "pci:v00008086d000024FBsv00008086sd00002110bc02sc80i00", "label": "Onboard - RTK Ethernet" } ], "network_interface": [ { - "index": 38, - "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": 44, - "attached_to": 12, - "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/wlo1", - "sysfs_device_link": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0", - "unix_device_name": "wlo1", - "unix_device_names": [ - "wlo1" - ], - "resources": [ - { - "type": "hwaddr", - "address": 102 - }, - { - "type": "phwaddr", - "address": 102 - } - ], - "driver": "iwlwifi", - "driver_module": "iwlwifi", - "drivers": [ - "iwlwifi" - ], - "driver_modules": [ - "iwlwifi" - ] - }, - { - "index": 45, + "index": 91, "attached_to": 8, - "class_list": [ - "network_interface" - ], "base_class": { - "hex": "0107", "name": "Network Interface", "value": 263 }, "sub_class": { - "hex": "0001", "name": "Ethernet", "value": 1 }, @@ -1607,18 +3123,221 @@ "driver_modules": [ "r8169" ] + }, + { + "index": 100, + "attached_to": 0, + "base_class": { + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] } ], - "pci": [ + "storage_controller": [ + { + "index": 14, + "attached_to": 13, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 1, + "number": 0 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "value": 8 + }, + "pci_interface": { + "value": 2 + }, + "vendor": { + "value": 9798 + }, + "sub_vendor": { + "value": 9798 + }, + "device": { + "value": 20503 + }, + "sub_device": { + "value": 20503 + }, + "revision": { + "value": 3 + }, + "model": "Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0", + "sysfs_bus_id": "0000:01:00.0", + "resources": [ + { + "type": "irq", + "base": 22, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2703228928, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 22, + "prog_if": 2 + }, + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ], + "module_alias": "pci:v00002646d00005017sv00002646sd00005017bc01sc08i02" + }, + { + "index": 18, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 18 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "value": 6 + }, + "pci_interface": { + "value": 1 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "value": 5208 + }, + "device": { + "value": 12771 + }, + "sub_device": { + "value": 4096 + }, + "revision": { + "value": 3 + }, + "model": "Intel Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:12.0", + "sysfs_bus_id": "0000:00:12.0", + "resources": [ + { + "type": "io", + "base": 61536, + "range": 32, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 61568, + "range": 4, + "enabled": true, + "access": "read_write" + }, + { + "type": "io", + "base": 61584, + "range": 8, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 131, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 2704343040, + "range": 8192, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2704371712, + "range": 2048, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 2704375808, + "range": 256, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 131, + "prog_if": 1 + }, + "driver": "ahci", + "driver_module": "ahci", + "drivers": [ + "ahci" + ], + "driver_modules": [ + "ahci" + ], + "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01", + "label": "Onboard - SATA" + } + ], + "system": { + "form_factor": "desktop" + }, + "unknown": [ { "index": 9, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1627,37 +3346,29 @@ "number": 28 }, "base_class": { - "hex": "0008", "name": "Generic system peripheral", "value": 8 }, "sub_class": { - "hex": "0005", "value": 5 }, "pci_interface": { - "hex": "0001", "value": 1 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31cc", "value": 12748 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel Generic system peripheral", @@ -1709,12 +3420,7 @@ { "index": 15, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1723,37 +3429,29 @@ "number": 30 }, "base_class": { - "hex": "0008", "name": "Generic system peripheral", "value": 8 }, "sub_class": { - "hex": "0005", "value": 5 }, "pci_interface": { - "hex": "0001", "value": 1 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31d0", "value": 12752 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel Generic system peripheral", @@ -1805,12 +3503,7 @@ { "index": 16, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1819,34 +3512,27 @@ "number": 15 }, "base_class": { - "hex": "0007", "name": "Communication controller", "value": 7 }, "sub_class": { - "hex": "0080", "name": "Communication controller", "value": 128 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "319a", "value": 12698 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel Communication controller", @@ -1855,7 +3541,7 @@ "resources": [ { "type": "irq", - "base": 134, + "base": 132, "triggered": 0, "enabled": true }, @@ -1873,7 +3559,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 134, + "irq": 132, "prog_if": 0 }, "driver": "mei_me", @@ -1890,12 +3576,7 @@ { "index": 19, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1904,34 +3585,27 @@ "number": 31 }, "base_class": { - "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { - "hex": "0005", "name": "SMBus", "value": 5 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31d4", "value": 12756 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel SMBus", @@ -1982,12 +3656,7 @@ { "index": 22, "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -1996,34 +3665,27 @@ "number": 0 }, "base_class": { - "hex": "0008", "name": "Generic system peripheral", "value": 8 }, "sub_class": { - "hex": "0080", "name": "System peripheral", "value": 128 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "3190", "value": 12688 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel System peripheral", @@ -2055,234 +3717,1048 @@ }, "module_alias": "pci:v00008086d00003190sv00001458sd00001000bc08sc80i00", "label": "Onboard - Other" - } - ], - "storage_controller": [ + }, { - "index": 14, - "attached_to": 13, - "class_list": [ - "storage_controller", - "pci" - ], + "index": 49, + "attached_to": 0, "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 + "name": "SCSI", + "value": 132 }, "slot": { - "bus": 1, + "bus": 6, "number": 0 }, "base_class": { - "hex": "0001", - "name": "Mass storage controller", - "value": 1 + "name": "Mass Storage Device", + "value": 262 }, "sub_class": { - "hex": "0008", - "value": 8 - }, - "pci_interface": { - "hex": "0002", - "value": 2 + "name": "Storage Device", + "value": 128 }, "vendor": { - "hex": "2646", - "value": 9798 - }, - "sub_vendor": { - "hex": "2646", - "value": 9798 + "name": "IET", + "value": 0 }, "device": { - "hex": "5017", - "value": 20503 - }, - "sub_device": { - "hex": "5017", - "value": 20503 + "name": "Controller", + "value": 0 }, "revision": { - "hex": "0003", - "value": 3 + "name": "0001", + "value": 0 }, - "model": "Mass storage controller", - "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0", - "sysfs_bus_id": "0000:01:00.0", - "resources": [ - { - "type": "irq", - "base": 22, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 2703228928, - "range": 16384, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1030, - "header_type": 0, - "secondary_bus": 0, - "irq": 22, - "prog_if": 2 + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg39", + "sysfs_bus_id": "6:0:0:0", + "unix_device_name": "/dev/sg39", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 39, + "range": 1 }, - "driver": "nvme", - "driver_module": "nvme", - "drivers": [ - "nvme" - ], - "driver_modules": [ - "nvme" - ], - "module_alias": "pci:v00002646d00005017sv00002646sd00005017bc01sc08i02" + "unix_device_names": [ + "/dev/sg39" + ] }, { - "index": 18, + "index": 50, "attached_to": 0, - "class_list": [ - "storage_controller", - "pci" - ], "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 + "name": "SCSI", + "value": 132 }, "slot": { - "bus": 0, - "number": 18 + "bus": 21, + "number": 0 }, "base_class": { - "hex": "0001", - "name": "Mass storage controller", - "value": 1 + "name": "Mass Storage Device", + "value": 262 }, "sub_class": { - "hex": "0006", - "value": 6 - }, - "pci_interface": { - "hex": "0001", - "value": 1 + "name": "Storage Device", + "value": 128 }, "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "sub_vendor": { - "hex": "1458", - "value": 5208 + "name": "IET", + "value": 0 }, "device": { - "hex": "31e3", - "value": 12771 - }, - "sub_device": { - "hex": "1000", - "value": 4096 + "name": "Controller", + "value": 0 }, "revision": { - "hex": "0003", - "value": 3 + "name": "0001", + "value": 0 }, - "model": "Intel Mass storage controller", - "sysfs_id": "/devices/pci0000:00/0000:00:12.0", - "sysfs_bus_id": "0000:00:12.0", - "resources": [ - { - "type": "io", - "base": 61536, - "range": 32, - "enabled": true, - "access": "read_write" - }, - { - "type": "io", - "base": 61568, - "range": 4, - "enabled": true, - "access": "read_write" - }, - { - "type": "io", - "base": 61584, - "range": 8, - "enabled": true, - "access": "read_write" - }, - { - "type": "irq", - "base": 133, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 2704343040, - "range": 8192, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 2704371712, - "range": 2048, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 2704375808, - "range": 256, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1031, - "header_type": 0, - "secondary_bus": 0, - "irq": 133, - "prog_if": 1 + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg29", + "sysfs_bus_id": "21:0:0:0", + "unix_device_name": "/dev/sg29", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 29, + "range": 1 }, - "driver": "ahci", - "driver_module": "ahci", - "drivers": [ - "ahci" - ], - "driver_modules": [ - "ahci" - ], - "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01", - "label": "Onboard - SATA" + "unix_device_names": [ + "/dev/sg29" + ] + }, + { + "index": 51, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 28, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg9", + "sysfs_bus_id": "28:0:0:0", + "unix_device_name": "/dev/sg9", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 9, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg9" + ] + }, + { + "index": 52, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 9, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg19", + "sysfs_bus_id": "9:0:0:0", + "unix_device_name": "/dev/sg19", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 19, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg19" + ] + }, + { + "index": 53, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 8, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg37", + "sysfs_bus_id": "8:0:0:0", + "unix_device_name": "/dev/sg37", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 37, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg37" + ] + }, + { + "index": 54, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 19, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg27", + "sysfs_bus_id": "19:0:0:0", + "unix_device_name": "/dev/sg27", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 27, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg27" + ] + }, + { + "index": 55, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 11, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg7", + "sysfs_bus_id": "11:0:0:0", + "unix_device_name": "/dev/sg7", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 7, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg7" + ] + }, + { + "index": 56, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 7, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg17", + "sysfs_bus_id": "7:0:0:0", + "unix_device_name": "/dev/sg17", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 17, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg17" + ] + }, + { + "index": 57, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 14, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg45", + "sysfs_bus_id": "14:0:0:0", + "unix_device_name": "/dev/sg45", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 45, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg45" + ] + }, + { + "index": 58, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 25, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg35", + "sysfs_bus_id": "25:0:0:0", + "unix_device_name": "/dev/sg35", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 35, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg35" + ] + }, + { + "index": 59, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 17, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg25", + "sysfs_bus_id": "17:0:0:0", + "unix_device_name": "/dev/sg25", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 25, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg25" + ] + }, + { + "index": 60, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg5", + "sysfs_bus_id": "4:0:0:0", + "unix_device_name": "/dev/sg5", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 5, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg5" + ] + }, + { + "index": 61, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 5, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg15", + "sysfs_bus_id": "5:0:0:0", + "unix_device_name": "/dev/sg15", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 15, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg15" + ] + }, + { + "index": 62, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 22, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg43", + "sysfs_bus_id": "22:0:0:0", + "unix_device_name": "/dev/sg43", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 43, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg43" + ] + }, + { + "index": 63, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 24, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg33", + "sysfs_bus_id": "24:0:0:0", + "unix_device_name": "/dev/sg33", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 33, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg33" + ] + }, + { + "index": 64, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 13, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg23", + "sysfs_bus_id": "13:0:0:0", + "unix_device_name": "/dev/sg23", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 23, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg23" + ] + }, + { + "index": 65, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 18, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg3", + "sysfs_bus_id": "18:0:0:0", + "unix_device_name": "/dev/sg3", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 3, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg3" + ] + }, + { + "index": 66, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 3, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg13", + "sysfs_bus_id": "3:0:0:0", + "unix_device_name": "/dev/sg13", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 13, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg13" + ] + }, + { + "index": 67, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 10, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg41", + "sysfs_bus_id": "10:0:0:0", + "unix_device_name": "/dev/sg41", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 41, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg41" + ] + }, + { + "index": 68, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 23, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg31", + "sysfs_bus_id": "23:0:0:0", + "unix_device_name": "/dev/sg31", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 31, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg31" + ] + }, + { + "index": 69, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 12, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg21", + "sysfs_bus_id": "12:0:0:0", + "unix_device_name": "/dev/sg21", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 21, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg21" + ] + }, + { + "index": 70, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 2, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg1", + "sysfs_bus_id": "2:0:0:0", + "unix_device_name": "/dev/sg1", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 1, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg1" + ] + }, + { + "index": 71, + "attached_to": 0, + "bus_type": { + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 15, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Storage Device", + "value": 128 + }, + "vendor": { + "name": "IET", + "value": 0 + }, + "device": { + "name": "Controller", + "value": 0 + }, + "revision": { + "name": "0001", + "value": 0 + }, + "model": "IET Controller", + "sysfs_id": "/class/scsi_generic/sg11", + "sysfs_bus_id": "15:0:0:0", + "unix_device_name": "/dev/sg11", + "unix_device_number": { + "type": 99, + "major": 21, + "minor": 11, + "range": 1 + }, + "unix_device_names": [ + "/dev/sg11" + ] } ], - "system": { - "form_factor": "desktop" - }, "usb_controller": [ { "index": 21, "attached_to": 0, - "class_list": [ - "usb_controller", - "pci" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -2291,38 +4767,30 @@ "number": 21 }, "base_class": { - "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { - "hex": "0003", "name": "USB Controller", "value": 3 }, "pci_interface": { - "hex": "0030", "value": 48 }, "vendor": { - "hex": "8086", "name": "Intel Corporation", "value": 32902 }, "sub_vendor": { - "hex": "1458", "value": 5208 }, "device": { - "hex": "31a8", "value": 12712 }, "sub_device": { - "hex": "1000", "value": 4096 }, "revision": { - "hex": "0003", "value": 3 }, "model": "Intel USB Controller", @@ -2331,7 +4799,7 @@ "resources": [ { "type": "irq", - "base": 123, + "base": 125, "triggered": 0, "enabled": true }, @@ -2349,7 +4817,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 123, + "irq": 125, "prog_if": 48 }, "driver": "xhci_hcd", @@ -2399,7 +4867,6 @@ "product": "MZGLKAP-00", "version": "1.x", "board_type": { - "hex": "000a", "name": "Motherboard", "value": 10 }, @@ -2418,30 +4885,25 @@ "size_current": 224, "speed": 0, "mode": { - "hex": "0001", "name": "Write Back", "value": 1 }, "enabled": true, "location": { - "hex": "0000", "name": "Internal", "value": 0 }, "socketed": false, "level": 0, "ecc": { - "hex": "0004", "name": "Parity", "value": 4 }, "cache_type": { - "hex": "0001", "name": "Other", "value": 1 }, "associativity": { - "hex": "0001", "name": "Other", "value": 1 }, @@ -2459,30 +4921,25 @@ "size_current": 4096, "speed": 0, "mode": { - "hex": "0001", "name": "Write Back", "value": 1 }, "enabled": true, "location": { - "hex": "0000", "name": "Internal", "value": 0 }, "socketed": false, "level": 1, "ecc": { - "hex": "0005", "name": "Single-bit", "value": 5 }, "cache_type": { - "hex": "0005", "name": "Unified", "value": 5 }, "associativity": { - "hex": "0008", "name": "16-way Set-Associative", "value": 8 }, @@ -2494,40 +4951,33 @@ ] } ], - "chassis": [ - { - "handle": 3, - "manufacturer": "Default string", - "version": "Default string", - "chassis_type": { - "hex": "0003", - "name": "Desktop", - "value": 3 - }, - "lock_present": false, - "bootup_state": { - "hex": "0003", - "name": "Safe", - "value": 3 - }, - "power_state": { - "hex": "0003", - "name": "Safe", - "value": 3 - }, - "thermal_state": { - "hex": "0003", - "name": "Safe", - "value": 3 - }, - "security_state": { - "hex": "0003", - "name": "None", - "value": 3 - }, - "oem": "0x0" - } - ], + "chassis": { + "handle": 3, + "manufacturer": "Default string", + "version": "Default string", + "chassis_type": { + "name": "Desktop", + "value": 3 + }, + "lock_present": false, + "bootup_state": { + "name": "Safe", + "value": 3 + }, + "power_state": { + "name": "Safe", + "value": 3 + }, + "thermal_state": { + "name": "Safe", + "value": 3 + }, + "security_state": { + "name": "None", + "value": 3 + }, + "oem": "0x0" + }, "config": { "handle": 34, "options": [ @@ -2546,21 +4996,18 @@ { "handle": 35, "location": { - "hex": "0003", "name": "Motherboard", "value": 3 }, "usage": { - "hex": "0003", "name": "System memory", "value": 3 }, "ecc": { - "hex": "0003", "name": "None", "value": 3 }, - "max_size": "0x2000000", + "max_size": 33554432, "error_handle": 65534, "slots": 2 } @@ -2569,8 +5016,8 @@ { "handle": 36, "array_handle": 35, - "start_address": "0x0", - "end_address": "0x600000000", + "start_address": 0, + "end_address": 25769803776, "part_width": 2 } ], @@ -2587,13 +5034,11 @@ "ecc_bits": 0, "size": 8388608, "form_factor": { - "hex": "000d", "name": "SODIMM", "value": 13 }, "set": 0, "memory_type": { - "hex": "001a", "name": "Other", "value": 26 }, @@ -2614,13 +5059,11 @@ "ecc_bits": 0, "size": 16777216, "form_factor": { - "hex": "000d", "name": "SODIMM", "value": 13 }, "set": 0, "memory_type": { - "hex": "001a", "name": "Other", "value": 26 }, @@ -2635,8 +5078,8 @@ "handle": 38, "memory_device_handle": 37, "array_map_handle": 36, - "start_address": "0x0", - "end_address": "0x200000000", + "start_address": 0, + "end_address": 8589934592, "row_position": 255, "interleave_position": 1, "interleave_depth": 2 @@ -2645,8 +5088,8 @@ "handle": 40, "memory_device_handle": 39, "array_map_handle": 36, - "start_address": "0x200000000", - "end_address": "0x600000000", + "start_address": 8589934592, + "end_address": 25769803776, "row_position": 255, "interleave_position": 2, "interleave_depth": 2 @@ -2659,7 +5102,6 @@ { "name": "To Be Filled By O.E.M.", "type": { - "hex": "0003", "name": "Video", "value": 3 }, @@ -2672,13 +5114,11 @@ { "handle": 8, "port_type": { - "hex": "000e", "name": "Mouse Port", "value": 14 }, "internal_reference_designator": "J1A1", "external_connector_type": { - "hex": "000f", "name": "PS/2", "value": 15 }, @@ -2687,13 +5127,11 @@ { "handle": 9, "port_type": { - "hex": "000d", "name": "Keyboard Port", "value": 13 }, "internal_reference_designator": "J1A1", "external_connector_type": { - "hex": "000f", "name": "PS/2", "value": 15 }, @@ -2702,13 +5140,11 @@ { "handle": 10, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_reference_designator": "J2A1", "external_connector_type": { - "hex": "001d", "name": "Mini-Centronics Type-14", "value": 29 }, @@ -2717,13 +5153,11 @@ { "handle": 11, "port_type": { - "hex": "0009", "name": "Serial Port 16550A Compatible", "value": 9 }, "internal_reference_designator": "J2A2A", "external_connector_type": { - "hex": "0008", "name": "DB-9 pin male", "value": 8 }, @@ -2732,13 +5166,11 @@ { "handle": 12, "port_type": { - "hex": "001c", "name": "Video Port", "value": 28 }, "internal_reference_designator": "J2A2B", "external_connector_type": { - "hex": "0007", "name": "DB-15 pin female", "value": 7 }, @@ -2747,13 +5179,11 @@ { "handle": 13, "port_type": { - "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "J3A1", "external_connector_type": { - "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -2762,13 +5192,11 @@ { "handle": 14, "port_type": { - "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "J3A1", "external_connector_type": { - "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -2777,13 +5205,11 @@ { "handle": 15, "port_type": { - "hex": "0010", "name": "USB", "value": 16 }, "internal_reference_designator": "J3A1", "external_connector_type": { - "hex": "0012", "name": "Access Bus [USB]", "value": 18 }, @@ -2792,12 +5218,10 @@ { "handle": 16, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2806,12 +5230,10 @@ { "handle": 17, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2820,12 +5242,10 @@ { "handle": 18, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2834,12 +5254,10 @@ { "handle": 19, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2848,12 +5266,10 @@ { "handle": 20, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2862,12 +5278,10 @@ { "handle": 21, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2876,12 +5290,10 @@ { "handle": 22, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2890,12 +5302,10 @@ { "handle": 23, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2904,12 +5314,10 @@ { "handle": 24, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2918,12 +5326,10 @@ { "handle": 25, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2932,12 +5338,10 @@ { "handle": 26, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2946,12 +5350,10 @@ { "handle": 27, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2960,12 +5362,10 @@ { "handle": 28, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2974,12 +5374,10 @@ { "handle": 29, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -2988,12 +5386,10 @@ { "handle": 30, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -3002,12 +5398,10 @@ { "handle": 31, "port_type": { - "hex": "00ff", "name": "Other", "value": 255 }, "internal_connector_type": { - "hex": "00ff", "name": "Other", "value": 255 }, @@ -3019,7 +5413,6 @@ "handle": 49, "socket": "SOCKET 0", "socket_type": { - "hex": "0001", "name": "Other", "value": 1 }, @@ -3028,17 +5421,14 @@ "version": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz", "part": "Fill By OEM", "processor_type": { - "hex": "0003", "name": "CPU", "value": 3 }, "processor_family": { - "hex": "000f", "name": "Celeron", "value": 15 }, "processor_status": { - "hex": "0001", "name": "Enabled", "value": 1 }, @@ -3054,22 +5444,18 @@ "handle": 64, "designation": "J7H1", "slot_type": { - "hex": "00ae", "name": "Other", "value": 174 }, "bus_width": { - "hex": "000a", "name": "Other", "value": 10 }, "usage": { - "hex": "0004", "name": "In Use", "value": 4 }, "length": { - "hex": "0003", "name": "Short", "value": 3 }, @@ -3084,22 +5470,18 @@ "handle": 65, "designation": "J8H1", "slot_type": { - "hex": "00ad", "name": "Other", "value": 173 }, "bus_width": { - "hex": "0009", "name": "Other", "value": 9 }, "usage": { - "hex": "0003", "name": "Available", "value": 3 }, "length": { - "hex": "0003", "name": "Short", "value": 3 }, @@ -3117,7 +5499,6 @@ "product": "MZGLKAP-00", "version": "1.x", "wake_up": { - "hex": "0006", "name": "Power Switch", "value": 6 } diff --git a/machines/roeland/configuration.nix b/machines/roeland/configuration.nix deleted file mode 100644 index b199dbe..0000000 --- a/machines/roeland/configuration.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - config, - ... -}: { - config = { - facter.reportPath = ./facter.json; - system.stateVersion = "25.05"; - users.users.root.openssh.authorizedKeys.keys = config.pim.ssh.keys.pim ++ config.pim.ssh.keys.niels; - pim.k3s.serverAddr = "https://atlas.dmz:6443"; - pim.hasK8sStorageSetup = lib.mkForce false; - - deployment = { - targetHost = "roeland"; - targetUser = "root"; - tags = ["server" "kubernetes"]; - }; - - disko.devices = { - disk.disk1 = { - device = lib.mkDefault "/dev/nvme0n1"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - boot = { - name = "boot"; - size = "1M"; - type = "EF02"; - }; - esp = { - name = "ESP"; - size = "500M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - root = { - name = "root"; - size = "100%"; - content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; - }; - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - root = { - size = "100%FREE"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - mountOptions = [ - "defaults" - ]; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/machines/roeland/facter.json b/machines/roeland/facter.json deleted file mode 100644 index e9f9dc8..0000000 --- a/machines/roeland/facter.json +++ /dev/null @@ -1,3446 +0,0 @@ -{ - "version": 1, - "system": "x86_64-linux", - "virtualisation": "none", - "hardware": { - "bios": { - "apm_info": { - "supported": false, - "enabled": false, - "version": 0, - "sub_version": 0, - "bios_flags": 0 - }, - "vbe_info": { - "version": 0, - "video_memory": 0 - }, - "pnp": false, - "pnp_id": 0, - "lba_support": false, - "low_memory_size": 0, - "smbios_version": 773 - }, - "bluetooth": [ - { - "index": 34, - "attached_to": 33, - "class_list": [ - "usb", - "bluetooth" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0115", - "name": "Bluetooth Device", - "value": 277 - }, - "vendor": { - "hex": "8087", - "value": 32903 - }, - "device": { - "hex": "0026", - "value": 38 - }, - "revision": { - "hex": "0000", - "name": "0.02", - "value": 0 - }, - "model": "Bluetooth Device", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.0", - "sysfs_bus_id": "3-10:1.0", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "00e0", - "name": "wireless", - "value": 224 - }, - "device_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "device_protocol": 1, - "interface_class": { - "hex": "00e0", - "name": "wireless", - "value": 224 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 1, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "btusb", - "driver_module": "btusb", - "drivers": [ - "btusb" - ], - "driver_modules": [ - "btusb" - ], - "module_alias": "usb:v8087p0026d0002dcE0dsc01dp01icE0isc01ip01in00" - }, - { - "index": 37, - "attached_to": 33, - "class_list": [ - "usb", - "bluetooth" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0115", - "name": "Bluetooth Device", - "value": 277 - }, - "vendor": { - "hex": "8087", - "value": 32903 - }, - "device": { - "hex": "0026", - "value": 38 - }, - "revision": { - "hex": "0000", - "name": "0.02", - "value": 0 - }, - "model": "Bluetooth Device", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.1", - "sysfs_bus_id": "3-10:1.1", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "00e0", - "name": "wireless", - "value": 224 - }, - "device_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "device_protocol": 1, - "interface_class": { - "hex": "00e0", - "name": "wireless", - "value": 224 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 1, - "interface_number": 1, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "btusb", - "driver_module": "btusb", - "drivers": [ - "btusb" - ], - "driver_modules": [ - "btusb" - ], - "module_alias": "usb:v8087p0026d0002dcE0dsc01dp01icE0isc01ip01in01" - } - ], - "bridge": [ - { - "index": 10, - "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 29 - }, - "base_class": { - "hex": "0006", - "name": "Bridge", - "value": 6 - }, - "sub_class": { - "hex": "0004", - "name": "PCI bridge", - "value": 4 - }, - "pci_interface": { - "hex": "0000", - "name": "Normal decode", - "value": 0 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54b3", - "value": 21683 - }, - "model": "Intel PCI bridge", - "sysfs_id": "/devices/pci0000:00/0000:00:1d.3", - "sysfs_bus_id": "0000:00:1d.3", - "resources": [ - { - "type": "irq", - "base": 121, - "triggered": 0, - "enabled": true - } - ], - "detail": { - "function": 3, - "command": 1031, - "header_type": 1, - "secondary_bus": 2, - "irq": 121, - "prog_if": 0 - }, - "driver": "pcieport", - "driver_module": "pcieportdrv", - "drivers": [ - "pcieport" - ], - "driver_modules": [ - "pcieportdrv" - ], - "module_alias": "pci:v00008086d000054B3sv00000000sd00000000bc06sc04i00" - }, - { - "index": 11, - "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 31 - }, - "base_class": { - "hex": "0006", - "name": "Bridge", - "value": 6 - }, - "sub_class": { - "hex": "0001", - "name": "ISA bridge", - "value": 1 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "5481", - "value": 21633 - }, - "model": "Intel ISA bridge", - "sysfs_id": "/devices/pci0000:00/0000:00:1f.0", - "sysfs_bus_id": "0000:00:1f.0", - "detail": { - "function": 0, - "command": 1031, - "header_type": 0, - "secondary_bus": 0, - "irq": 0, - "prog_if": 0 - }, - "module_alias": "pci:v00008086d00005481sv00000000sd00000000bc06sc01i00" - }, - { - "index": 20, - "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0006", - "name": "Bridge", - "value": 6 - }, - "sub_class": { - "hex": "0000", - "name": "Host bridge", - "value": 0 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "461c", - "value": 17948 - }, - "model": "Intel Host bridge", - "sysfs_id": "/devices/pci0000:00/0000:00:00.0", - "sysfs_bus_id": "0000:00:00.0", - "detail": { - "function": 0, - "command": 6, - "header_type": 0, - "secondary_bus": 0, - "irq": 0, - "prog_if": 0 - }, - "driver": "igen6_edac", - "driver_module": "igen6_edac", - "drivers": [ - "igen6_edac" - ], - "driver_modules": [ - "igen6_edac" - ], - "module_alias": "pci:v00008086d0000461Csv00000000sd00000000bc06sc00i00" - }, - { - "index": 23, - "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 29 - }, - "base_class": { - "hex": "0006", - "name": "Bridge", - "value": 6 - }, - "sub_class": { - "hex": "0004", - "name": "PCI bridge", - "value": 4 - }, - "pci_interface": { - "hex": "0000", - "name": "Normal decode", - "value": 0 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54b0", - "value": 21680 - }, - "model": "Intel PCI bridge", - "sysfs_id": "/devices/pci0000:00/0000:00:1d.0", - "sysfs_bus_id": "0000:00:1d.0", - "resources": [ - { - "type": "irq", - "base": 120, - "triggered": 0, - "enabled": true - } - ], - "detail": { - "function": 0, - "command": 1031, - "header_type": 1, - "secondary_bus": 1, - "irq": 120, - "prog_if": 0 - }, - "driver": "pcieport", - "driver_module": "pcieportdrv", - "drivers": [ - "pcieport" - ], - "driver_modules": [ - "pcieportdrv" - ], - "module_alias": "pci:v00008086d000054B0sv00000000sd00000000bc06sc04i00" - } - ], - "cpu": [ - { - "architecture": "x86_64", - "vendor_name": "GenuineIntel", - "family": 6, - "model": 190, - "stepping": 0, - "features": [ - "fpu", - "vme", - "de", - "pse", - "tsc", - "msr", - "pae", - "mce", - "cx8", - "apic", - "sep", - "mtrr", - "pge", - "mca", - "cmov", - "pat", - "pse36", - "clflush", - "dts", - "acpi", - "mmx", - "fxsr", - "sse", - "sse2", - "ss", - "ht", - "tm", - "pbe", - "syscall", - "nx", - "pdpe1gb", - "rdtscp", - "lm", - "constant_tsc", - "art", - "arch_perfmon", - "pebs", - "bts", - "rep_good", - "nopl", - "xtopology", - "nonstop_tsc", - "cpuid", - "aperfmperf", - "tsc_known_freq", - "pni", - "pclmulqdq", - "dtes64", - "monitor", - "ds_cpl", - "vmx", - "est", - "tm2", - "ssse3", - "sdbg", - "fma", - "cx16", - "xtpr", - "pdcm", - "pcid", - "sse4_1", - "sse4_2", - "x2apic", - "movbe", - "popcnt", - "tsc_deadline_timer", - "aes", - "xsave", - "avx", - "f16c", - "rdrand", - "lahf_lm", - "abm", - "3dnowprefetch", - "cpuid_fault", - "epb", - "cat_l2", - "cdp_l2", - "ssbd", - "ibrs", - "ibpb", - "stibp", - "ibrs_enhanced", - "tpr_shadow", - "flexpriority", - "ept", - "vpid", - "ept_ad", - "fsgsbase", - "tsc_adjust", - "bmi1", - "avx2", - "smep", - "bmi2", - "erms", - "invpcid", - "rdt_a", - "rdseed", - "adx", - "smap", - "clflushopt", - "clwb", - "intel_pt", - "sha_ni", - "xsaveopt", - "xsavec", - "xgetbv1", - "xsaves", - "split_lock_detect", - "user_shstk", - "avx_vnni", - "dtherm", - "ida", - "arat", - "pln", - "pts", - "hwp", - "hwp_notify", - "hwp_act_window", - "hwp_epp", - "hwp_pkg_req", - "vnmi", - "umip", - "pku", - "ospke", - "waitpkg", - "gfni", - "vaes", - "vpclmulqdq", - "rdpid", - "movdiri", - "movdir64b", - "fsrm", - "md_clear", - "serialize", - "arch_lbr", - "ibt", - "flush_l1d", - "arch_capabilities" - ], - "bugs": [ - "spectre_v1", - "spectre_v2", - "spec_store_bypass", - "swapgs", - "rfds", - "bhi" - ], - "bogo": 1612.8, - "cache": 6144, - "units": 128, - "physical_id": 0, - "siblings": 4, - "cores": 4, - "fpu": true, - "fpu_exception": true, - "cpuid_level": 32, - "write_protect": false, - "tlb_size": 32766, - "clflush_size": 64, - "cache_alignment": 64, - "address_sizes": { - "physical": "0x27", - "virtual": "0x30" - } - } - ], - "disk": [ - { - "index": 30, - "attached_to": 12, - "class_list": [ - "disk", - "block_device", - "nvme" - ], - "bus_type": { - "hex": "0096", - "name": "NVME", - "value": 150 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0106", - "name": "Mass Storage Device", - "value": 262 - }, - "sub_class": { - "hex": "0000", - "name": "Disk", - "value": 0 - }, - "vendor": { - "hex": "1e4b", - "value": 7755 - }, - "sub_vendor": { - "hex": "1e4b", - "value": 7755 - }, - "device": { - "hex": "1202", - "name": "HighRel 512GB SSD", - "value": 4610 - }, - "sub_device": { - "hex": "1202", - "value": 4610 - }, - "serial": "MP52W21109974", - "model": "HighRel 512GB SSD", - "sysfs_id": "/class/block/nvme0n1", - "sysfs_bus_id": "nvme0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.3/0000:02:00.0/nvme/nvme0", - "unix_device_name": "/dev/nvme0n1", - "unix_device_number": { - "type": 98, - "major": 259, - "minor": 0, - "range": 0 - }, - "unix_device_names": [ - "/dev/disk/by-id/nvme-HighRel_512GB_SSD_MP52W21109974", - "/dev/disk/by-id/nvme-HighRel_512GB_SSD_MP52W21109974_1", - "/dev/disk/by-id/nvme-nvme.1e4b-4d503532573231313039393734-4869676852656c20353132474220535344-00000001", - "/dev/disk/by-path/pci-0000:02:00.0-nvme-1", - "/dev/nvme0n1" - ], - "resources": [ - { - "type": "disk_geo", - "cylinders": 488386, - "heads": 64, - "sectors": 32, - "size": "0x0", - "geo_type": "logical" - }, - { - "type": "size", - "unit": "sectors", - "value_1": 1000215216, - "value_2": 512 - } - ], - "driver": "nvme", - "driver_module": "nvme", - "drivers": [ - "nvme" - ], - "driver_modules": [ - "nvme" - ] - }, - { - "index": 31, - "attached_to": 27, - "class_list": [ - "disk", - "usb", - "scsi", - "block_device" - ], - "bus_type": { - "hex": "0084", - "name": "SCSI", - "value": 132 - }, - "slot": { - "bus": 1, - "number": 0 - }, - "base_class": { - "hex": "0106", - "name": "Mass Storage Device", - "value": 262 - }, - "sub_class": { - "hex": "0000", - "name": "Disk", - "value": 0 - }, - "vendor": { - "hex": "0781", - "name": "SanDisk", - "value": 1921 - }, - "device": { - "hex": "5581", - "name": "Ultra", - "value": 21889 - }, - "revision": { - "hex": "0000", - "name": "1.00", - "value": 0 - }, - "serial": "4C530001141006121345", - "model": "SanDisk Ultra", - "sysfs_id": "/class/block/sda", - "sysfs_bus_id": "1:0:0:0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb4/4-1/4-1:1.0/host1/target1:0:0/1:0:0:0", - "unix_device_name": "/dev/sda", - "unix_device_number": { - "type": 98, - "major": 8, - "minor": 0, - "range": 16 - }, - "unix_device_names": [ - "/dev/disk/by-id/usb-SanDisk_Ultra_4C530001141006121345-0:0", - "/dev/disk/by-path/pci-0000:00:14.0-usb-0:1:1.0-scsi-0:0:0:0", - "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:1:1.0-scsi-0:0:0:0", - "/dev/sda" - ], - "unix_device_name2": "/dev/sg0", - "unix_device_number2": { - "type": 99, - "major": 21, - "minor": 0, - "range": 1 - }, - "resources": [ - { - "type": "disk_geo", - "cylinders": 29327, - "heads": 64, - "sectors": 32, - "size": "0x0", - "geo_type": "logical" - }, - { - "type": "size", - "unit": "sectors", - "value_1": 60062500, - "value_2": 512 - } - ], - "driver": "usb-storage", - "driver_module": "usb_storage", - "drivers": [ - "sd", - "usb-storage" - ], - "driver_modules": [ - "sd_mod", - "usb_storage" - ], - "module_alias": "usb:v0781p5581d0100dc00dsc00dp00ic08isc06ip50in00" - } - ], - "graphics_card": [ - { - "index": 26, - "attached_to": 0, - "class_list": [ - "graphics_card", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 2 - }, - "base_class": { - "hex": "0003", - "name": "Display controller", - "value": 3 - }, - "sub_class": { - "hex": "0000", - "name": "VGA compatible controller", - "value": 0 - }, - "pci_interface": { - "hex": "0000", - "name": "VGA", - "value": 0 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "46d1", - "value": 18129 - }, - "model": "Intel VGA compatible controller", - "sysfs_id": "/devices/pci0000:00/0000:00:02.0", - "sysfs_bus_id": "0000:00:02.0", - "resources": [ - { - "type": "io", - "base": 12288, - "range": 64, - "enabled": true, - "access": "read_write" - }, - { - "type": "irq", - "base": 150, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 274877906944, - "range": 268435456, - "enabled": true, - "access": "read_only", - "prefetch": "no" - }, - { - "type": "mem", - "base": 412316860416, - "range": 16777216, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 786432, - "range": 131072, - "enabled": false, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1031, - "header_type": 0, - "secondary_bus": 0, - "irq": 150, - "prog_if": 0 - }, - "driver": "i915", - "driver_module": "i915", - "drivers": [ - "i915" - ], - "driver_modules": [ - "i915" - ], - "module_alias": "pci:v00008086d000046D1sv00000000sd00000000bc03sc00i00" - } - ], - "hub": [ - { - "index": 33, - "attached_to": 27, - "class_list": [ - "usb", - "hub" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "010a", - "name": "Hub", - "value": 266 - }, - "vendor": { - "hex": "1d6b", - "name": "Linux 6.12.35 xhci-hcd", - "value": 7531 - }, - "device": { - "hex": "0002", - "name": "xHCI Host Controller", - "value": 2 - }, - "revision": { - "hex": "0000", - "name": "6.12", - "value": 0 - }, - "serial": "0000:00:14.0", - "model": "Linux 6.12.35 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": [ - { - "type": "baud", - "speed": 480000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0009", - "name": "hub", - "value": 9 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 1, - "interface_class": { - "hex": "0009", - "name": "hub", - "value": 9 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "hub", - "driver_module": "usbcore", - "drivers": [ - "hub" - ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" - }, - { - "index": 35, - "attached_to": 27, - "class_list": [ - "usb", - "hub" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "010a", - "name": "Hub", - "value": 266 - }, - "vendor": { - "hex": "1d6b", - "name": "Linux 6.12.35 xhci-hcd", - "value": 7531 - }, - "device": { - "hex": "0003", - "name": "xHCI Host Controller", - "value": 3 - }, - "revision": { - "hex": "0000", - "name": "6.12", - "value": 0 - }, - "serial": "0000:00:14.0", - "model": "Linux 6.12.35 xhci-hcd xHCI Host Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb4/4-0:1.0", - "sysfs_bus_id": "4-0:1.0", - "detail": { - "device_class": { - "hex": "0009", - "name": "hub", - "value": 9 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 3, - "interface_class": { - "hex": "0009", - "name": "hub", - "value": 9 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "hub", - "driver_module": "usbcore", - "drivers": [ - "hub" - ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" - }, - { - "index": 36, - "attached_to": 9, - "class_list": [ - "usb", - "hub" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "010a", - "name": "Hub", - "value": 266 - }, - "vendor": { - "hex": "1d6b", - "name": "Linux 6.12.35 xhci-hcd", - "value": 7531 - }, - "device": { - "hex": "0002", - "name": "xHCI Host Controller", - "value": 2 - }, - "revision": { - "hex": "0000", - "name": "6.12", - "value": 0 - }, - "serial": "0000:00:0d.0", - "model": "Linux 6.12.35 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": [ - { - "type": "baud", - "speed": 480000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0009", - "name": "hub", - "value": 9 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 1, - "interface_class": { - "hex": "0009", - "name": "hub", - "value": 9 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "hub", - "driver_module": "usbcore", - "drivers": [ - "hub" - ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" - }, - { - "index": 39, - "attached_to": 9, - "class_list": [ - "usb", - "hub" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "010a", - "name": "Hub", - "value": 266 - }, - "vendor": { - "hex": "1d6b", - "name": "Linux 6.12.35 xhci-hcd", - "value": 7531 - }, - "device": { - "hex": "0003", - "name": "xHCI Host Controller", - "value": 3 - }, - "revision": { - "hex": "0000", - "name": "6.12", - "value": 0 - }, - "serial": "0000:00:0d.0", - "model": "Linux 6.12.35 xhci-hcd xHCI Host Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb2/2-0:1.0", - "sysfs_bus_id": "2-0:1.0", - "detail": { - "device_class": { - "hex": "0009", - "name": "hub", - "value": 9 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 3, - "interface_class": { - "hex": "0009", - "name": "hub", - "value": 9 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "hub", - "driver_module": "usbcore", - "drivers": [ - "hub" - ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" - } - ], - "keyboard": [ - { - "index": 32, - "attached_to": 33, - "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": "413c", - "name": "DELL", - "value": 16700 - }, - "device": { - "hex": "2106", - "name": "Dell QuietKey Keyboard", - "value": 8454 - }, - "revision": { - "hex": "0000", - "name": "1.01", - "value": 0 - }, - "model": "DELL Dell QuietKey Keyboard", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-7/3-7:1.0", - "sysfs_bus_id": "3-7:1.0", - "unix_device_name": "/dev/input/event1", - "unix_device_number": { - "type": 99, - "major": 13, - "minor": 65, - "range": 1 - }, - "unix_device_names": [ - "/dev/input/by-id/usb-DELL_Dell_QuietKey_Keyboard-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:7:1.0-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:7:1.0-event-kbd", - "/dev/input/event1" - ], - "resources": [ - { - "type": "baud", - "speed": 1500000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 1, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "driver_info": { - "type": "keyboard", - "xkb_rules": "xfree86", - "xkb_model": "pc104" - }, - "module_alias": "usb:v413Cp2106d0101dc00dsc00dp00ic03isc01ip01in00" - } - ], - "memory": [ - { - "index": 7, - "attached_to": 0, - "class_list": [ - "memory" - ], - "base_class": { - "hex": "0101", - "name": "Internally Used Class", - "value": 257 - }, - "sub_class": { - "hex": "0002", - "name": "Main Memory", - "value": 2 - }, - "model": "Main Memory", - "resources": [ - { - "type": "mem", - "base": 0, - "range": 16500355072, - "enabled": true, - "access": "read_write", - "prefetch": "unknown" - }, - { - "type": "phys_mem", - "range": 16106127360 - } - ] - } - ], - "monitor": [ - { - "index": 29, - "attached_to": 26, - "class_list": [ - "monitor" - ], - "base_class": { - "hex": "0100", - "name": "Monitor", - "value": 256 - }, - "sub_class": { - "hex": "0002", - "name": "LCD Monitor", - "value": 2 - }, - "vendor": { - "hex": "10ac", - "name": "DELL", - "value": 4268 - }, - "device": { - "hex": "40eb", - "name": "DELL U2717D", - "value": 16619 - }, - "serial": "J0XYN7BNASVS", - "model": "DELL U2717D", - "resources": [ - { - "type": "monitor", - "width": 1024, - "height": 768, - "vertical_frequency": 60, - "interlaced": false - }, - { - "type": "monitor", - "width": 1024, - "height": 768, - "vertical_frequency": 75, - "interlaced": false - }, - { - "type": "monitor", - "width": 1152, - "height": 864, - "vertical_frequency": 75, - "interlaced": false - }, - { - "type": "monitor", - "width": 1280, - "height": 1024, - "vertical_frequency": 60, - "interlaced": false - }, - { - "type": "monitor", - "width": 1280, - "height": 1024, - "vertical_frequency": 75, - "interlaced": false - }, - { - "type": "monitor", - "width": 1600, - "height": 1200, - "vertical_frequency": 60, - "interlaced": false - }, - { - "type": "monitor", - "width": 1920, - "height": 1080, - "vertical_frequency": 60, - "interlaced": false - }, - { - "type": "monitor", - "width": 2560, - "height": 1440, - "vertical_frequency": 60, - "interlaced": false - }, - { - "type": "monitor", - "width": 640, - "height": 480, - "vertical_frequency": 60, - "interlaced": false - }, - { - "type": "monitor", - "width": 640, - "height": 480, - "vertical_frequency": 75, - "interlaced": false - }, - { - "type": "monitor", - "width": 720, - "height": 400, - "vertical_frequency": 70, - "interlaced": false - }, - { - "type": "monitor", - "width": 800, - "height": 600, - "vertical_frequency": 60, - "interlaced": false - }, - { - "type": "monitor", - "width": 800, - "height": 600, - "vertical_frequency": 75, - "interlaced": false - }, - { - "type": "size", - "unit": "mm", - "value_1": 597, - "value_2": 336 - } - ], - "detail": { - "manufacture_year": 2017, - "manufacture_week": 47, - "vertical_sync": { - "min": 50, - "max": 75 - }, - "horizontal_sync": { - "min": 30, - "max": 88 - }, - "horizontal_sync_timings": { - "disp": 2560, - "sync_start": 2608, - "sync_end": 2640, - "total": 2720 - }, - "vertical_sync_timings": { - "disp": 1440, - "sync_start": 1443, - "sync_end": 1448, - "total": 1481 - }, - "clock": 241500, - "width": 2560, - "height": 1440, - "width_millimetres": 597, - "height_millimetres": 336, - "horizontal_flag": 45, - "vertical_flag": 43, - "vendor": "", - "name": "DELL U2717D" - }, - "driver_info": { - "type": "display", - "width": 2560, - "height": 1440, - "vertical_sync": { - "min": 50, - "max": 75 - }, - "horizontal_sync": { - "min": 30, - "max": 88 - }, - "bandwidth": 0, - "horizontal_sync_timings": { - "disp": 2560, - "sync_start": 2608, - "sync_end": 2640, - "total": 2720 - }, - "vertical_sync_timings": { - "disp": 1440, - "sync_start": 1443, - "sync_end": 1448, - "total": 1481 - }, - "horizontal_flag": 45, - "vertical_flag": 43 - } - } - ], - "network_controller": [ - { - "index": 14, - "attached_to": 0, - "class_list": [ - "network_controller", - "pci", - "wlan_card" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 20 - }, - "base_class": { - "hex": "0002", - "name": "Network controller", - "value": 2 - }, - "sub_class": { - "hex": "0082", - "name": "WLAN controller", - "value": 130 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "sub_vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54f0", - "value": 21744 - }, - "sub_device": { - "hex": "0244", - "value": 580 - }, - "model": "Intel WLAN controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.3", - "sysfs_bus_id": "0000:00:14.3", - "unix_device_name": "wlp0s20f3", - "unix_device_names": [ - "wlp0s20f3" - ], - "resources": [ - { - "type": "hwaddr", - "address": 99 - }, - { - "type": "irq", - "base": 16, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 412334964736, - "range": 16384, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "phwaddr", - "address": 99 - }, - { - "type": "wlan", - "channels": [ - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "13", - "36", - "40", - "44", - "48", - "52", - "56", - "60", - "64", - "100", - "104", - "108", - "112", - "116", - "120", - "124", - "128", - "132", - "136", - "140" - ], - "frequencies": [ - "2.412", - "2.417", - "2.422", - "2.427", - "2.432", - "2.437", - "2.442", - "2.447", - "2.452", - "2.457", - "2.462", - "2.467", - "2.472", - "5.18", - "5.2", - "5.22", - "5.24", - "5.26", - "5.28", - "5.3", - "5.32", - "5.5", - "5.52", - "5.54", - "5.56", - "5.58", - "5.6", - "5.62", - "5.64", - "5.66", - "5.68", - "5.7" - ], - "auth_modes": [ - "open", - "sharedkey", - "wpa-psk", - "wpa-eap" - ], - "enc_modes": [ - "WEP40", - "WEP104", - "TKIP", - "CCMP" - ] - } - ], - "detail": { - "function": 3, - "command": 1030, - "header_type": 0, - "secondary_bus": 0, - "irq": 16, - "prog_if": 0 - }, - "driver": "iwlwifi", - "driver_module": "iwlwifi", - "drivers": [ - "iwlwifi" - ], - "driver_modules": [ - "iwlwifi" - ], - "module_alias": "pci:v00008086d000054F0sv00008086sd00000244bc02sc80i00" - }, - { - "index": 16, - "attached_to": 23, - "class_list": [ - "network_controller", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 1, - "number": 0 - }, - "base_class": { - "hex": "0002", - "name": "Network controller", - "value": 2 - }, - "sub_class": { - "hex": "0000", - "name": "Ethernet controller", - "value": 0 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "sub_vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "125c", - "value": 4700 - }, - "sub_device": { - "hex": "0000", - "value": 0 - }, - "revision": { - "hex": "0004", - "value": 4 - }, - "model": "Intel Ethernet controller", - "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:01:00.0", - "sysfs_bus_id": "0000:01:00.0", - "unix_device_name": "enp1s0", - "unix_device_names": [ - "enp1s0" - ], - "resources": [ - { - "type": "hwaddr", - "address": 56 - }, - { - "type": "irq", - "base": 16, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 1950351360, - "range": 1048576, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 1951399936, - "range": 16384, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "phwaddr", - "address": 56 - } - ], - "detail": { - "function": 0, - "command": 1030, - "header_type": 0, - "secondary_bus": 0, - "irq": 16, - "prog_if": 0 - }, - "driver": "igc", - "driver_module": "igc", - "drivers": [ - "igc" - ], - "driver_modules": [ - "igc" - ], - "module_alias": "pci:v00008086d0000125Csv00008086sd00000000bc02sc00i00" - } - ], - "network_interface": [ - { - "index": 40, - "attached_to": 16, - "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/enp1s0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.0/0000:01:00.0", - "unix_device_name": "enp1s0", - "unix_device_names": [ - "enp1s0" - ], - "resources": [ - { - "type": "hwaddr", - "address": 56 - }, - { - "type": "phwaddr", - "address": 56 - } - ], - "driver": "igc", - "driver_module": "igc", - "drivers": [ - "igc" - ], - "driver_modules": [ - "igc" - ] - }, - { - "index": 42, - "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": 43, - "attached_to": 14, - "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/wlp0s20f3", - "sysfs_device_link": "/devices/pci0000:00/0000:00:14.3", - "unix_device_name": "wlp0s20f3", - "unix_device_names": [ - "wlp0s20f3" - ], - "resources": [ - { - "type": "hwaddr", - "address": 99 - }, - { - "type": "phwaddr", - "address": 99 - } - ], - "driver": "iwlwifi", - "driver_module": "iwlwifi", - "drivers": [ - "iwlwifi" - ], - "driver_modules": [ - "iwlwifi" - ] - } - ], - "pci": [ - { - "index": 13, - "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 4 - }, - "base_class": { - "hex": "0011", - "name": "Signal processing controller", - "value": 17 - }, - "sub_class": { - "hex": "0080", - "name": "Signal processing controller", - "value": 128 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "461d", - "value": 17949 - }, - "model": "Intel Signal processing controller", - "sysfs_id": "/devices/pci0000:00/0000:00:04.0", - "sysfs_bus_id": "0000:00:04.0", - "resources": [ - { - "type": "irq", - "base": 16, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 412334686208, - "range": 131072, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 6, - "header_type": 0, - "secondary_bus": 0, - "irq": 16, - "prog_if": 0 - }, - "driver": "proc_thermal_pci", - "driver_module": "processor_thermal_device_pci", - "drivers": [ - "proc_thermal_pci" - ], - "driver_modules": [ - "processor_thermal_device_pci" - ], - "module_alias": "pci:v00008086d0000461Dsv00000000sd00000000bc11sc80i00" - }, - { - "index": 15, - "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 22 - }, - "base_class": { - "hex": "0007", - "name": "Communication controller", - "value": 7 - }, - "sub_class": { - "hex": "0080", - "name": "Communication controller", - "value": 128 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54e0", - "value": 21728 - }, - "model": "Intel Communication controller", - "sysfs_id": "/devices/pci0000:00/0000:00:16.0", - "sysfs_bus_id": "0000:00:16.0", - "resources": [ - { - "type": "irq", - "base": 138, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 412335013888, - "range": 4096, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1030, - "header_type": 0, - "secondary_bus": 0, - "irq": 138, - "prog_if": 0 - }, - "driver": "mei_me", - "driver_module": "mei_me", - "drivers": [ - "mei_me" - ], - "driver_modules": [ - "mei_me" - ], - "module_alias": "pci:v00008086d000054E0sv00000000sd00000000bc07sc80i00" - }, - { - "index": 17, - "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 31 - }, - "base_class": { - "hex": "000c", - "name": "Serial bus controller", - "value": 12 - }, - "sub_class": { - "hex": "0080", - "value": 128 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54a4", - "value": 21668 - }, - "model": "Intel Serial bus controller", - "sysfs_id": "/devices/pci0000:00/0000:00:1f.5", - "sysfs_bus_id": "0000:00:1f.5", - "resources": [ - { - "type": "mem", - "base": 1953513472, - "range": 4096, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 5, - "command": 1026, - "header_type": 0, - "secondary_bus": 0, - "irq": 0, - "prog_if": 0 - }, - "driver": "intel-spi", - "driver_module": "spi_intel_pci", - "drivers": [ - "intel-spi" - ], - "driver_modules": [ - "spi_intel_pci" - ], - "module_alias": "pci:v00008086d000054A4sv00000000sd00000000bc0Csc80i00" - }, - { - "index": 18, - "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 25 - }, - "base_class": { - "hex": "000c", - "name": "Serial bus controller", - "value": 12 - }, - "sub_class": { - "hex": "0080", - "value": 128 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54c5", - "value": 21701 - }, - "model": "Intel Serial bus controller", - "sysfs_id": "/devices/pci0000:00/0000:00:19.0", - "sysfs_bus_id": "0000:00:19.0", - "resources": [ - { - "type": "irq", - "base": 31, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 275263787008, - "range": 4096, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 6, - "header_type": 0, - "secondary_bus": 0, - "irq": 31, - "prog_if": 0 - }, - "driver": "intel-lpss", - "driver_module": "intel_lpss_pci", - "drivers": [ - "intel-lpss" - ], - "driver_modules": [ - "intel_lpss_pci" - ], - "module_alias": "pci:v00008086d000054C5sv00000000sd00000000bc0Csc80i00" - }, - { - "index": 21, - "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 21 - }, - "base_class": { - "hex": "000c", - "name": "Serial bus controller", - "value": 12 - }, - "sub_class": { - "hex": "0080", - "value": 128 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54e8", - "value": 21736 - }, - "model": "Intel Serial bus controller", - "sysfs_id": "/devices/pci0000:00/0000:00:15.0", - "sysfs_bus_id": "0000:00:15.0", - "resources": [ - { - "type": "irq", - "base": 27, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 275263782912, - "range": 4096, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 6, - "header_type": 0, - "secondary_bus": 0, - "irq": 27, - "prog_if": 0 - }, - "driver": "intel-lpss", - "driver_module": "intel_lpss_pci", - "drivers": [ - "intel-lpss" - ], - "driver_modules": [ - "intel_lpss_pci" - ], - "module_alias": "pci:v00008086d000054E8sv00000000sd00000000bc0Csc80i00" - }, - { - "index": 22, - "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 26 - }, - "base_class": { - "hex": "0008", - "name": "Generic system peripheral", - "value": 8 - }, - "sub_class": { - "hex": "0005", - "value": 5 - }, - "pci_interface": { - "hex": "0001", - "value": 1 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54c4", - "value": 21700 - }, - "model": "Intel Generic system peripheral", - "sysfs_id": "/devices/pci0000:00/0000:00:1a.0", - "sysfs_bus_id": "0000:00:1a.0", - "resources": [ - { - "type": "irq", - "base": 16, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 412335001600, - "range": 4096, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 6, - "header_type": 0, - "secondary_bus": 0, - "irq": 16, - "prog_if": 1 - }, - "driver": "sdhci-pci", - "driver_module": "sdhci_pci", - "drivers": [ - "sdhci-pci" - ], - "driver_modules": [ - "sdhci_pci" - ], - "module_alias": "pci:v00008086d000054C4sv00000000sd00000000bc08sc05i01" - }, - { - "index": 24, - "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 20 - }, - "base_class": { - "hex": "0005", - "name": "Memory controller", - "value": 5 - }, - "sub_class": { - "hex": "0000", - "name": "RAM memory", - "value": 0 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54ef", - "value": 21743 - }, - "model": "Intel RAM memory", - "sysfs_id": "/devices/pci0000:00/0000:00:14.2", - "sysfs_bus_id": "0000:00:14.2", - "resources": [ - { - "type": "mem", - "base": 412334981120, - "range": 16384, - "enabled": false, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 412335022080, - "range": 4096, - "enabled": false, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 2, - "command": 0, - "header_type": 0, - "secondary_bus": 0, - "irq": 0, - "prog_if": 0 - }, - "module_alias": "pci:v00008086d000054EFsv00000000sd00000000bc05sc00i00" - }, - { - "index": 25, - "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 25 - }, - "base_class": { - "hex": "000c", - "name": "Serial bus controller", - "value": 12 - }, - "sub_class": { - "hex": "0080", - "value": 128 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54c6", - "value": 21702 - }, - "model": "Intel Serial bus controller", - "sysfs_id": "/devices/pci0000:00/0000:00:19.1", - "sysfs_bus_id": "0000:00:19.1", - "resources": [ - { - "type": "irq", - "base": 32, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 275263791104, - "range": 4096, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 1, - "command": 6, - "header_type": 0, - "secondary_bus": 0, - "irq": 32, - "prog_if": 0 - }, - "driver": "intel-lpss", - "driver_module": "intel_lpss_pci", - "drivers": [ - "intel-lpss" - ], - "driver_modules": [ - "intel_lpss_pci" - ], - "module_alias": "pci:v00008086d000054C6sv00000000sd00000000bc0Csc80i00" - }, - { - "index": 28, - "attached_to": 0, - "class_list": [ - "pci", - "unknown" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 31 - }, - "base_class": { - "hex": "000c", - "name": "Serial bus controller", - "value": 12 - }, - "sub_class": { - "hex": "0005", - "name": "SMBus", - "value": 5 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54a3", - "value": 21667 - }, - "model": "Intel SMBus", - "sysfs_id": "/devices/pci0000:00/0000:00:1f.4", - "sysfs_bus_id": "0000:00:1f.4", - "resources": [ - { - "type": "io", - "base": 61344, - "range": 32, - "enabled": true, - "access": "read_write" - }, - { - "type": "irq", - "base": 16, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 412334997504, - "range": 256, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 4, - "command": 3, - "header_type": 0, - "secondary_bus": 0, - "irq": 16, - "prog_if": 0 - }, - "driver": "i801_smbus", - "driver_module": "i2c_i801", - "drivers": [ - "i801_smbus" - ], - "driver_modules": [ - "i2c_i801" - ], - "module_alias": "pci:v00008086d000054A3sv00000000sd00000000bc0Csc05i00" - } - ], - "sound": [ - { - "index": 19, - "attached_to": 0, - "class_list": [ - "sound", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 31 - }, - "base_class": { - "hex": "0004", - "name": "Multimedia controller", - "value": 4 - }, - "sub_class": { - "hex": "0001", - "name": "Multimedia audio controller", - "value": 1 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "sub_vendor": { - "hex": "14f1", - "value": 5361 - }, - "device": { - "hex": "54c8", - "value": 21704 - }, - "sub_device": { - "hex": "035e", - "value": 862 - }, - "model": "Intel Multimedia audio controller", - "sysfs_id": "/devices/pci0000:00/0000:00:1f.3", - "sysfs_bus_id": "0000:00:1f.3", - "resources": [ - { - "type": "irq", - "base": 151, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 412333637632, - "range": 1048576, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 412334948352, - "range": 16384, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 3, - "command": 1030, - "header_type": 0, - "secondary_bus": 0, - "irq": 151, - "prog_if": 0 - }, - "driver": "snd_hda_intel", - "driver_module": "snd_hda_intel", - "drivers": [ - "snd_hda_intel" - ], - "driver_modules": [ - "snd_hda_intel" - ], - "module_alias": "pci:v00008086d000054C8sv000014F1sd0000035Ebc04sc01i00" - } - ], - "storage_controller": [ - { - "index": 8, - "attached_to": 0, - "class_list": [ - "storage_controller", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 23 - }, - "base_class": { - "hex": "0001", - "name": "Mass storage controller", - "value": 1 - }, - "sub_class": { - "hex": "0006", - "value": 6 - }, - "pci_interface": { - "hex": "0001", - "value": 1 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54d3", - "value": 21715 - }, - "model": "Intel Mass storage controller", - "sysfs_id": "/devices/pci0000:00/0000:00:17.0", - "sysfs_bus_id": "0000:00:17.0", - "resources": [ - { - "type": "io", - "base": 12384, - "range": 32, - "enabled": true, - "access": "read_write" - }, - { - "type": "io", - "base": 12416, - "range": 4, - "enabled": true, - "access": "read_write" - }, - { - "type": "io", - "base": 12432, - "range": 8, - "enabled": true, - "access": "read_write" - }, - { - "type": "irq", - "base": 137, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 1953497088, - "range": 8192, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 1953505280, - "range": 2048, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 1953509376, - "range": 256, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1031, - "header_type": 0, - "secondary_bus": 0, - "irq": 137, - "prog_if": 1 - }, - "driver": "ahci", - "driver_module": "ahci", - "drivers": [ - "ahci" - ], - "driver_modules": [ - "ahci" - ], - "module_alias": "pci:v00008086d000054D3sv00000000sd00000000bc01sc06i01" - }, - { - "index": 12, - "attached_to": 10, - "class_list": [ - "storage_controller", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 2, - "number": 0 - }, - "base_class": { - "hex": "0001", - "name": "Mass storage controller", - "value": 1 - }, - "sub_class": { - "hex": "0008", - "value": 8 - }, - "pci_interface": { - "hex": "0002", - "value": 2 - }, - "vendor": { - "hex": "1e4b", - "value": 7755 - }, - "sub_vendor": { - "hex": "1e4b", - "value": 7755 - }, - "device": { - "hex": "1202", - "value": 4610 - }, - "sub_device": { - "hex": "1202", - "value": 4610 - }, - "revision": { - "hex": "0001", - "value": 1 - }, - "model": "Mass storage controller", - "sysfs_id": "/devices/pci0000:00/0000:00:1d.3/0000:02:00.0", - "sysfs_bus_id": "0000:02:00.0", - "resources": [ - { - "type": "irq", - "base": 19, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 1952448512, - "range": 16384, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1030, - "header_type": 0, - "secondary_bus": 0, - "irq": 19, - "prog_if": 2 - }, - "driver": "nvme", - "driver_module": "nvme", - "drivers": [ - "nvme" - ], - "driver_modules": [ - "nvme" - ], - "module_alias": "pci:v00001E4Bd00001202sv00001E4Bsd00001202bc01sc08i02" - } - ], - "system": { - "form_factor": "desktop" - }, - "usb_controller": [ - { - "index": 9, - "attached_to": 0, - "class_list": [ - "usb_controller", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 13 - }, - "base_class": { - "hex": "000c", - "name": "Serial bus controller", - "value": 12 - }, - "sub_class": { - "hex": "0003", - "name": "USB Controller", - "value": 3 - }, - "pci_interface": { - "hex": "0030", - "value": 48 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "464e", - "value": 17998 - }, - "model": "Intel USB Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:0d.0", - "sysfs_bus_id": "0000:00:0d.0", - "resources": [ - { - "type": "irq", - "base": 122, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 412334882816, - "range": 65536, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1026, - "header_type": 0, - "secondary_bus": 0, - "irq": 122, - "prog_if": 48 - }, - "driver": "xhci_hcd", - "driver_module": "xhci_pci", - "drivers": [ - "xhci_hcd" - ], - "driver_modules": [ - "xhci_pci" - ], - "module_alias": "pci:v00008086d0000464Esv00000000sd00000000bc0Csc03i30" - }, - { - "index": 27, - "attached_to": 0, - "class_list": [ - "usb_controller", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 20 - }, - "base_class": { - "hex": "000c", - "name": "Serial bus controller", - "value": 12 - }, - "sub_class": { - "hex": "0003", - "name": "USB Controller", - "value": 3 - }, - "pci_interface": { - "hex": "0030", - "value": 48 - }, - "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "device": { - "hex": "54ed", - "value": 21741 - }, - "model": "Intel USB Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0", - "sysfs_bus_id": "0000:00:14.0", - "resources": [ - { - "type": "irq", - "base": 128, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 412334817280, - "range": 65536, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1030, - "header_type": 0, - "secondary_bus": 0, - "irq": 128, - "prog_if": 48 - }, - "driver": "xhci_hcd", - "driver_module": "xhci_pci", - "drivers": [ - "xhci_hcd" - ], - "driver_modules": [ - "xhci_pci" - ], - "module_alias": "pci:v00008086d000054EDsv00000000sd00000000bc0Csc03i30" - } - ] - }, - "smbios": { - "bios": { - "handle": 0, - "vendor": "American Megatrends International, LLC.", - "version": "DNB20 V0.07", - "date": "07/31/2024", - "features": [ - "PCI supported", - "BIOS flashable", - "BIOS shadowing allowed", - "CD boot supported", - "Selectable boot supported", - "BIOS ROM socketed", - "EDD spec supported", - "1.2MB NEC 9800 Japanese Floppy supported", - "1.2MB Toshiba Japanese Floppy supported", - "360kB Floppy supported", - "1.2MB Floppy supported", - "720kB Floppy supported", - "2.88MB Floppy supported", - "Print Screen supported", - "8042 Keyboard Services supported", - "Serial Services supported", - "Printer Services supported", - "CGA/Mono Video supported", - "ACPI supported", - "USB Legacy supported", - "BIOS Boot Spec supported" - ], - "start_address": "0xf0000", - "rom_size": 16777216 - }, - "board": { - "handle": 2, - "manufacturer": "Shenzhen Meigao Electronic Equipment Co..Ltd", - "product": "DNBOE", - "version": "Default string", - "board_type": { - "hex": "000a", - "name": "Motherboard", - "value": 10 - }, - "features": [ - "Hosting Board", - "Replaceable" - ], - "location": "Default string", - "chassis": 3 - }, - "cache": [ - { - "handle": 10, - "socket": "L1 Cache", - "size_max": 128, - "size_current": 128, - "speed": 0, - "mode": { - "hex": "0001", - "name": "Write Back", - "value": 1 - }, - "enabled": true, - "location": { - "hex": "0000", - "name": "Internal", - "value": 0 - }, - "socketed": false, - "level": 0, - "ecc": { - "hex": "0004", - "name": "Parity", - "value": 4 - }, - "cache_type": { - "hex": "0004", - "name": "Data", - "value": 4 - }, - "associativity": { - "hex": "0007", - "name": "8-way Set-Associative", - "value": 7 - }, - "sram_type_current": [ - "Synchronous" - ], - "sram_type_supported": [ - "Synchronous" - ] - }, - { - "handle": 11, - "socket": "L1 Cache", - "size_max": 256, - "size_current": 256, - "speed": 0, - "mode": { - "hex": "0001", - "name": "Write Back", - "value": 1 - }, - "enabled": true, - "location": { - "hex": "0000", - "name": "Internal", - "value": 0 - }, - "socketed": false, - "level": 0, - "ecc": { - "hex": "0004", - "name": "Parity", - "value": 4 - }, - "cache_type": { - "hex": "0003", - "name": "Instruction", - "value": 3 - }, - "associativity": { - "hex": "0007", - "name": "8-way Set-Associative", - "value": 7 - }, - "sram_type_current": [ - "Synchronous" - ], - "sram_type_supported": [ - "Synchronous" - ] - }, - { - "handle": 12, - "socket": "L2 Cache", - "size_max": 2048, - "size_current": 2048, - "speed": 0, - "mode": { - "hex": "0001", - "name": "Write Back", - "value": 1 - }, - "enabled": true, - "location": { - "hex": "0000", - "name": "Internal", - "value": 0 - }, - "socketed": false, - "level": 1, - "ecc": { - "hex": "0005", - "name": "Single-bit", - "value": 5 - }, - "cache_type": { - "hex": "0005", - "name": "Unified", - "value": 5 - }, - "associativity": { - "hex": "0008", - "name": "16-way Set-Associative", - "value": 8 - }, - "sram_type_current": [ - "Synchronous" - ], - "sram_type_supported": [ - "Synchronous" - ] - }, - { - "handle": 13, - "socket": "L3 Cache", - "size_max": 6144, - "size_current": 6144, - "speed": 0, - "mode": { - "hex": "0001", - "name": "Write Back", - "value": 1 - }, - "enabled": true, - "location": { - "hex": "0000", - "name": "Internal", - "value": 0 - }, - "socketed": false, - "level": 2, - "ecc": { - "hex": "0006", - "name": "Multi-bit", - "value": 6 - }, - "cache_type": { - "hex": "0005", - "name": "Unified", - "value": 5 - }, - "associativity": { - "hex": "0009", - "name": "Other", - "value": 9 - }, - "sram_type_current": [ - "Synchronous" - ], - "sram_type_supported": [ - "Synchronous" - ] - } - ], - "chassis": [ - { - "handle": 3, - "manufacturer": "Default string", - "version": "Default string", - "chassis_type": { - "hex": "0023", - "name": "Other", - "value": 35 - }, - "lock_present": false, - "bootup_state": { - "hex": "0003", - "name": "Safe", - "value": 3 - }, - "power_state": { - "hex": "0003", - "name": "Safe", - "value": 3 - }, - "thermal_state": { - "hex": "0003", - "name": "Safe", - "value": 3 - }, - "security_state": { - "hex": "0003", - "name": "None", - "value": 3 - }, - "oem": "0x0" - } - ], - "memory_array": [ - { - "handle": 5, - "location": { - "hex": "0003", - "name": "Motherboard", - "value": 3 - }, - "usage": { - "hex": "0003", - "name": "System memory", - "value": 3 - }, - "ecc": { - "hex": "0003", - "name": "None", - "value": 3 - }, - "max_size": "0x4000000", - "error_handle": 65534, - "slots": 2 - } - ], - "memory_array_mapped_address": [ - { - "handle": 8, - "array_handle": 5, - "start_address": "0x0", - "end_address": "0x400000000", - "part_width": 1 - } - ], - "memory_device": [ - { - "handle": 6, - "location": "Controller0-ChannelA-DIMM0", - "bank_location": "BANK 0", - "manufacturer": "0x0000", - "part_number": "DDR4 NB 16GB 3200MHZ", - "array_handle": 5, - "error_handle": 65534, - "width": 64, - "ecc_bits": 0, - "size": 16777216, - "form_factor": { - "hex": "000d", - "name": "SODIMM", - "value": 13 - }, - "set": 0, - "memory_type": { - "hex": "001a", - "name": "Other", - "value": 26 - }, - "memory_type_details": [ - "Synchronous" - ], - "speed": 3200 - }, - { - "handle": 7, - "location": "Controller1-ChannelA-DIMM0", - "bank_location": "BANK 0", - "manufacturer": "", - "part_number": "", - "array_handle": 5, - "error_handle": 65534, - "width": 0, - "ecc_bits": 0, - "size": 0, - "form_factor": { - "hex": "0002", - "name": "Unknown", - "value": 2 - }, - "set": 0, - "memory_type": { - "hex": "0002", - "name": "Unknown", - "value": 2 - }, - "memory_type_details": null, - "speed": 0 - } - ], - "memory_device_mapped_address": [ - { - "handle": 9, - "memory_device_handle": 6, - "array_map_handle": 8, - "start_address": "0x0", - "end_address": "0x400000000", - "row_position": 255, - "interleave_position": 0, - "interleave_depth": 0 - } - ], - "processor": [ - { - "handle": 14, - "socket": "U3E1", - "socket_type": { - "hex": "0001", - "name": "Other", - "value": 1 - }, - "socket_populated": true, - "manufacturer": "Intel(R) Corporation", - "version": "Intel(R) N100", - "part": "To Be Filled By O.E.M.", - "processor_type": { - "hex": "0003", - "name": "CPU", - "value": 3 - }, - "processor_family": { - "hex": "0001", - "name": "Other", - "value": 1 - }, - "processor_status": { - "hex": "0001", - "name": "Enabled", - "value": 1 - }, - "clock_ext": 100, - "clock_max": 3400, - "cache_handle_l1": 11, - "cache_handle_l2": 12, - "cache_handle_l3": 13 - } - ], - "system": { - "handle": 1, - "manufacturer": "Micro Computer (HK) Tech Limited", - "product": "DeskMini Series", - "version": "Default string", - "wake_up": { - "hex": "0006", - "name": "Power Switch", - "value": 6 - } - } - } -} diff --git a/machines/sue/configuration.nix b/machines/sue/configuration.nix new file mode 100644 index 0000000..70c4391 --- /dev/null +++ b/machines/sue/configuration.nix @@ -0,0 +1,97 @@ +{ + self, + pkgs, + lib, + inputs, + config, + ... +}: { + options = { + pim.cosmic.enable = lib.mkEnableOption "cosmic"; + }; + + config = { + pim = { + lanzaboote.enable = true; + tidal.enable = true; + gnome.enable = true; + stylix.enable = true; + wireguard.enable = true; + compliance.enable = true; + sops-nix.usersWithSopsKeys = ["pim"]; + }; + + users.users.pim = { + isNormalUser = true; + extraGroups = ["wheel" "docker" "input" "wireshark" "dialout"]; + }; + + deployment = { + allowLocalDeployment = true; + targetHost = null; + tags = ["desktop"]; + }; + + facter.reportPath = ./facter.json; + home-manager.users.pim.imports = [./pim.home.nix]; + nix.settings.trusted-users = ["pim"]; + system.stateVersion = "23.05"; + sops.defaultSopsFile = "${self}/secrets/sue/nixos.yaml"; + + environment.systemPackages = with pkgs; [ + borgbackup + kubectl + nmap + poppler_utils # For pdfunite + silicon + units + ]; + + virtualisation = { + libvirtd.enable = true; + + docker = { + enable = true; + + rootless = { + enable = true; + setSocketVariable = true; + }; + }; + }; + + swapDevices = [{device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b";}]; + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a"; + fsType = "ext4"; + }; + + "/boot" = { + device = "/dev/disk/by-uuid/560E-F8A2"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; + }; + + nix.settings = { + substituters = ["https://cosmic.cachix.org/"]; + trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; + }; + + boot.initrd.luks.devices."luks-8ffd3129-4908-4209-98c4-4eb68a35c494".device = "/dev/disk/by-uuid/8ffd3129-4908-4209-98c4-4eb68a35c494"; + + specialisation.cosmic = lib.mkIf config.pim.cosmic.enable { + configuration = { + imports = [ + inputs.nixos-cosmic.nixosModules.default + ]; + + services = { + desktopManager.cosmic.enable = true; + displayManager.cosmic-greeter.enable = true; + }; + }; + }; + }; +} diff --git a/machines/blocktech/facter.json b/machines/sue/facter.json similarity index 58% rename from machines/blocktech/facter.json rename to machines/sue/facter.json index f57a0e4..88fbc2b 100644 --- a/machines/blocktech/facter.json +++ b/machines/sue/facter.json @@ -19,12 +19,12 @@ "pnp_id": 0, "lba_support": false, "low_memory_size": 0, - "smbios_version": 774 + "smbios_version": 772 }, "bluetooth": [ { - "index": 62, - "attached_to": 61, + "index": 57, + "attached_to": 69, "class_list": [ "usb", "bluetooth" @@ -48,12 +48,12 @@ "value": 32903 }, "device": { - "hex": "0036", - "value": 54 + "hex": "0033", + "value": 51 }, "model": "Bluetooth Device", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.0", - "sysfs_bus_id": "3-10:1.0", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-10/1-10:1.0", + "sysfs_bus_id": "1-10:1.0", "resources": [ { "type": "baud", @@ -99,11 +99,11 @@ "driver_modules": [ "btusb" ], - "module_alias": "usb:v8087p0036d0000dcE0dsc01dp01icE0isc01ip01in00" + "module_alias": "usb:v8087p0033d0000dcE0dsc01dp01icE0isc01ip01in00" }, { "index": 68, - "attached_to": 61, + "attached_to": 69, "class_list": [ "usb", "bluetooth" @@ -127,12 +127,12 @@ "value": 32903 }, "device": { - "hex": "0036", - "value": 54 + "hex": "0033", + "value": 51 }, "model": "Bluetooth Device", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.1", - "sysfs_bus_id": "3-10:1.1", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-10/1-10:1.1", + "sysfs_bus_id": "1-10:1.1", "resources": [ { "type": "baud", @@ -178,13 +178,13 @@ "driver_modules": [ "btusb" ], - "module_alias": "usb:v8087p0036d0000dcE0dsc01dp01icE0isc01ip01in01" + "module_alias": "usb:v8087p0033d0000dcE0dsc01dp01icE0isc01ip01in01" } ], "bridge": [ { - "index": 26, - "attached_to": 0, + "index": 19, + "attached_to": 35, "class_list": [ "pci", "bridge" @@ -195,8 +195,8 @@ "value": 4 }, "slot": { - "bus": 0, - "number": 28 + "bus": 83, + "number": 1 }, "base_class": { "hex": "0006", @@ -219,53 +219,50 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 }, "device": { - "hex": "7e38", - "value": 32312 + "hex": "0b26", + "value": 2854 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0000", + "value": 0 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0003", + "value": 3 }, "model": "Intel PCI bridge", - "sysfs_id": "/devices/pci0000:00/0000:00:1c.0", - "sysfs_bus_id": "0000:00:1c.0", - "sysfs_iommu_group_id": 16, + "sysfs_id": "/devices/pci0000:00/0000:00:07.1/0000:52:00.0/0000:53:01.0", + "sysfs_bus_id": "0000:53:01.0", + "sysfs_iommu_group_id": 19, "resources": [ { "type": "irq", - "base": 127, + "base": 196, "triggered": 0, "enabled": true } ], "detail": { "function": 0, - "command": 1287, + "command": 1031, "header_type": 1, - "secondary_bus": 10, - "irq": 127, + "secondary_bus": 85, + "irq": 196, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], - "module_alias": "pci:v00008086d00007E38sv000017AAsd00002234bc06sc04i00" + "module_alias": "pci:v00008086d00000B26sv00008086sd00000000bc06sc04i00" }, { - "index": 31, + "index": 20, "attached_to": 0, "class_list": [ "pci", @@ -296,25 +293,25 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e02", - "value": 32258 + "hex": "5187", + "value": 20871 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, "model": "Intel ISA bridge", "sysfs_id": "/devices/pci0000:00/0000:00:1f.0", "sysfs_bus_id": "0000:00:1f.0", - "sysfs_iommu_group_id": 18, + "sysfs_iommu_group_id": 16, "detail": { "function": 0, "command": 1031, @@ -323,11 +320,11 @@ "irq": 0, "prog_if": 0 }, - "module_alias": "pci:v00008086d00007E02sv000017AAsd00002234bc06sc01i00" + "module_alias": "pci:v00008086d00005187sv00001028sd00000B14bc06sc01i00" }, { - "index": 32, - "attached_to": 0, + "index": 21, + "attached_to": 35, "class_list": [ "pci", "bridge" @@ -338,8 +335,8 @@ "value": 4 }, "slot": { - "bus": 0, - "number": 1 + "bus": 83, + "number": 4 }, "base_class": { "hex": "0006", @@ -362,53 +359,50 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 }, "device": { - "hex": "7ecc", - "value": 32460 + "hex": "0b26", + "value": 2854 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0000", + "value": 0 }, "revision": { - "hex": "0010", - "value": 16 + "hex": "0003", + "value": 3 }, "model": "Intel PCI bridge", - "sysfs_id": "/devices/pci0000:00/0000:00:01.0", - "sysfs_bus_id": "0000:00:01.0", - "sysfs_iommu_group_id": 2, + "sysfs_id": "/devices/pci0000:00/0000:00:07.1/0000:52:00.0/0000:53:04.0", + "sysfs_bus_id": "0000:53:04.0", + "sysfs_iommu_group_id": 22, "resources": [ { "type": "irq", - "base": 122, + "base": 199, "triggered": 0, "enabled": true } ], "detail": { "function": 0, - "command": 1287, + "command": 1031, "header_type": 1, - "secondary_bus": 1, - "irq": 122, + "secondary_bus": 162, + "irq": 199, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], - "module_alias": "pci:v00008086d00007ECCsv000017AAsd00002234bc06sc04i00" + "module_alias": "pci:v00008086d00000B26sv00008086sd00000000bc06sc04i00" }, { - "index": 33, + "index": 22, "attached_to": 0, "class_list": [ "pci", @@ -420,8 +414,8 @@ "value": 4 }, "slot": { - "bus": 0, - "number": 28 + "bus": 224, + "number": 6 }, "base_class": { "hex": "0006", @@ -444,53 +438,49 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e3f", - "value": 32319 + "hex": "464d", + "value": 17997 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0006", + "value": 6 }, "model": "Intel PCI bridge", - "sysfs_id": "/devices/pci0000:00/0000:00:1c.7", - "sysfs_bus_id": "0000:00:1c.7", - "sysfs_iommu_group_id": 17, + "sysfs_id": "/devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0", + "sysfs_bus_id": "10000:e0:06.0", + "sysfs_iommu_group_id": 9, "resources": [ { "type": "irq", - "base": 128, + "base": 162, "triggered": 0, "enabled": true } ], "detail": { - "function": 7, - "command": 1287, + "function": 0, + "command": 1286, "header_type": 1, - "secondary_bus": 9, - "irq": 128, + "secondary_bus": 225, + "irq": 162, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], - "module_alias": "pci:v00008086d00007E3Fsv000017AAsd00002234bc06sc04i00" + "module_alias": "pci:v00008086d0000464Dsv00001028sd00000B14bc06sc04i00" }, { - "index": 38, + "index": 27, "attached_to": 0, "class_list": [ "pci", @@ -526,29 +516,29 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7ec4", - "value": 32452 + "hex": "466e", + "value": 18030 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0002", - "value": 2 + "hex": "0006", + "value": 6 }, "model": "Intel PCI bridge", "sysfs_id": "/devices/pci0000:00/0000:00:07.0", "sysfs_bus_id": "0000:00:07.0", - "sysfs_iommu_group_id": 6, + "sysfs_iommu_group_id": 5, "resources": [ { "type": "irq", - "base": 125, + "base": 123, "triggered": 0, "enabled": true } @@ -557,22 +547,97 @@ "function": 0, "command": 1031, "header_type": 1, - "secondary_bus": 32, - "irq": 125, + "secondary_bus": 1, + "irq": 123, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], - "module_alias": "pci:v00008086d00007EC4sv000017AAsd00002234bc06sc04i00" + "module_alias": "pci:v00008086d0000466Esv00001028sd00000B14bc06sc04i00" }, { - "index": 42, + "index": 29, + "attached_to": 35, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 83, + "number": 0 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "0b26", + "value": 2854 + }, + "sub_device": { + "hex": "0000", + "value": 0 + }, + "revision": { + "hex": "0003", + "value": 3 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:07.1/0000:52:00.0/0000:53:00.0", + "sysfs_bus_id": "0000:53:00.0", + "sysfs_iommu_group_id": 18, + "resources": [ + { + "type": "irq", + "base": 195, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 1, + "secondary_bus": 84, + "irq": 195, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00008086d00000B26sv00008086sd00000000bc06sc04i00" + }, + { + "index": 32, "attached_to": 0, "class_list": [ "pci", @@ -603,25 +668,25 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7d01", - "value": 32001 + "hex": "4602", + "value": 17922 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0004", - "value": 4 + "hex": "0006", + "value": 6 }, "model": "Intel Host bridge", "sysfs_id": "/devices/pci0000:00/0000:00:00.0", "sysfs_bus_id": "0000:00:00.0", - "sysfs_iommu_group_id": 1, + "sysfs_iommu_group_id": 2, "detail": { "function": 0, "command": 6, @@ -638,11 +703,11 @@ "driver_modules": [ "igen6_edac" ], - "module_alias": "pci:v00008086d00007D01sv000017AAsd00002234bc06sc00i00" + "module_alias": "pci:v00008086d00004602sv00001028sd00000B14bc06sc00i00" }, { - "index": 43, - "attached_to": 0, + "index": 33, + "attached_to": 35, "class_list": [ "pci", "bridge" @@ -653,8 +718,8 @@ "value": 4 }, "slot": { - "bus": 0, - "number": 6 + "bus": 83, + "number": 3 }, "base_class": { "hex": "0006", @@ -677,135 +742,208 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 - }, - "device": { - "hex": "7ecb", - "value": 32459 - }, - "sub_device": { - "hex": "2234", - "value": 8756 - }, - "revision": { - "hex": "0010", - "value": 16 - }, - "model": "Intel PCI bridge", - "sysfs_id": "/devices/pci0000:00/0000:00:06.2", - "sysfs_bus_id": "0000:00:06.2", - "sysfs_iommu_group_id": 5, - "resources": [ - { - "type": "irq", - "base": 124, - "triggered": 0, - "enabled": true - } - ], - "detail": { - "function": 2, - "command": 1287, - "header_type": 1, - "secondary_bus": 5, - "irq": 124, - "prog_if": 0 - }, - "driver": "pcieport", - "driver_module": "pcieportdrv", - "drivers": [ - "pcieport" - ], - "driver_modules": [ - "pcieportdrv" - ], - "module_alias": "pci:v00008086d00007ECBsv000017AAsd00002234bc06sc04i00" - }, - { - "index": 45, - "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 0, - "number": 6 - }, - "base_class": { - "hex": "0006", - "name": "Bridge", - "value": 6 - }, - "sub_class": { - "hex": "0004", - "name": "PCI bridge", - "value": 4 - }, - "pci_interface": { - "hex": "0000", - "name": "Normal decode", - "value": 0 - }, - "vendor": { "hex": "8086", "name": "Intel Corporation", "value": 32902 }, - "sub_vendor": { - "hex": "17aa", - "value": 6058 - }, "device": { - "hex": "7e4d", - "value": 32333 + "hex": "0b26", + "value": 2854 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0000", + "value": 0 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0003", + "value": 3 }, "model": "Intel PCI bridge", - "sysfs_id": "/devices/pci0000:00/0000:00:06.0", - "sysfs_bus_id": "0000:00:06.0", - "sysfs_iommu_group_id": 4, + "sysfs_id": "/devices/pci0000:00/0000:00:07.1/0000:52:00.0/0000:53:03.0", + "sysfs_bus_id": "0000:53:03.0", + "sysfs_iommu_group_id": 21, "resources": [ { "type": "irq", - "base": 123, + "base": 198, "triggered": 0, "enabled": true } ], "detail": { "function": 0, - "command": 1287, + "command": 1031, "header_type": 1, - "secondary_bus": 4, - "irq": 123, + "secondary_bus": 137, + "irq": 198, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], - "module_alias": "pci:v00008086d00007E4Dsv000017AAsd00002234bc06sc04i00" + "module_alias": "pci:v00008086d00000B26sv00008086sd00000000bc06sc04i00" }, { - "index": 48, + "index": 35, + "attached_to": 41, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 82, + "number": 0 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "0b26", + "value": 2854 + }, + "sub_device": { + "hex": "0000", + "value": 0 + }, + "revision": { + "hex": "0003", + "value": 3 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:07.1/0000:52:00.0", + "sysfs_bus_id": "0000:52:00.0", + "sysfs_iommu_group_id": 17, + "resources": [ + { + "type": "irq", + "base": 16, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 0, + "command": 7, + "header_type": 1, + "secondary_bus": 83, + "irq": 16, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00008086d00000B26sv00008086sd00000000bc06sc04i00" + }, + { + "index": 40, + "attached_to": 35, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 83, + "number": 2 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "0b26", + "value": 2854 + }, + "sub_device": { + "hex": "0000", + "value": 0 + }, + "revision": { + "hex": "0003", + "value": 3 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:07.1/0000:52:00.0/0000:53:02.0", + "sysfs_bus_id": "0000:53:02.0", + "sysfs_iommu_group_id": 20, + "resources": [ + { + "type": "irq", + "base": 197, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 1, + "secondary_bus": 111, + "irq": 197, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00008086d00000B26sv00008086sd00000000bc06sc04i00" + }, + { + "index": 41, "attached_to": 0, "class_list": [ "pci", @@ -841,29 +979,29 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7ec5", - "value": 32453 + "hex": "463f", + "value": 17983 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0002", - "value": 2 + "hex": "0006", + "value": 6 }, "model": "Intel PCI bridge", "sysfs_id": "/devices/pci0000:00/0000:00:07.1", "sysfs_bus_id": "0000:00:07.1", - "sysfs_iommu_group_id": 7, + "sysfs_iommu_group_id": 6, "resources": [ { "type": "irq", - "base": 126, + "base": 124, "triggered": 0, "enabled": true } @@ -872,24 +1010,20 @@ "function": 1, "command": 1031, "header_type": 1, - "secondary_bus": 80, - "irq": 126, + "secondary_bus": 82, + "irq": 124, "prog_if": 0 }, "driver": "pcieport", - "driver_module": "pcieportdrv", "drivers": [ "pcieport" ], - "driver_modules": [ - "pcieportdrv" - ], - "module_alias": "pci:v00008086d00007EC5sv000017AAsd00002234bc06sc04i00" + "module_alias": "pci:v00008086d0000463Fsv00001028sd00000B14bc06sc04i00" } ], "camera": [ { - "index": 59, + "index": 56, "attached_to": 61, "class_list": [ "camera", @@ -910,126 +1044,24 @@ "value": 271 }, "vendor": { - "hex": "30c9", - "name": "8SSC21K64624V1SR49K25RW", - "value": 12489 + "hex": "046d", + "name": "Logitech Inc.", + "value": 1133 }, "device": { - "hex": "00cd", - "name": "Integrated Camera", - "value": 205 + "hex": "08e5", + "name": "HD Pro Webcam C920", + "value": 2277 }, "revision": { "hex": "0000", - "name": "10.08", + "name": "0.21", "value": 0 }, - "serial": "0001", - "model": "8SSC21K64624V1SR49K25RW Integrated Camera", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-9/3-9:1.1", - "sysfs_bus_id": "3-9:1.1", - "resources": [ - { - "type": "baud", - "speed": 480000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "00ef", - "name": "miscellaneous", - "value": 239 - }, - "device_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "device_protocol": 1, - "interface_class": { - "hex": "000e", - "name": "video", - "value": 14 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 1, - "interface_number": 1, - "interface_alternate_setting": 0, - "interface_association": { - "function_class": { - "hex": "000e", - "name": "video", - "value": 14 - }, - "function_subclass": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "function_protocol": 0, - "interface_count": 2, - "first_interface": 0 - } - }, - "hotplug": "usb", - "driver": "uvcvideo", - "driver_module": "uvcvideo", - "drivers": [ - "uvcvideo" - ], - "driver_modules": [ - "uvcvideo" - ], - "module_alias": "usb:v30C9p00CDd1008dcEFdsc02dp01ic0Eisc02ip01in01" - }, - { - "index": 64, - "attached_to": 61, - "class_list": [ - "camera", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "010f", - "name": "Camera", - "value": 271 - }, - "vendor": { - "hex": "30c9", - "name": "8SSC21K64624V1SR49K25RW", - "value": 12489 - }, - "device": { - "hex": "00cd", - "name": "Integrated Camera", - "value": 205 - }, - "revision": { - "hex": "0000", - "name": "10.08", - "value": 0 - }, - "serial": "0001", - "model": "8SSC21K64624V1SR49K25RW Integrated Camera", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-9/3-9:1.2", - "sysfs_bus_id": "3-9:1.2", + "serial": "604B96BF", + "model": "Logitech HD Pro Webcam C920", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1.3/1-6.1.3.1/1-6.1.3.1:1.0", + "sysfs_bus_id": "1-6.1.3.1:1.0", "resources": [ { "type": "baud", @@ -1062,109 +1094,7 @@ "name": "audio", "value": 1 }, - "interface_protocol": 1, - "interface_number": 2, - "interface_alternate_setting": 0, - "interface_association": { - "function_class": { - "hex": "000e", - "name": "video", - "value": 14 - }, - "function_subclass": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "function_protocol": 0, - "interface_count": 2, - "first_interface": 2 - } - }, - "hotplug": "usb", - "driver": "uvcvideo", - "driver_module": "uvcvideo", - "drivers": [ - "uvcvideo" - ], - "driver_modules": [ - "uvcvideo" - ], - "module_alias": "usb:v30C9p00CDd1008dcEFdsc02dp01ic0Eisc01ip01in02" - }, - { - "index": 66, - "attached_to": 61, - "class_list": [ - "camera", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "010f", - "name": "Camera", - "value": 271 - }, - "vendor": { - "hex": "30c9", - "name": "8SSC21K64624V1SR49K25RW", - "value": 12489 - }, - "device": { - "hex": "00cd", - "name": "Integrated Camera", - "value": 205 - }, - "revision": { - "hex": "0000", - "name": "10.08", - "value": 0 - }, - "serial": "0001", - "model": "8SSC21K64624V1SR49K25RW Integrated Camera", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-9/3-9:1.0", - "sysfs_bus_id": "3-9:1.0", - "resources": [ - { - "type": "baud", - "speed": 480000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "00ef", - "name": "miscellaneous", - "value": 239 - }, - "device_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "device_protocol": 1, - "interface_class": { - "hex": "000e", - "name": "video", - "value": 14 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 1, + "interface_protocol": 0, "interface_number": 0, "interface_alternate_setting": 0, "interface_association": { @@ -1192,10 +1122,10 @@ "driver_modules": [ "uvcvideo" ], - "module_alias": "usb:v30C9p00CDd1008dcEFdsc02dp01ic0Eisc01ip01in00" + "module_alias": "usb:v046Dp08E5d0021dcEFdsc02dp01ic0Eisc01ip00in00" }, { - "index": 69, + "index": 67, "attached_to": 61, "class_list": [ "camera", @@ -1216,24 +1146,24 @@ "value": 271 }, "vendor": { - "hex": "30c9", - "name": "8SSC21K64624V1SR49K25RW", - "value": 12489 + "hex": "046d", + "name": "Logitech Inc.", + "value": 1133 }, "device": { - "hex": "00cd", - "name": "Integrated Camera", - "value": 205 + "hex": "08e5", + "name": "HD Pro Webcam C920", + "value": 2277 }, "revision": { "hex": "0000", - "name": "10.08", + "name": "0.21", "value": 0 }, - "serial": "0001", - "model": "8SSC21K64624V1SR49K25RW Integrated Camera", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-9/3-9:1.3", - "sysfs_bus_id": "3-9:1.3", + "serial": "604B96BF", + "model": "Logitech HD Pro Webcam C920", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1.3/1-6.1.3.1/1-6.1.3.1:1.1", + "sysfs_bus_id": "1-6.1.3.1:1.1", "resources": [ { "type": "baud", @@ -1266,8 +1196,8 @@ "name": "comm", "value": 2 }, - "interface_protocol": 1, - "interface_number": 3, + "interface_protocol": 0, + "interface_number": 1, "interface_alternate_setting": 0, "interface_association": { "function_class": { @@ -1282,7 +1212,7 @@ }, "function_protocol": 0, "interface_count": 2, - "first_interface": 2 + "first_interface": 0 } }, "hotplug": "usb", @@ -1294,16 +1224,15 @@ "driver_modules": [ "uvcvideo" ], - "module_alias": "usb:v30C9p00CDd1008dcEFdsc02dp01ic0Eisc02ip01in03" + "module_alias": "usb:v046Dp08E5d0021dcEFdsc02dp01ic0Eisc02ip00in01" } ], "cpu": [ { "architecture": "x86_64", "vendor_name": "GenuineIntel", - "model_name": "Intel(R) Core(TM) Ultra 7 155H", "family": 6, - "model": 170, + "model": 154, "stepping": 4, "features": [ "fpu", @@ -1366,7 +1295,6 @@ "cx16", "xtpr", "pdcm", - "pcid", "sse4_1", "sse4_2", "x2apic", @@ -1435,7 +1363,6 @@ "vaes", "vpclmulqdq", "rdpid", - "bus_lock_detect", "movdiri", "movdir64b", "fsrm", @@ -1451,33 +1378,32 @@ "spectre_v2", "spec_store_bypass", "swapgs", + "eibrs_pbrsb", + "rfds", "bhi" ], - "power_management": [ - "" - ], - "bogo": 5990.4, - "cache": 2048, - "units": 128, + "bogo": 3763.2, + "cache": 12288, + "units": 64, "physical_id": 0, - "siblings": 22, - "cores": 16, - "fpu": false, - "fpu_exception": false, - "cpuid_level": 35, + "siblings": 12, + "cores": 10, + "fpu": true, + "fpu_exception": true, + "cpuid_level": 32, "write_protect": false, "clflush_size": 64, "cache_alignment": 64, "address_sizes": { - "physical": "0x2e", - "virtual": "0x30" + "physical": 39, + "virtual": 48 } } ], "disk": [ { - "index": 57, - "attached_to": 47, + "index": 51, + "attached_to": 44, "class_list": [ "disk", "block_device", @@ -1503,116 +1429,28 @@ "value": 0 }, "vendor": { - "hex": "2646", - "value": 9798 + "hex": "1344", + "value": 4932 }, "sub_vendor": { - "hex": "2646", - "value": 9798 + "hex": "1344", + "value": 4932 }, "device": { - "hex": "5027", - "name": "KINGSTON SNV3S1000G", - "value": 20519 + "hex": "5414", + "name": "3460 NVMe Micron 512GB", + "value": 21524 }, "sub_device": { - "hex": "5027", - "value": 20519 + "hex": "1400", + "value": 5120 }, - "serial": "50026B73831D4D6A", - "model": "KINGSTON SNV3S1000G", + "serial": "23133F7DB0F0", + "model": "3460 NVMe Micron 512GB", "sysfs_id": "/class/block/nvme0n1", "sysfs_bus_id": "nvme0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:06.2/0000:05:00.0/nvme/nvme0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0/nvme/nvme0", "unix_device_name": "/dev/nvme0n1", - "unix_device_number": { - "type": 98, - "major": 259, - "minor": 3, - "range": 0 - }, - "unix_device_names": [ - "/dev/disk/by-id/nvme-KINGSTON_SNV3S1000G_50026B73831D4D6A", - "/dev/disk/by-id/nvme-KINGSTON_SNV3S1000G_50026B73831D4D6A_1", - "/dev/disk/by-id/nvme-eui.00000000000000000026b73831d4d6a5", - "/dev/disk/by-path/pci-0000:05:00.0-nvme-1", - "/dev/nvme0n1" - ], - "resources": [ - { - "type": "disk_geo", - "cylinders": 953869, - "heads": 64, - "sectors": 32, - "size": "0x0", - "geo_type": "logical" - }, - { - "type": "size", - "unit": "sectors", - "value_1": 1953525168, - "value_2": 512 - } - ], - "driver": "nvme", - "driver_module": "nvme", - "drivers": [ - "nvme" - ], - "driver_modules": [ - "nvme" - ] - }, - { - "index": 58, - "attached_to": 50, - "class_list": [ - "disk", - "block_device", - "nvme" - ], - "bus_type": { - "hex": "0096", - "name": "NVME", - "value": 150 - }, - "slot": { - "bus": 0, - "number": 1 - }, - "base_class": { - "hex": "0106", - "name": "Mass Storage Device", - "value": 262 - }, - "sub_class": { - "hex": "0000", - "name": "Disk", - "value": 0 - }, - "vendor": { - "hex": "1e0f", - "value": 7695 - }, - "sub_vendor": { - "hex": "1e0f", - "value": 7695 - }, - "device": { - "hex": "0010", - "name": "KXG8AZNV1T02 LA KIOXIA", - "value": 16 - }, - "sub_device": { - "hex": "0001", - "value": 1 - }, - "serial": "54BF71ZZFG6P", - "model": "KXG8AZNV1T02 LA KIOXIA", - "sysfs_id": "/class/block/nvme1n1", - "sysfs_bus_id": "nvme1", - "sysfs_device_link": "/devices/pci0000:00/0000:00:06.0/0000:04:00.0/nvme/nvme1", - "unix_device_name": "/dev/nvme1n1", "unix_device_number": { "type": 98, "major": 259, @@ -1620,25 +1458,27 @@ "range": 0 }, "unix_device_names": [ - "/dev/disk/by-id/nvme-KXG8AZNV1T02_LA_KIOXIA_54BF71ZZFG6P", - "/dev/disk/by-id/nvme-KXG8AZNV1T02_LA_KIOXIA_54BF71ZZFG6P_1", - "/dev/disk/by-id/nvme-eui.8ce38e05011f5d69", - "/dev/disk/by-path/pci-0000:04:00.0-nvme-1", - "/dev/nvme1n1" + "/dev/disk/by-diskseq/1", + "/dev/disk/by-id/nvme-3460_NVMe_Micron_512GB_23133F7DB0F0", + "/dev/disk/by-id/nvme-3460_NVMe_Micron_512GB_23133F7DB0F0_1", + "/dev/disk/by-id/nvme-eui.000000000000000100a075233f7db0f0", + "/dev/disk/by-path/pci-0000:00:0e.0-pci-10000:e1:00.0-nvme-1", + "/dev/nvme0n1" ], + "rom_id": "0x80", "resources": [ { "type": "disk_geo", - "cylinders": 976762, + "cylinders": 488386, "heads": 64, "sectors": 32, - "size": "0x0", + "size": 0, "geo_type": "logical" }, { "type": "size", "unit": "sectors", - "value_1": 2000409264, + "value_1": 1000215216, "value_2": 512 } ], @@ -1654,115 +1494,7 @@ ], "graphics_card": [ { - "index": 36, - "attached_to": 32, - "class_list": [ - "graphics_card", - "pci" - ], - "bus_type": { - "hex": "0004", - "name": "PCI", - "value": 4 - }, - "slot": { - "bus": 1, - "number": 0 - }, - "base_class": { - "hex": "0003", - "name": "Display controller", - "value": 3 - }, - "sub_class": { - "hex": "0002", - "name": "3D controller", - "value": 2 - }, - "vendor": { - "hex": "10de", - "name": "nVidia Corporation", - "value": 4318 - }, - "sub_vendor": { - "hex": "17aa", - "value": 6058 - }, - "device": { - "hex": "28b9", - "value": 10425 - }, - "sub_device": { - "hex": "2234", - "value": 8756 - }, - "revision": { - "hex": "00a1", - "value": 161 - }, - "model": "nVidia 3D controller", - "sysfs_id": "/devices/pci0000:00/0000:00:01.0/0000:01:00.0", - "sysfs_bus_id": "0000:01:00.0", - "sysfs_iommu_group_id": 19, - "resources": [ - { - "type": "io", - "base": 8192, - "range": 128, - "enabled": true, - "access": "read_write" - }, - { - "type": "irq", - "base": 229, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 274877906944, - "range": 8589934592, - "enabled": true, - "access": "read_only", - "prefetch": "no" - }, - { - "type": "mem", - "base": 283467841536, - "range": 33554432, - "enabled": true, - "access": "read_only", - "prefetch": "no" - }, - { - "type": "mem", - "base": 2868903936, - "range": 16777216, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], - "detail": { - "function": 0, - "command": 1031, - "header_type": 0, - "secondary_bus": 0, - "irq": 229, - "prog_if": 0 - }, - "driver": "nouveau", - "driver_module": "nouveau", - "drivers": [ - "nouveau" - ], - "driver_modules": [ - "nouveau" - ], - "module_alias": "pci:v000010DEd000028B9sv000017AAsd00002234bc03sc02i00" - }, - { - "index": 51, + "index": 43, "attached_to": 0, "class_list": [ "graphics_card", @@ -1798,35 +1530,42 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7d55", - "value": 32085 + "hex": "46aa", + "value": 18090 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0008", - "value": 8 + "hex": "000c", + "value": 12 }, "model": "Intel VGA compatible controller", "sysfs_id": "/devices/pci0000:00/0000:00:02.0", "sysfs_bus_id": "0000:00:02.0", - "sysfs_iommu_group_id": 0, + "sysfs_iommu_group_id": 1, "resources": [ + { + "type": "io", + "base": 12288, + "range": 64, + "enabled": true, + "access": "read_write" + }, { "type": "irq", - "base": 227, + "base": 125, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 283736276992, + "base": 274877906944, "range": 268435456, "enabled": true, "access": "read_only", @@ -1834,10 +1573,10 @@ }, { "type": "mem", - "base": 285212672000, + "base": 414346903552, "range": 16777216, "enabled": true, - "access": "read_only", + "access": "read_write", "prefetch": "no" }, { @@ -1851,10 +1590,10 @@ ], "detail": { "function": 0, - "command": 7, + "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 227, + "irq": 125, "prog_if": 0 }, "driver": "i915", @@ -1865,12 +1604,157 @@ "driver_modules": [ "i915" ], - "module_alias": "pci:v00008086d00007D55sv000017AAsd00002234bc03sc00i00" + "module_alias": "pci:v00008086d000046AAsv00001028sd00000B14bc03sc00i00", + "label": "Onboard - Video" } ], "hub": [ { - "index": 61, + "index": 52, + "attached_to": 65, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "8087", + "name": "Intel Corporation.", + "value": 32903 + }, + "device": { + "hex": "0b40", + "name": "USB3.0 Hub", + "value": 2880 + }, + "revision": { + "hex": "0000", + "name": "12.34", + "value": 0 + }, + "model": "Intel USB3.0 Hub", + "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb4/4-2/4-2:1.0", + "sysfs_bus_id": "4-2:1.0", + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v8087p0B40d1234dc09dsc00dp03ic09isc00ip00in00" + }, + { + "index": 54, + "attached_to": 55, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "0bda", + "name": "Dell Inc.", + "value": 3034 + }, + "device": { + "hex": "0413", + "name": "Dell dock", + "value": 1043 + }, + "revision": { + "hex": "0000", + "name": "1.22", + "value": 0 + }, + "model": "Dell dock", + "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb4/4-2/4-2.4/4-2.4.3/4-2.4.3:1.0", + "sysfs_bus_id": "4-2.4.3:1.0", + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v0BDAp0413d0122dc09dsc00dp03ic09isc00ip00in00" + }, + { + "index": 55, "attached_to": 52, "class_list": [ "usb", @@ -1890,9 +1774,163 @@ "name": "Hub", "value": 266 }, + "vendor": { + "hex": "0bda", + "name": "Dell Inc.", + "value": 3034 + }, + "device": { + "hex": "0487", + "name": "Dell dock", + "value": 1159 + }, + "revision": { + "hex": "0000", + "name": "1.57", + "value": 0 + }, + "model": "Dell dock", + "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb4/4-2/4-2.4/4-2.4:1.0", + "sysfs_bus_id": "4-2.4:1.0", + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v0BDAp0487d0157dc09dsc00dp03ic09isc00ip00in00" + }, + { + "index": 59, + "attached_to": 69, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "1d5c", + "name": "Fresco Logic, Inc.", + "value": 7516 + }, + "device": { + "hex": "5801", + "name": "USB2.0 Hub", + "value": 22529 + }, + "revision": { + "hex": "0000", + "name": "1.01", + "value": 0 + }, + "model": "Fresco Logic USB2.0 Hub", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6:1.0", + "sysfs_bus_id": "1-6:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 2, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 2, + "interface_number": 0, + "interface_alternate_setting": 1 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D5Cp5801d0101dc09dsc00dp02ic09isc00ip02in00" + }, + { + "index": 60, + "attached_to": 17, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, "vendor": { "hex": "1d6b", - "name": "Linux 6.14.8 xhci-hcd", + "name": "Linux 6.6.60 xhci-hcd", "value": 7531 }, "device": { @@ -1902,12 +1940,12 @@ }, "revision": { "hex": "0000", - "name": "6.14", + "name": "6.06", "value": 0 }, - "serial": "0000:00:14.0", - "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-0:1.0", + "serial": "0000:00:0d.0", + "model": "Linux 6.6.60 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb3/3-0:1.0", "sysfs_bus_id": "3-0:1.0", "resources": [ { @@ -1947,18 +1985,96 @@ }, "hotplug": "usb", "driver": "hub", - "driver_module": "usbcore", "drivers": [ "hub" ], - "driver_modules": [ - "usbcore" + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" + }, + { + "index": 61, + "attached_to": 72, + "class_list": [ + "usb", + "hub" ], - "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00" + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "0bda", + "name": "Dell Inc.", + "value": 3034 + }, + "device": { + "hex": "5413", + "name": "Dell dock", + "value": 21523 + }, + "revision": { + "hex": "0000", + "name": "1.22", + "value": 0 + }, + "model": "Dell dock", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1.3/1-6.1.3:1.0", + "sysfs_bus_id": "1-6.1.3:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 2, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 2, + "interface_number": 0, + "interface_alternate_setting": 1 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v0BDAp5413d0122dc09dsc00dp02ic09isc00ip02in00" }, { "index": 65, - "attached_to": 52, + "attached_to": 17, "class_list": [ "usb", "hub" @@ -1979,7 +2095,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.14.8 xhci-hcd", + "name": "Linux 6.6.60 xhci-hcd", "value": 7531 }, "device": { @@ -1989,12 +2105,12 @@ }, "revision": { "hex": "0000", - "name": "6.14", + "name": "6.06", "value": 0 }, - "serial": "0000:00:14.0", - "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb4/4-0:1.0", + "serial": "0000:00:0d.0", + "model": "Linux 6.6.60 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb4/4-0:1.0", "sysfs_bus_id": "4-0:1.0", "detail": { "device_class": { @@ -2024,18 +2140,14 @@ }, "hotplug": "usb", "driver": "hub", - "driver_module": "usbcore", "drivers": [ "hub" ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 67, - "attached_to": 29, + "index": 69, + "attached_to": 45, "class_list": [ "usb", "hub" @@ -2056,7 +2168,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.14.8 xhci-hcd", + "name": "Linux 6.6.60 xhci-hcd", "value": 7531 }, "device": { @@ -2066,12 +2178,12 @@ }, "revision": { "hex": "0000", - "name": "6.14", + "name": "6.06", "value": 0 }, - "serial": "0000:00:0d.0", - "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb1/1-0:1.0", + "serial": "0000:00:14.0", + "model": "Linux 6.6.60 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ { @@ -2111,18 +2223,96 @@ }, "hotplug": "usb", "driver": "hub", - "driver_module": "usbcore", "drivers": [ "hub" ], - "driver_modules": [ - "usbcore" - ], - "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 70, - "attached_to": 29, + "index": 72, + "attached_to": 59, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "0bda", + "name": "Dell Inc.", + "value": 3034 + }, + "device": { + "hex": "5487", + "name": "Dell dock", + "value": 21639 + }, + "revision": { + "hex": "0000", + "name": "1.57", + "value": 0 + }, + "model": "Dell dock", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1:1.0", + "sysfs_bus_id": "1-6.1:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 2, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 2, + "interface_number": 0, + "interface_alternate_setting": 1 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v0BDAp5487d0157dc09dsc00dp02ic09isc00ip02in00" + }, + { + "index": 74, + "attached_to": 45, "class_list": [ "usb", "hub" @@ -2143,7 +2333,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.14.8 xhci-hcd", + "name": "Linux 6.6.60 xhci-hcd", "value": 7531 }, "device": { @@ -2153,12 +2343,12 @@ }, "revision": { "hex": "0000", - "name": "6.14", + "name": "6.06", "value": 0 }, - "serial": "0000:00:0d.0", - "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb2/2-0:1.0", + "serial": "0000:00:14.0", + "model": "Linux 6.6.60 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { "device_class": { @@ -2188,19 +2378,126 @@ }, "hotplug": "usb", "driver": "hub", - "driver_module": "usbcore", "drivers": [ "hub" ], - "driver_modules": [ - "usbcore" + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" + } + ], + "keyboard": [ + { + "index": 63, + "attached_to": 61, + "class_list": [ + "keyboard", + "usb" ], - "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00" + "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": "413c", + "name": "DELL", + "value": 16700 + }, + "device": { + "hex": "2106", + "name": "Dell QuietKey Keyboard", + "value": 8454 + }, + "revision": { + "hex": "0000", + "name": "1.01", + "value": 0 + }, + "model": "DELL Dell QuietKey Keyboard", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1.3/1-6.1.3.2/1-6.1.3.2:1.0", + "sysfs_bus_id": "1-6.1.3.2:1.0", + "unix_device_name": "/dev/input/event15", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 79, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/by-id/usb-DELL_Dell_QuietKey_Keyboard-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usb-0:6.1.3.2:1.0-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:6.1.3.2:1.0-event-kbd", + "/dev/input/event15" + ], + "resources": [ + { + "type": "baud", + "speed": 1500000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "keyboard", + "xkb_rules": "xfree86", + "xkb_model": "pc104" + }, + "module_alias": "usb:v413Cp2106d0101dc00dsc00dp00ic03isc01ip01in00" } ], "memory": [ { - "index": 25, + "index": 15, "attached_to": 0, "class_list": [ "memory" @@ -2220,22 +2517,22 @@ { "type": "mem", "base": 0, - "range": 66895929344, + "range": 16382128128, "enabled": true, "access": "read_write", "prefetch": "unknown" }, { "type": "phys_mem", - "range": 68719476736 + "range": 16106127360 } ] } ], "monitor": [ { - "index": 56, - "attached_to": 51, + "index": 49, + "attached_to": 43, "class_list": [ "monitor" ], @@ -2250,16 +2547,16 @@ "value": 2 }, "vendor": { - "hex": "4c83", - "name": "SDC", - "value": 19587 + "hex": "4d10", + "name": "G59J8 LQ134R1", + "value": 19728 }, "device": { - "hex": "4165", - "value": 16741 + "hex": "1551", + "value": 5457 }, "serial": "0", - "model": "SDC LCD Monitor", + "model": "G59J8 LQ134R1 LCD Monitor", "resources": [ { "type": "monitor", @@ -2271,86 +2568,372 @@ { "type": "size", "unit": "mm", - "value_1": 344, - "value_2": 215 + "value_1": 288, + "value_2": 180 } ], "detail": { "manufacture_year": 2021, - "manufacture_week": 0, + "manufacture_week": 49, "vertical_sync": { - "min": 0, - "max": 0 + "min": 48, + "max": 60 }, "horizontal_sync": { - "min": 0, - "max": 0 + "min": 148, + "max": 148 }, "horizontal_sync_timings": { "disp": 3840, - "sync_start": 3872, - "sync_end": 3880, - "total": 3920 + "sync_start": 3888, + "sync_end": 3920, + "total": 4000 }, "vertical_sync_timings": { "disp": 2400, - "sync_start": 2408, - "sync_end": 2416, - "total": 2432 + "sync_start": 2403, + "sync_end": 2409, + "total": 2469 }, - "clock": 572010, + "clock": 592500, "width": 3840, "height": 2400, - "width_millimetres": 344, - "height_millimetres": 215, + "width_millimetres": 288, + "height_millimetres": 180, + "horizontal_flag": 45, + "vertical_flag": 45, + "vendor": "G59J8 LQ134R1", + "name": "" + }, + "driver_info": { + "type": "display", + "width": 3840, + "height": 2400, + "vertical_sync": { + "min": 48, + "max": 60 + }, + "horizontal_sync": { + "min": 148, + "max": 148 + }, + "bandwidth": 0, + "horizontal_sync_timings": { + "disp": 3840, + "sync_start": 3888, + "sync_end": 3920, + "total": 4000 + }, + "vertical_sync_timings": { + "disp": 2400, + "sync_start": 2403, + "sync_end": 2409, + "total": 2469 + }, + "horizontal_flag": 45, + "vertical_flag": 45 + } + }, + { + "index": 50, + "attached_to": 43, + "class_list": [ + "monitor" + ], + "base_class": { + "hex": "0100", + "name": "Monitor", + "value": 256 + }, + "sub_class": { + "hex": "0002", + "name": "LCD Monitor", + "value": 2 + }, + "vendor": { + "hex": "26cd", + "name": "IIYAMA", + "value": 9933 + }, + "device": { + "hex": "6656", + "name": "PL2792QN", + "value": 26198 + }, + "serial": "1179214201744", + "model": "IIYAMA PL2792QN", + "resources": [ + { + "type": "monitor", + "width": 1024, + "height": 768, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "monitor", + "width": 1024, + "height": 768, + "vertical_frequency": 75, + "interlaced": false + }, + { + "type": "monitor", + "width": 1280, + "height": 1024, + "vertical_frequency": 75, + "interlaced": false + }, + { + "type": "monitor", + "width": 1600, + "height": 1200, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "monitor", + "width": 1600, + "height": 900, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "monitor", + "width": 2560, + "height": 1440, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "monitor", + "width": 640, + "height": 480, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "monitor", + "width": 640, + "height": 480, + "vertical_frequency": 75, + "interlaced": false + }, + { + "type": "monitor", + "width": 800, + "height": 600, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "monitor", + "width": 800, + "height": 600, + "vertical_frequency": 75, + "interlaced": false + }, + { + "type": "size", + "unit": "mm", + "value_1": 597, + "value_2": 336 + } + ], + "detail": { + "manufacture_year": 2021, + "manufacture_week": 42, + "vertical_sync": { + "min": 49, + "max": 76 + }, + "horizontal_sync": { + "min": 30, + "max": 120 + }, + "horizontal_sync_timings": { + "disp": 2560, + "sync_start": 2608, + "sync_end": 2640, + "total": 2720 + }, + "vertical_sync_timings": { + "disp": 1440, + "sync_start": 1443, + "sync_end": 1448, + "total": 1481 + }, + "clock": 241500, + "width": 2560, + "height": 1440, + "width_millimetres": 597, + "height_millimetres": 336, "horizontal_flag": 45, "vertical_flag": 43, - "vendor": "SDC", - "name": "" + "vendor": "", + "name": "PL2792QN" + }, + "driver_info": { + "type": "display", + "width": 2560, + "height": 1440, + "vertical_sync": { + "min": 49, + "max": 76 + }, + "horizontal_sync": { + "min": 30, + "max": 120 + }, + "bandwidth": 0, + "horizontal_sync_timings": { + "disp": 2560, + "sync_start": 2608, + "sync_end": 2640, + "total": 2720 + }, + "vertical_sync_timings": { + "disp": 1440, + "sync_start": 1443, + "sync_end": 1448, + "total": 1481 + }, + "horizontal_flag": 45, + "vertical_flag": 43 } } ], "mouse": [ { - "index": 75, - "attached_to": 0, + "index": 70, + "attached_to": 61, + "class_list": [ + "mouse", + "usb" + ], "bus_type": { - "hex": "0081", - "name": "serial", - "value": 129 + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 }, "base_class": { - "hex": "0118", - "name": "touchpad", - "value": 280 + "hex": "0105", + "name": "Mouse", + "value": 261 }, "sub_class": { - "hex": "0001", - "name": "bus", - "value": 1 + "hex": "0003", + "name": "USB Mouse", + "value": 3 }, "vendor": { - "hex": "2c2f", - "value": 11311 + "hex": "046d", + "name": "Logitech Inc.", + "value": 1133 }, "device": { - "hex": "002d", - "value": 45 + "hex": "c077", + "name": "USB Optical Mouse", + "value": 49271 + }, + "revision": { + "hex": "0000", + "name": "72.00", + "value": 0 + }, + "compat_vendor": "Unknown", + "compat_device": "Generic USB Mouse", + "model": "Logitech USB Optical Mouse", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1.3/1-6.1.3.3/1-6.1.3.3:1.0", + "sysfs_bus_id": "1-6.1.3.3:1.0", + "unix_device_name": "/dev/input/mice", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 63, + "range": 1 }, - "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-SNSL002D:00/0018:2C2F:002D.0001/input/input16", "unix_device_names": [ - "/dev/input/event11", - "/dev/input/ + handler" - ] + "/dev/input/mice" + ], + "unix_device_name2": "/dev/input/mouse4", + "unix_device_number2": { + "type": 99, + "major": 13, + "minor": 36, + "range": 1 + }, + "resources": [ + { + "type": "baud", + "speed": 1500000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 2, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "mouse", + "db_entry_0": [ + "explorerps/2", + "exps2" + ], + "xf86": "explorerps/2", + "gpm": "exps2", + "buttons": -1, + "wheels": -1 + }, + "module_alias": "usb:v046DpC077d7200dc00dsc00dp00ic03isc01ip02in00" } ], "network_controller": [ { - "index": 28, - "attached_to": 33, + "index": 24, + "attached_to": 0, "class_list": [ "network_controller", - "pci" + "pci", + "wlan_card" ], "bus_type": { "hex": "0004", @@ -2358,7 +2941,188 @@ "value": 4 }, "slot": { - "bus": 9, + "bus": 0, + "number": 20 + }, + "base_class": { + "hex": "0002", + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "hex": "0082", + "name": "WLAN controller", + "value": 130 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "51f0", + "value": 20976 + }, + "sub_device": { + "hex": "4090", + "value": 16528 + }, + "revision": { + "hex": "0001", + "value": 1 + }, + "model": "Intel WLAN controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.3", + "sysfs_bus_id": "0000:00:14.3", + "sysfs_iommu_group_id": 12, + "unix_device_name": "wlp0s20f3", + "unix_device_names": [ + "wlp0s20f3" + ], + "resources": [ + { + "type": "hwaddr", + "address": 54 + }, + { + "type": "irq", + "base": 16, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 414366384128, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "phwaddr", + "address": 54 + }, + { + "type": "wlan", + "channels": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "13", + "36", + "40", + "44", + "48", + "52", + "56", + "60", + "64", + "100", + "104", + "108", + "112", + "116", + "120", + "124", + "128", + "132", + "136", + "140" + ], + "frequencies": [ + "2.412", + "2.417", + "2.422", + "2.427", + "2.432", + "2.437", + "2.442", + "2.447", + "2.452", + "2.457", + "2.462", + "2.467", + "2.472", + "5.18", + "5.2", + "5.22", + "5.24", + "5.26", + "5.28", + "5.3", + "5.32", + "5.5", + "5.52", + "5.54", + "5.56", + "5.58", + "5.6", + "5.62", + "5.64", + "5.66", + "5.68", + "5.7" + ], + "auth_modes": [ + "open", + "sharedkey", + "wpa-psk", + "wpa-eap" + ], + "enc_modes": [ + "WEP40", + "WEP104", + "TKIP", + "CCMP" + ] + } + ], + "detail": { + "function": 3, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 16, + "prog_if": 0 + }, + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ], + "module_alias": "pci:v00008086d000051F0sv00008086sd00004090bc02sc80i00" + }, + { + "index": 62, + "attached_to": 55, + "class_list": [ + "network_controller", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, "number": 0 }, "base_class": { @@ -2372,82 +3136,80 @@ "value": 0 }, "vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 - }, - "sub_vendor": { - "hex": "8086", - "name": "Intel Corporation", - "value": 32902 + "hex": "0bda", + "name": "Realtek", + "value": 3034 }, "device": { - "hex": "272b", - "value": 10027 - }, - "sub_device": { - "hex": "00f0", - "value": 240 + "hex": "8153", + "name": "USB 10/100/1000 LAN", + "value": 33107 }, "revision": { - "hex": "001a", - "value": 26 + "hex": "0000", + "name": "31.11", + "value": 0 }, - "model": "Intel Ethernet controller", - "sysfs_id": "/devices/pci0000:00/0000:00:1c.7/0000:09:00.0", - "sysfs_bus_id": "0000:09:00.0", - "sysfs_iommu_group_id": 23, - "unix_device_name": "wlp9s0f0", + "serial": "1113000001", + "model": "Realtek USB 10/100/1000 LAN", + "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb4/4-2/4-2.4/4-2.4.4/4-2.4.4:1.0", + "sysfs_bus_id": "4-2.4.4:1.0", + "unix_device_name": "enp0s13f0u2u4u4", "unix_device_names": [ - "wlp9s0f0" + "enp0s13f0u2u4u4" ], "resources": [ { "type": "hwaddr", - "address": 52 - }, - { - "type": "irq", - "base": 19, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 2885681152, - "range": 16384, - "enabled": true, - "access": "read_write", - "prefetch": "no" + "address": 97 }, { "type": "phwaddr", - "address": 52 + "address": 97 } ], "detail": { - "function": 0, - "command": 1030, - "header_type": 0, - "secondary_bus": 0, - "irq": 19, - "prog_if": 0 + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "00ff", + "name": "vendor_spec", + "value": 255 + }, + "interface_subclass": { + "hex": "00ff", + "name": "vendor_spec", + "value": 255 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 }, - "driver": "iwlwifi", - "driver_module": "iwlwifi", + "hotplug": "usb", + "driver": "r8152", + "driver_module": "r8152", "drivers": [ - "iwlwifi" + "r8152" ], "driver_modules": [ - "iwlwifi" + "r8152" ], - "module_alias": "pci:v00008086d0000272Bsv00008086sd000000F0bc02sc80i00" + "module_alias": "usb:v0BDAp8153d3111dc00dsc00dp00icFFiscFFip00in00" } ], "network_interface": [ { - "index": 73, - "attached_to": 28, + "index": 77, + "attached_to": 62, "class_list": [ "network_interface" ], @@ -2462,33 +3224,33 @@ "value": 1 }, "model": "Ethernet network interface", - "sysfs_id": "/class/net/wlp9s0f0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.7/0000:09:00.0", - "unix_device_name": "wlp9s0f0", + "sysfs_id": "/class/net/enp0s13f0u2u4u4", + "sysfs_device_link": "/devices/pci0000:00/0000:00:0d.0/usb4/4-2/4-2.4/4-2.4.4/4-2.4.4:1.0", + "unix_device_name": "enp0s13f0u2u4u4", "unix_device_names": [ - "wlp9s0f0" + "enp0s13f0u2u4u4" ], "resources": [ { "type": "hwaddr", - "address": 52 + "address": 97 }, { "type": "phwaddr", - "address": 52 + "address": 97 } ], - "driver": "iwlwifi", - "driver_module": "iwlwifi", + "driver": "r8152", + "driver_module": "r8152", "drivers": [ - "iwlwifi" + "r8152" ], "driver_modules": [ - "iwlwifi" + "r8152" ] }, { - "index": 74, + "index": 78, "attached_to": 0, "class_list": [ "network_interface" @@ -2509,11 +3271,53 @@ "unix_device_names": [ "lo" ] + }, + { + "index": 79, + "attached_to": 24, + "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/wlp0s20f3", + "sysfs_device_link": "/devices/pci0000:00/0000:00:14.3", + "unix_device_name": "wlp0s20f3", + "unix_device_names": [ + "wlp0s20f3" + ], + "resources": [ + { + "type": "hwaddr", + "address": 54 + }, + { + "type": "phwaddr", + "address": 54 + } + ], + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ] } ], "pci": [ { - "index": 27, + "index": 16, "attached_to": 0, "class_list": [ "pci", @@ -2544,25 +3348,25 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e4c", - "value": 32332 + "hex": "464f", + "value": 17999 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0006", + "value": 6 }, "model": "Intel System peripheral", "sysfs_id": "/devices/pci0000:00/0000:00:08.0", "sysfs_bus_id": "0000:00:08.0", - "sysfs_iommu_group_id": 8, + "sysfs_iommu_group_id": 7, "resources": [ { "type": "irq", @@ -2572,7 +3376,7 @@ }, { "type": "mem", - "base": 285242884096, + "base": 414366453760, "range": 4096, "enabled": false, "access": "read_write", @@ -2587,10 +3391,10 @@ "irq": 255, "prog_if": 0 }, - "module_alias": "pci:v00008086d00007E4Csv000017AAsd00002234bc08sc80i00" + "module_alias": "pci:v00008086d0000464Fsv00001028sd00000B14bc08sc80i00" }, { - "index": 30, + "index": 18, "attached_to": 0, "class_list": [ "pci", @@ -2620,20 +3424,20 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e79", - "value": 32377 + "hex": "51e9", + "value": 20969 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, "model": "Intel Serial bus controller", "sysfs_id": "/devices/pci0000:00/0000:00:15.1", @@ -2642,13 +3446,13 @@ "resources": [ { "type": "irq", - "base": 33, + "base": 40, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 283618840576, + "base": 275263787008, "range": 4096, "enabled": true, "access": "read_write", @@ -2660,7 +3464,7 @@ "command": 6, "header_type": 0, "secondary_bus": 0, - "irq": 33, + "irq": 40, "prog_if": 0 }, "driver": "intel-lpss", @@ -2671,10 +3475,10 @@ "driver_modules": [ "intel_lpss_pci" ], - "module_alias": "pci:v00008086d00007E79sv000017AAsd00002234bc0Csc80i00" + "module_alias": "pci:v00008086d000051E9sv00001028sd00000B14bc0Csc80i00" }, { - "index": 34, + "index": 23, "attached_to": 0, "class_list": [ "pci", @@ -2705,20 +3509,20 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7d03", - "value": 32003 + "hex": "461d", + "value": 17949 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0004", - "value": 4 + "hex": "0006", + "value": 6 }, "model": "Intel Signal processing controller", "sysfs_id": "/devices/pci0000:00/0000:00:04.0", @@ -2727,13 +3531,13 @@ "resources": [ { "type": "irq", - "base": 16, + "base": 175, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 285242556416, + "base": 414366040064, "range": 131072, "enabled": true, "access": "read_write", @@ -2742,10 +3546,10 @@ ], "detail": { "function": 0, - "command": 6, + "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 16, + "irq": 175, "prog_if": 0 }, "driver": "proc_thermal_pci", @@ -2756,10 +3560,10 @@ "driver_modules": [ "processor_thermal_device_pci" ], - "module_alias": "pci:v00008086d00007D03sv000017AAsd00002234bc11sc80i00" + "module_alias": "pci:v00008086d0000461Dsv00001028sd00000B14bc11sc80i00" }, { - "index": 35, + "index": 25, "attached_to": 0, "class_list": [ "pci", @@ -2790,20 +3594,20 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e70", - "value": 32368 + "hex": "51e0", + "value": 20960 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, "model": "Intel Communication controller", "sysfs_id": "/devices/pci0000:00/0000:00:16.0", @@ -2812,13 +3616,13 @@ "resources": [ { "type": "irq", - "base": 209, + "base": 163, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 285242859520, + "base": 414366433280, "range": 4096, "enabled": true, "access": "read_write", @@ -2830,7 +3634,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 209, + "irq": 163, "prog_if": 0 }, "driver": "mei_me", @@ -2841,11 +3645,11 @@ "driver_modules": [ "mei_me" ], - "module_alias": "pci:v00008086d00007E70sv000017AAsd00002234bc07sc80i00" + "module_alias": "pci:v00008086d000051E0sv00001028sd00000B14bc07sc80i00" }, { - "index": 37, - "attached_to": 26, + "index": 26, + "attached_to": 0, "class_list": [ "pci", "unknown" @@ -2856,48 +3660,53 @@ "value": 4 }, "slot": { - "bus": 10, - "number": 0 + "bus": 0, + "number": 30 }, "base_class": { - "hex": "00ff", - "name": "Unclassified device", - "value": 255 + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0080", + "value": 128 }, "vendor": { - "hex": "10ec", - "value": 4332 + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "5261", - "value": 21089 + "hex": "51aa", + "value": 20906 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { "hex": "0001", "value": 1 }, - "model": "Unclassified device", - "sysfs_id": "/devices/pci0000:00/0000:00:1c.0/0000:0a:00.0", - "sysfs_bus_id": "0000:0a:00.0", - "sysfs_iommu_group_id": 22, + "model": "Intel Serial bus controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1e.2", + "sysfs_bus_id": "0000:00:1e.2", + "sysfs_iommu_group_id": 15, "resources": [ { "type": "irq", - "base": 207, + "base": 36, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 2886729728, + "base": 275263795200, "range": 4096, "enabled": true, "access": "read_write", @@ -2905,25 +3714,25 @@ } ], "detail": { - "function": 0, - "command": 1030, + "function": 2, + "command": 6, "header_type": 0, "secondary_bus": 0, - "irq": 207, + "irq": 36, "prog_if": 0 }, - "driver": "rtsx_pci", - "driver_module": "rtsx_pci", + "driver": "intel-lpss", + "driver_module": "intel_lpss_pci", "drivers": [ - "rtsx_pci" + "intel-lpss" ], "driver_modules": [ - "rtsx_pci" + "intel_lpss_pci" ], - "module_alias": "pci:v000010ECd00005261sv000017AAsd00002234bcFFsc00i00" + "module_alias": "pci:v00008086d000051AAsv00001028sd00000B14bc0Csc80i00" }, { - "index": 39, + "index": 28, "attached_to": 0, "class_list": [ "pci", @@ -2953,29 +3762,29 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e23", - "value": 32291 + "hex": "51a4", + "value": 20900 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, "model": "Intel Serial bus controller", "sysfs_id": "/devices/pci0000:00/0000:00:1f.5", "sysfs_bus_id": "0000:00:1f.5", - "sysfs_iommu_group_id": 18, + "sysfs_iommu_group_id": 16, "resources": [ { "type": "mem", - "base": 2619342848, + "base": 1887436800, "range": 4096, "enabled": true, "access": "read_write", @@ -2998,10 +3807,10 @@ "driver_modules": [ "spi_intel_pci" ], - "module_alias": "pci:v00008086d00007E23sv000017AAsd00002234bc0Csc80i00" + "module_alias": "pci:v00008086d000051A4sv00001028sd00000B14bc0Csc80i00" }, { - "index": 40, + "index": 30, "attached_to": 0, "class_list": [ "pci", @@ -3014,15 +3823,16 @@ }, "slot": { "bus": 0, - "number": 25 + "number": 30 }, "base_class": { - "hex": "000c", - "name": "Serial bus controller", - "value": 12 + "hex": "0007", + "name": "Communication controller", + "value": 7 }, "sub_class": { "hex": "0080", + "name": "Communication controller", "value": 128 }, "vendor": { @@ -3031,35 +3841,35 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e50", - "value": 32336 + "hex": "51a8", + "value": 20904 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, - "model": "Intel Serial bus controller", - "sysfs_id": "/devices/pci0000:00/0000:00:19.0", - "sysfs_bus_id": "0000:00:19.0", + "model": "Intel Communication controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1e.0", + "sysfs_bus_id": "0000:00:1e.0", "sysfs_iommu_group_id": 15, "resources": [ { "type": "irq", - "base": 29, + "base": 16, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 283618844672, + "base": 275263791104, "range": 4096, "enabled": true, "access": "read_write", @@ -3071,7 +3881,7 @@ "command": 6, "header_type": 0, "secondary_bus": 0, - "irq": 29, + "irq": 16, "prog_if": 0 }, "driver": "intel-lpss", @@ -3082,10 +3892,100 @@ "driver_modules": [ "intel_lpss_pci" ], - "module_alias": "pci:v00008086d00007E50sv000017AAsd00002234bc0Csc80i00" + "module_alias": "pci:v00008086d000051A8sv00001028sd00000B14bc07sc80i00" }, { - "index": 44, + "index": 34, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 18 + }, + "base_class": { + "hex": "0007", + "name": "Communication controller", + "value": 7 + }, + "sub_class": { + "hex": "0000", + "name": "Serial controller", + "value": 0 + }, + "pci_interface": { + "hex": "0000", + "name": "8250", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "1028", + "value": 4136 + }, + "device": { + "hex": "51fc", + "value": 20988 + }, + "sub_device": { + "hex": "0b14", + "value": 2836 + }, + "revision": { + "hex": "0001", + "value": 1 + }, + "model": "Intel Serial controller", + "sysfs_id": "/devices/pci0000:00/0000:00:12.0", + "sysfs_bus_id": "0000:00:12.0", + "sysfs_iommu_group_id": 10, + "resources": [ + { + "type": "irq", + "base": 26, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 414366236672, + "range": 65536, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 6, + "header_type": 0, + "secondary_bus": 0, + "irq": 26, + "prog_if": 0 + }, + "driver": "intel_ish_ipc", + "driver_module": "intel_ish_ipc", + "drivers": [ + "intel_ish_ipc" + ], + "driver_modules": [ + "intel_ish_ipc" + ], + "module_alias": "pci:v00008086d000051FCsv00001028sd00000B14bc07sc00i00" + }, + { + "index": 36, "attached_to": 0, "class_list": [ "pci", @@ -3115,20 +4015,20 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e78", - "value": 32376 + "hex": "51e8", + "value": 20968 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, "model": "Intel Serial bus controller", "sysfs_id": "/devices/pci0000:00/0000:00:15.0", @@ -3137,13 +4037,13 @@ "resources": [ { "type": "irq", - "base": 32, + "base": 27, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 283618836480, + "base": 275263782912, "range": 4096, "enabled": true, "access": "read_write", @@ -3155,7 +4055,7 @@ "command": 6, "header_type": 0, "secondary_bus": 0, - "irq": 32, + "irq": 27, "prog_if": 0 }, "driver": "intel-lpss", @@ -3166,10 +4066,10 @@ "driver_modules": [ "intel_lpss_pci" ], - "module_alias": "pci:v00008086d00007E78sv000017AAsd00002234bc0Csc80i00" + "module_alias": "pci:v00008086d000051E8sv00001028sd00000B14bc0Csc80i00" }, { - "index": 46, + "index": 37, "attached_to": 0, "class_list": [ "pci", @@ -3182,11 +4082,65 @@ }, "slot": { "bus": 0, - "number": 11 + "number": 6 }, "base_class": { - "hex": "0012", - "value": 18 + "hex": "0008", + "name": "Generic system peripheral", + "value": 8 + }, + "sub_class": { + "hex": "0080", + "name": "System peripheral", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "09ab", + "value": 2475 + }, + "model": "Intel System peripheral", + "sysfs_id": "/devices/pci0000:00/0000:00:06.0", + "sysfs_bus_id": "0000:00:06.0", + "sysfs_iommu_group_id": 4, + "detail": { + "function": 0, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d000009ABsv00000000sd00000000bc08sc80i00" + }, + { + "index": 39, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 30 + }, + "base_class": { + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0080", + "value": 128 }, "vendor": { "hex": "8086", @@ -3194,43 +4148,35 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7d1d", - "value": 32029 + "hex": "51ab", + "value": 20907 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0004", - "value": 4 + "hex": "0001", + "value": 1 }, - "model": "unknown unknown", - "sysfs_id": "/devices/pci0000:00/0000:00:0b.0", - "sysfs_bus_id": "0000:00:0b.0", - "sysfs_iommu_group_id": 10, + "model": "Intel Serial bus controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1e.3", + "sysfs_bus_id": "0000:00:1e.3", + "sysfs_iommu_group_id": 15, "resources": [ { "type": "irq", - "base": 208, + "base": 37, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 285078454272, - "range": 134217728, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 285242880000, + "base": 275263799296, "range": 4096, "enabled": true, "access": "read_write", @@ -3238,25 +4184,25 @@ } ], "detail": { - "function": 0, - "command": 1030, + "function": 3, + "command": 6, "header_type": 0, "secondary_bus": 0, - "irq": 208, + "irq": 37, "prog_if": 0 }, - "driver": "intel_vpu", - "driver_module": "intel_vpu", + "driver": "intel-lpss", + "driver_module": "intel_lpss_pci", "drivers": [ - "intel_vpu" + "intel-lpss" ], "driver_modules": [ - "intel_vpu" + "intel_lpss_pci" ], - "module_alias": "pci:v00008086d00007D1Dsv000017AAsd00002234bc12sc00i00" + "module_alias": "pci:v00008086d000051ABsv00001028sd00000B14bc0Csc80i00" }, { - "index": 49, + "index": 42, "attached_to": 0, "class_list": [ "pci", @@ -3287,55 +4233,55 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e7f", - "value": 32383 + "hex": "51ef", + "value": 20975 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, "model": "Intel RAM memory", "sysfs_id": "/devices/pci0000:00/0000:00:14.2", "sysfs_bus_id": "0000:00:14.2", - "sysfs_iommu_group_id": 12, + "sysfs_iommu_group_id": 11, "resources": [ { "type": "mem", - "base": 285242834944, + "base": 414366400512, "range": 16384, - "enabled": true, + "enabled": false, "access": "read_write", "prefetch": "no" }, { "type": "mem", - "base": 285242871808, + "base": 414366445568, "range": 4096, - "enabled": true, + "enabled": false, "access": "read_write", "prefetch": "no" } ], "detail": { "function": 2, - "command": 2, + "command": 0, "header_type": 0, "secondary_bus": 0, "irq": 0, "prog_if": 0 }, - "module_alias": "pci:v00008086d00007E7Fsv000017AAsd00002234bc05sc00i00" + "module_alias": "pci:v00008086d000051EFsv00001028sd00000B14bc05sc00i00" }, { - "index": 53, + "index": 46, "attached_to": 0, "class_list": [ "pci", @@ -3366,25 +4312,25 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e22", - "value": 32290 + "hex": "51a3", + "value": 20899 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, "model": "Intel SMBus", "sysfs_id": "/devices/pci0000:00/0000:00:1f.4", "sysfs_bus_id": "0000:00:1f.4", - "sysfs_iommu_group_id": 18, + "sysfs_iommu_group_id": 16, "resources": [ { "type": "io", @@ -3395,13 +4341,13 @@ }, { "type": "irq", - "base": 18, + "base": 16, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 285242851328, + "base": 414366416896, "range": 256, "enabled": true, "access": "read_write", @@ -3413,7 +4359,7 @@ "command": 3, "header_type": 0, "secondary_bus": 0, - "irq": 18, + "irq": 16, "prog_if": 0 }, "driver": "i801_smbus", @@ -3424,10 +4370,10 @@ "driver_modules": [ "i2c_i801" ], - "module_alias": "pci:v00008086d00007E22sv000017AAsd00002234bc0Csc05i00" + "module_alias": "pci:v00008086d000051A3sv00001028sd00000B14bc0Csc05i00" }, { - "index": 55, + "index": 47, "attached_to": 0, "class_list": [ "pci", @@ -3440,16 +4386,16 @@ }, "slot": { "bus": 0, - "number": 10 + "number": 5 }, "base_class": { - "hex": "0011", - "name": "Signal processing controller", - "value": 17 + "hex": "0004", + "name": "Multimedia controller", + "value": 4 }, "sub_class": { "hex": "0080", - "name": "Signal processing controller", + "name": "Multimedia controller", "value": 128 }, "vendor": { @@ -3458,57 +4404,55 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7d0d", - "value": 32013 + "hex": "465d", + "value": 18013 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0001", - "value": 1 + "hex": "0006", + "value": 6 }, - "model": "Intel Signal processing controller", - "sysfs_id": "/devices/pci0000:00/0000:00:0a.0", - "sysfs_bus_id": "0000:00:0a.0", - "sysfs_iommu_group_id": 9, + "model": "Intel Multimedia controller", + "sysfs_id": "/devices/pci0000:00/0000:00:05.0", + "sysfs_bus_id": "0000:00:05.0", + "sysfs_iommu_group_id": 0, "resources": [ + { + "type": "irq", + "base": 255, + "triggered": 0, + "enabled": true + }, { "type": "mem", - "base": 285242294272, - "range": 262144, - "enabled": true, + "base": 414330126336, + "range": 16777216, + "enabled": false, "access": "read_write", "prefetch": "no" } ], "detail": { "function": 0, - "command": 2, + "command": 0, "header_type": 0, "secondary_bus": 0, - "irq": 0, + "irq": 255, "prog_if": 0 }, - "driver": "intel_vsec", - "driver_module": "intel_vsec", - "drivers": [ - "intel_vsec" - ], - "driver_modules": [ - "intel_vsec" - ], - "module_alias": "pci:v00008086d00007D0Dsv000017AAsd00002234bc11sc80i00" + "module_alias": "pci:v00008086d0000465Dsv00001028sd00000B14bc04sc80i00" } ], "sound": [ { - "index": 41, + "index": 31, "attached_to": 0, "class_list": [ "sound", @@ -3529,12 +4473,9 @@ "value": 4 }, "sub_class": { - "hex": "0003", - "value": 3 - }, - "pci_interface": { - "hex": "0080", - "value": 128 + "hex": "0001", + "name": "Multimedia audio controller", + "value": 1 }, "vendor": { "hex": "8086", @@ -3542,43 +4483,43 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e28", - "value": 32296 + "hex": "51cc", + "value": 20940 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, - "model": "Intel Multimedia controller", + "model": "Intel Multimedia audio controller", "sysfs_id": "/devices/pci0000:00/0000:00:1f.3", "sysfs_bus_id": "0000:00:1f.3", - "sysfs_iommu_group_id": 18, + "sysfs_iommu_group_id": 16, "resources": [ { "type": "irq", - "base": 228, + "base": 190, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 285229449216, - "range": 2097152, + "base": 414363680768, + "range": 1048576, "enabled": true, "access": "read_write", "prefetch": "no" }, { "type": "mem", - "base": 285242818560, + "base": 414366367744, "range": 16384, "enabled": true, "access": "read_write", @@ -3590,24 +4531,238 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 228, - "prog_if": 128 + "irq": 190, + "prog_if": 0 }, - "driver": "sof-audio-pci-intel-mtl", - "driver_module": "snd_sof_pci_intel_mtl", + "driver": "sof-audio-pci-intel-tgl", + "driver_module": "snd_sof_pci_intel_tgl", "drivers": [ - "sof-audio-pci-intel-mtl" + "sof-audio-pci-intel-tgl" ], "driver_modules": [ - "snd_sof_pci_intel_mtl" + "snd_sof_pci_intel_tgl" ], - "module_alias": "pci:v00008086d00007E28sv000017AAsd00002234bc04sc03i80" + "module_alias": "pci:v00008086d000051CCsv00001028sd00000B14bc04sc01i00" + }, + { + "index": 53, + "attached_to": 61, + "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": "046d", + "name": "Logitech Inc.", + "value": 1133 + }, + "device": { + "hex": "08e5", + "name": "HD Pro Webcam C920", + "value": 2277 + }, + "revision": { + "hex": "0000", + "name": "0.21", + "value": 0 + }, + "serial": "604B96BF", + "model": "Logitech HD Pro Webcam C920", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1.3/1-6.1.3.1/1-6.1.3.1:1.2", + "sysfs_bus_id": "1-6.1.3.1:1.2", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00ef", + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 0, + "interface_number": 2, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "function_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 2 + } + }, + "hotplug": "usb", + "driver": "snd-usb-audio", + "driver_module": "snd_usb_audio", + "drivers": [ + "snd-usb-audio" + ], + "driver_modules": [ + "snd_usb_audio" + ], + "module_alias": "usb:v046Dp08E5d0021dcEFdsc02dp01ic01isc01ip00in02" + }, + { + "index": 66, + "attached_to": 61, + "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": "046d", + "name": "Logitech Inc.", + "value": 1133 + }, + "device": { + "hex": "08e5", + "name": "HD Pro Webcam C920", + "value": 2277 + }, + "revision": { + "hex": "0000", + "name": "0.21", + "value": 0 + }, + "serial": "604B96BF", + "model": "Logitech HD Pro Webcam C920", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1.3/1-6.1.3.1/1-6.1.3.1:1.3", + "sysfs_bus_id": "1-6.1.3.1:1.3", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00ef", + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "interface_protocol": 0, + "interface_number": 3, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "function_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 2 + } + }, + "hotplug": "usb", + "driver": "snd-usb-audio", + "driver_module": "snd_usb_audio", + "drivers": [ + "snd-usb-audio" + ], + "driver_modules": [ + "snd_usb_audio" + ], + "module_alias": "usb:v046Dp08E5d0021dcEFdsc02dp01ic01isc02ip00in03" } ], "storage_controller": [ { - "index": 47, - "attached_to": 43, + "index": 38, + "attached_to": 0, "class_list": [ "storage_controller", "pci" @@ -3618,8 +4773,8 @@ "value": 4 }, "slot": { - "bus": 5, - "number": 0 + "bus": 0, + "number": 14 }, "base_class": { "hex": "0001", @@ -3627,48 +4782,52 @@ "value": 1 }, "sub_class": { - "hex": "0008", - "value": 8 - }, - "pci_interface": { - "hex": "0002", - "value": 2 + "hex": "0004", + "name": "RAID bus controller", + "value": 4 }, "vendor": { - "hex": "2646", - "value": 9798 + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 }, "sub_vendor": { - "hex": "2646", - "value": 9798 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "5027", - "value": 20519 + "hex": "467f", + "value": 18047 }, "sub_device": { - "hex": "5027", - "value": 20519 + "hex": "0b14", + "value": 2836 }, - "revision": { - "hex": "0001", - "value": 1 - }, - "model": "Mass storage controller", - "sysfs_id": "/devices/pci0000:00/0000:00:06.2/0000:05:00.0", - "sysfs_bus_id": "0000:05:00.0", - "sysfs_iommu_group_id": 21, + "model": "Intel RAID bus controller", + "sysfs_id": "/devices/pci0000:00/0000:00:0e.0", + "sysfs_bus_id": "0000:00:0e.0", + "sysfs_iommu_group_id": 9, "resources": [ { - "type": "irq", - "base": 16, - "triggered": 0, - "enabled": true + "type": "mem", + "base": 3154116608, + "range": 33554432, + "enabled": true, + "access": "read_write", + "prefetch": "no" }, { "type": "mem", - "base": 2897215488, - "range": 16384, + "base": 414296571904, + "range": 33554432, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 414364729344, + "range": 1048576, "enabled": true, "access": "read_write", "prefetch": "no" @@ -3679,22 +4838,22 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 16, - "prog_if": 2 + "irq": 0, + "prog_if": 0 }, - "driver": "nvme", - "driver_module": "nvme", + "driver": "vmd", + "driver_module": "vmd", "drivers": [ - "nvme" + "vmd" ], "driver_modules": [ - "nvme" + "vmd" ], - "module_alias": "pci:v00002646d00005027sv00002646sd00005027bc01sc08i02" + "module_alias": "pci:v00008086d0000467Fsv00001028sd00000B14bc01sc04i00" }, { - "index": 50, - "attached_to": 45, + "index": 44, + "attached_to": 22, "class_list": [ "storage_controller", "pci" @@ -3705,7 +4864,7 @@ "value": 4 }, "slot": { - "bus": 4, + "bus": 225, "number": 0 }, "base_class": { @@ -3722,39 +4881,33 @@ "value": 2 }, "vendor": { - "hex": "1e0f", - "value": 7695 + "hex": "1344", + "value": 4932 }, "sub_vendor": { - "hex": "1e0f", - "value": 7695 + "hex": "1344", + "value": 4932 }, "device": { - "hex": "0010", - "value": 16 + "hex": "5414", + "value": 21524 }, "sub_device": { - "hex": "0001", - "value": 1 + "hex": "1400", + "value": 5120 }, "revision": { "hex": "0001", "value": 1 }, "model": "Mass storage controller", - "sysfs_id": "/devices/pci0000:00/0000:00:06.0/0000:04:00.0", - "sysfs_bus_id": "0000:04:00.0", - "sysfs_iommu_group_id": 20, + "sysfs_id": "/devices/pci0000:00/0000:00:0e.0/pci10000:e0/10000:e0:06.0/10000:e1:00.0", + "sysfs_bus_id": "10000:e1:00.0", + "sysfs_iommu_group_id": 9, "resources": [ - { - "type": "irq", - "base": 16, - "triggered": 0, - "enabled": true - }, { "type": "mem", - "base": 2898264064, + "base": 3154116608, "range": 16384, "enabled": true, "access": "read_write", @@ -3766,7 +4919,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 16, + "irq": 0, "prog_if": 2 }, "driver": "nvme", @@ -3777,7 +4930,7 @@ "driver_modules": [ "nvme" ], - "module_alias": "pci:v00001E0Fd00000010sv00001E0Fsd00000001bc01sc08i02" + "module_alias": "pci:v00001344d00005414sv00001344sd00001400bc01sc08i02" } ], "system": { @@ -3785,7 +4938,7 @@ }, "usb": [ { - "index": 60, + "index": 58, "attached_to": 61, "class_list": [ "usb", @@ -3810,25 +4963,115 @@ "name": "Unclassified device", "value": 0 }, + "vendor": { + "hex": "413c", + "value": 16700 + }, + "device": { + "hex": "b06f", + "name": "Dell dock", + "value": 45167 + }, + "revision": { + "hex": "0000", + "name": "1.01", + "value": 0 + }, + "model": "Dell dock", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1.3/1-6.1.3.5/1-6.1.3.5:1.0", + "sysfs_bus_id": "1-6.1.3.5:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "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:v413CpB06Fd0101dc00dsc00dp00ic03isc00ip00in00" + }, + { + "index": 64, + "attached_to": 69, + "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": "27c6", "name": "Goodix Technology Co., Ltd.", "value": 10182 }, "device": { - "hex": "6594", + "hex": "63ac", "name": "Goodix USB2.0 MISC", - "value": 26004 + "value": 25516 }, "revision": { "hex": "0000", "name": "1.00", "value": 0 }, - "serial": "UIDD44FA05B_XXXX_MOC_B0", + "serial": "UIDF6CB8136_XXXX_MOC_B0", "model": "Goodix USB2.0 MISC", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-7/3-7:1.0", - "sysfs_bus_id": "3-7:1.0", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-3/1-3:1.0", + "sysfs_bus_id": "1-3:1.0", "resources": [ { "type": "baud", @@ -3866,11 +5109,11 @@ "interface_alternate_setting": 0 }, "hotplug": "usb", - "module_alias": "usb:v27C6p6594d0100dcEFdsc00dp00icFFisc00ip00in00" + "module_alias": "usb:v27C6p63ACd0100dcEFdsc00dp00icFFisc00ip00in00" }, { - "index": 63, - "attached_to": 61, + "index": 71, + "attached_to": 69, "class_list": [ "usb", "unknown" @@ -3895,24 +5138,105 @@ "value": 0 }, "vendor": { - "hex": "30c9", - "name": "8SSC21K64624V1SR49K25RW", - "value": 12489 + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 }, "device": { - "hex": "00cd", - "name": "Integrated Camera", - "value": 205 + "hex": "0b63", + "name": "USB Bridge", + "value": 2915 }, "revision": { "hex": "0000", - "name": "10.08", + "name": "10.01", "value": 0 }, - "serial": "0001", - "model": "8SSC21K64624V1SR49K25RW Integrated Camera", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-9/3-9:1.4", - "sysfs_bus_id": "3-9:1.4", + "model": "Intel USB Bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-4/1-4:1.0", + "sysfs_bus_id": "1-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": "00ff", + "name": "vendor_spec", + "value": 255 + }, + "interface_subclass": { + "hex": "00ff", + "name": "vendor_spec", + "value": 255 + }, + "interface_protocol": 255, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "module_alias": "usb:v8086p0B63d1001dc00dsc00dp00icFFiscFFipFFin00" + }, + { + "index": 73, + "attached_to": 72, + "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": "413c", + "value": 16700 + }, + "device": { + "hex": "b06e", + "name": "Dell dock", + "value": 45166 + }, + "revision": { + "hex": "0000", + "name": "1.01", + "value": 0 + }, + "model": "Dell dock", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6.1/1-6.1.5/1-6.1.5:1.0", + "sysfs_bus_id": "1-6.1.5:1.0", "resources": [ { "type": "baud", @@ -3925,52 +5249,45 @@ ], "detail": { "device_class": { - "hex": "00ef", - "name": "miscellaneous", - "value": 239 + "hex": "0000", + "name": "per_interface", + "value": 0 }, "device_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 + "hex": "0000", + "name": "per_interface", + "value": 0 }, - "device_protocol": 1, + "device_protocol": 0, "interface_class": { - "hex": "00fe", - "name": "application", - "value": 254 + "hex": "0003", + "name": "hid", + "value": 3 }, "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 + "hex": "0000", + "name": "per_interface", + "value": 0 }, - "interface_protocol": 1, - "interface_number": 4, - "interface_alternate_setting": 0, - "interface_association": { - "function_class": { - "hex": "00fe", - "name": "application", - "value": 254 - }, - "function_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "function_protocol": 0, - "interface_count": 1, - "first_interface": 4 - } + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 }, "hotplug": "usb", - "module_alias": "usb:v30C9p00CDd1008dcEFdsc02dp01icFEisc01ip01in04" + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "module_alias": "usb:v413CpB06Ed0101dc00dsc00dp00ic03isc00ip00in00" } ], "usb_controller": [ { - "index": 29, + "index": 17, "attached_to": 0, "class_list": [ "usb_controller", @@ -4005,35 +5322,35 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7ec0", - "value": 32448 + "hex": "461e", + "value": 17950 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0002", - "value": 2 + "hex": "0006", + "value": 6 }, "model": "Intel USB Controller", "sysfs_id": "/devices/pci0000:00/0000:00:0d.0", "sysfs_bus_id": "0000:00:0d.0", - "sysfs_iommu_group_id": 11, + "sysfs_iommu_group_id": 8, "resources": [ { "type": "irq", - "base": 145, + "base": 164, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 285242753024, + "base": 414366302208, "range": 65536, "enabled": true, "access": "read_write", @@ -4045,7 +5362,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 145, + "irq": 164, "prog_if": 48 }, "driver": "xhci_hcd", @@ -4056,10 +5373,10 @@ "driver_modules": [ "xhci_pci" ], - "module_alias": "pci:v00008086d00007EC0sv000017AAsd00002234bc0Csc03i30" + "module_alias": "pci:v00008086d0000461Esv00001028sd00000B14bc0Csc03i30" }, { - "index": 52, + "index": 45, "attached_to": 0, "class_list": [ "usb_controller", @@ -4094,35 +5411,35 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7e7d", - "value": 32381 + "hex": "51ed", + "value": 20973 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0020", - "value": 32 + "hex": "0001", + "value": 1 }, "model": "Intel USB Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0", "sysfs_bus_id": "0000:00:14.0", - "sysfs_iommu_group_id": 12, + "sysfs_iommu_group_id": 11, "resources": [ { "type": "irq", - "base": 155, + "base": 161, "triggered": 0, "enabled": true }, { "type": "mem", - "base": 285242687488, + "base": 414366171136, "range": 65536, "enabled": true, "access": "read_write", @@ -4131,10 +5448,10 @@ ], "detail": { "function": 0, - "command": 1026, + "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 155, + "irq": 161, "prog_if": 48 }, "driver": "xhci_hcd", @@ -4145,10 +5462,10 @@ "driver_modules": [ "xhci_pci" ], - "module_alias": "pci:v00008086d00007E7Dsv000017AAsd00002234bc0Csc03i30" + "module_alias": "pci:v00008086d000051EDsv00001028sd00000B14bc0Csc03i30" }, { - "index": 54, + "index": 48, "attached_to": 0, "class_list": [ "usb_controller", @@ -4183,25 +5500,25 @@ "value": 32902 }, "sub_vendor": { - "hex": "17aa", - "value": 6058 + "hex": "1028", + "value": 4136 }, "device": { - "hex": "7ec2", - "value": 32450 + "hex": "463e", + "value": 17982 }, "sub_device": { - "hex": "2234", - "value": 8756 + "hex": "0b14", + "value": 2836 }, "revision": { - "hex": "0002", - "value": 2 + "hex": "0006", + "value": 6 }, "model": "Intel USB Controller", "sysfs_id": "/devices/pci0000:00/0000:00:0d.2", "sysfs_bus_id": "0000:00:0d.2", - "sysfs_iommu_group_id": 11, + "sysfs_iommu_group_id": 8, "resources": [ { "type": "irq", @@ -4211,7 +5528,7 @@ }, { "type": "mem", - "base": 285242032128, + "base": 414365777920, "range": 262144, "enabled": true, "access": "read_write", @@ -4219,7 +5536,7 @@ }, { "type": "mem", - "base": 285242875904, + "base": 414366449664, "range": 4096, "enabled": true, "access": "read_write", @@ -4242,16 +5559,16 @@ "driver_modules": [ "thunderbolt" ], - "module_alias": "pci:v00008086d00007EC2sv000017AAsd00002234bc0Csc03i40" + "module_alias": "pci:v00008086d0000463Esv00001028sd00000B14bc0Csc03i40" } ] }, "smbios": { "bios": { - "handle": 28, - "vendor": "LENOVO", - "version": "N48ET19W (1.06 )", - "date": "07/18/2024", + "handle": 1, + "vendor": "Dell Inc.", + "version": "1.11.0", + "date": "04/12/2023", "features": [ "PCI supported", "PnP supported", @@ -4260,24 +5577,24 @@ "CD boot supported", "Selectable boot supported", "EDD spec supported", - "720kB Floppy supported", "Print Screen supported", "8042 Keyboard Services supported", "Serial Services supported", "Printer Services supported", - "CGA/Mono Video supported", "ACPI supported", "USB Legacy supported", - "BIOS Boot Spec supported" + "Smart Battery supported", + "BIOS Boot Spec supported", + "F12 Network boot supported" ], - "start_address": "0xe0000", + "start_address": "0x0", "rom_size": 16777216 }, "board": { - "handle": 30, - "manufacturer": "LENOVO", - "product": "21KVCTO1WW", - "version": "Not Defined", + "handle": 512, + "manufacturer": "Dell Inc.", + "product": "0GNN3X", + "version": "A03", "board_type": { "hex": "000a", "name": "Motherboard", @@ -4287,15 +5604,15 @@ "Hosting Board", "Replaceable" ], - "location": "Not Available", - "chassis": 31 + "location": "", + "chassis": 768 }, "cache": [ { - "handle": 19, + "handle": 1792, "socket": "L1 Cache", - "size_max": 288, - "size_current": 288, + "size_max": 96, + "size_current": 96, "speed": 0, "mode": { "hex": "0001", @@ -4333,10 +5650,10 @@ ] }, { - "handle": 20, + "handle": 1793, "socket": "L1 Cache", - "size_max": 384, - "size_current": 384, + "size_max": 64, + "size_current": 64, "speed": 0, "mode": { "hex": "0001", @@ -4362,9 +5679,9 @@ "value": 3 }, "associativity": { - "hex": "0008", - "name": "16-way Set-Associative", - "value": 8 + "hex": "0007", + "name": "8-way Set-Associative", + "value": 7 }, "sram_type_current": [ "Synchronous" @@ -4374,8 +5691,49 @@ ] }, { - "handle": 21, + "handle": 1794, "socket": "L2 Cache", + "size_max": 2560, + "size_current": 2560, + "speed": 0, + "mode": { + "hex": "0001", + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 1, + "ecc": { + "hex": "0005", + "name": "Single-bit", + "value": 5 + }, + "cache_type": { + "hex": "0005", + "name": "Unified", + "value": 5 + }, + "associativity": { + "hex": "0001", + "name": "Other", + "value": 1 + }, + "sram_type_current": [ + "Synchronous" + ], + "sram_type_supported": [ + "Synchronous" + ] + }, + { + "handle": 1795, + "socket": "L3 Cache", "size_max": 12288, "size_current": 12288, "speed": 0, @@ -4391,47 +5749,6 @@ "value": 0 }, "socketed": false, - "level": 1, - "ecc": { - "hex": "0005", - "name": "Single-bit", - "value": 5 - }, - "cache_type": { - "hex": "0005", - "name": "Unified", - "value": 5 - }, - "associativity": { - "hex": "0008", - "name": "16-way Set-Associative", - "value": 8 - }, - "sram_type_current": [ - "Synchronous" - ], - "sram_type_supported": [ - "Synchronous" - ] - }, - { - "handle": 22, - "socket": "L3 Cache", - "size_max": 24576, - "size_current": 24576, - "speed": 0, - "mode": { - "hex": "0001", - "name": "Write Back", - "value": 1 - }, - "enabled": true, - "location": { - "hex": "0000", - "name": "Internal", - "value": 0 - }, - "socketed": false, "level": 2, "ecc": { "hex": "0006", @@ -4456,10 +5773,10 @@ ] }, { - "handle": 23, + "handle": 1796, "socket": "L1 Cache", - "size_max": 320, - "size_current": 320, + "size_max": 256, + "size_current": 256, "speed": 0, "mode": { "hex": "0001", @@ -4497,10 +5814,10 @@ ] }, { - "handle": 24, + "handle": 1797, "socket": "L1 Cache", - "size_max": 640, - "size_current": 640, + "size_max": 512, + "size_current": 512, "speed": 0, "mode": { "hex": "0001", @@ -4538,10 +5855,10 @@ ] }, { - "handle": 25, + "handle": 1798, "socket": "L2 Cache", - "size_max": 6144, - "size_current": 6144, + "size_max": 4096, + "size_current": 4096, "speed": 0, "mode": { "hex": "0001", @@ -4579,10 +5896,10 @@ ] }, { - "handle": 26, + "handle": 1799, "socket": "L3 Cache", - "size_max": 24576, - "size_current": 24576, + "size_max": 12288, + "size_current": 12288, "speed": 0, "mode": { "hex": "0001", @@ -4620,86 +5937,77 @@ ] } ], - "chassis": [ - { - "handle": 31, - "manufacturer": "LENOVO", - "version": "None", - "chassis_type": { - "hex": "000a", - "name": "Notebook", - "value": 10 - }, - "lock_present": false, - "bootup_state": { - "hex": "0002", - "name": "Unknown", - "value": 2 - }, - "power_state": { - "hex": "0002", - "name": "Unknown", - "value": 2 - }, - "thermal_state": { - "hex": "0002", - "name": "Unknown", - "value": 2 - }, - "security_state": { - "hex": "0002", - "name": "Unknown", - "value": 2 - }, - "oem": "0x0" - } - ], + "chassis": { + "handle": 768, + "manufacturer": "Dell Inc.", + "version": "", + "chassis_type": { + "hex": "000a", + "name": "Notebook", + "value": 10 + }, + "lock_present": false, + "bootup_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "power_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "thermal_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "security_state": { + "hex": "0003", + "name": "None", + "value": 3 + }, + "oem": "0x0" + }, "config": { - "handle": 49 + "handle": 3072, + "options": [ + "J6H1:1-X Boot with Default; J8H1:1-X BIOS RECOVERY" + ] }, "group_associations": [ { - "handle": 59, - "power": { - "hex": "0000", - "name": "Disabled", - "value": 0 - }, - "keyboard": { - "hex": "0002", - "name": "Not Implemented", - "value": 2 - }, - "admin": { - "hex": "0000", - "name": "Disabled", - "value": 0 - }, - "reset": { - "hex": "0002", - "name": "Not Implemented", - "value": 2 - } - }, - { - "handle": 61, + "handle": 3584, "name": "$MEI", "handles": [ 0 ] + }, + { + "handle": 3585, + "name": "Firmware Version Info", + "handles": [ + 225404178713856, + 225408473681153, + 225412768648450, + 225417063615747, + 225421358583044, + 225425653550341, + 52486 + ] } ], "language": [ { - "handle": 50, + "handle": 3328, "languages": [ - "en-US" + "enUS" ] } ], "memory_array": [ { - "handle": 3, + "handle": 4096, "location": { "hex": "0003", "name": "Motherboard", @@ -4715,36 +6023,36 @@ "name": "None", "value": 3 }, - "max_size": "0x4000000", + "max_size": 16777216, "error_handle": 65534, "slots": 8 } ], "memory_array_mapped_address": [ { - "handle": 12, - "array_handle": 3, - "start_address": "0x0", - "end_address": "0x1000000000", + "handle": 4864, + "array_handle": 4096, + "start_address": 0, + "end_address": 17179869184, "part_width": 8 } ], "memory_device": [ { - "handle": 4, - "location": "Controller0-ChannelA-DIMM0", + "handle": 4352, + "location": "Motherboard", "bank_location": "BANK 0", - "manufacturer": "Micron Technology", - "part_number": "RMCA1000MBC2JDF-7500", - "array_handle": 3, + "manufacturer": "", + "part_number": "MT62F1G64D8CH-031", + "array_handle": 4096, "error_handle": 65534, - "width": 16, + "width": 64, "ecc_bits": 0, - "size": 8388608, + "size": 2097152, "form_factor": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "000b", + "name": "Row of Chips", + "value": 11 }, "set": 0, "memory_type": { @@ -4755,23 +6063,23 @@ "memory_type_details": [ "Synchronous" ], - "speed": 7467 + "speed": 6400 }, { - "handle": 5, - "location": "Controller0-ChannelB-DIMM0", + "handle": 4353, + "location": "Motherboard", "bank_location": "BANK 1", - "manufacturer": "Micron Technology", - "part_number": "RMCA1000MBC2JDF-7500", - "array_handle": 3, + "manufacturer": "", + "part_number": "MT62F1G64D8CH-031", + "array_handle": 4096, "error_handle": 65534, - "width": 16, + "width": 64, "ecc_bits": 0, - "size": 8388608, + "size": 2097152, "form_factor": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "000b", + "name": "Row of Chips", + "value": 11 }, "set": 0, "memory_type": { @@ -4782,23 +6090,23 @@ "memory_type_details": [ "Synchronous" ], - "speed": 7467 + "speed": 6400 }, { - "handle": 6, - "location": "Controller0-ChannelC-DIMM0", + "handle": 4354, + "location": "Motherboard", "bank_location": "BANK 2", - "manufacturer": "Micron Technology", - "part_number": "RMCA1000MBC2JDF-7500", - "array_handle": 3, + "manufacturer": "", + "part_number": "MT62F1G64D8CH-031", + "array_handle": 4096, "error_handle": 65534, - "width": 16, + "width": 64, "ecc_bits": 0, - "size": 8388608, + "size": 2097152, "form_factor": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "000b", + "name": "Row of Chips", + "value": 11 }, "set": 0, "memory_type": { @@ -4809,23 +6117,23 @@ "memory_type_details": [ "Synchronous" ], - "speed": 7467 + "speed": 6400 }, { - "handle": 7, - "location": "Controller0-ChannelD-DIMM0", + "handle": 4355, + "location": "Motherboard", "bank_location": "BANK 3", - "manufacturer": "Micron Technology", - "part_number": "RMCA1000MBC2JDF-7500", - "array_handle": 3, + "manufacturer": "", + "part_number": "MT62F1G64D8CH-031", + "array_handle": 4096, "error_handle": 65534, - "width": 16, + "width": 64, "ecc_bits": 0, - "size": 8388608, + "size": 2097152, "form_factor": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "000b", + "name": "Row of Chips", + "value": 11 }, "set": 0, "memory_type": { @@ -4836,23 +6144,23 @@ "memory_type_details": [ "Synchronous" ], - "speed": 7467 + "speed": 6400 }, { - "handle": 8, - "location": "Controller1-ChannelA-DIMM0", + "handle": 4356, + "location": "Motherboard", "bank_location": "BANK 0", - "manufacturer": "Micron Technology", - "part_number": "RMCA1000MBC2JDF-7500", - "array_handle": 3, + "manufacturer": "", + "part_number": "MT62F1G64D8CH-031", + "array_handle": 4096, "error_handle": 65534, - "width": 16, + "width": 64, "ecc_bits": 0, - "size": 8388608, + "size": 2097152, "form_factor": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "000b", + "name": "Row of Chips", + "value": 11 }, "set": 0, "memory_type": { @@ -4863,23 +6171,23 @@ "memory_type_details": [ "Synchronous" ], - "speed": 7467 + "speed": 6400 }, { - "handle": 9, - "location": "Controller1-ChannelB-DIMM0", + "handle": 4357, + "location": "Motherboard", "bank_location": "BANK 1", - "manufacturer": "Micron Technology", - "part_number": "RMCA1000MBC2JDF-7500", - "array_handle": 3, + "manufacturer": "", + "part_number": "MT62F1G64D8CH-031", + "array_handle": 4096, "error_handle": 65534, - "width": 16, + "width": 64, "ecc_bits": 0, - "size": 8388608, + "size": 2097152, "form_factor": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "000b", + "name": "Row of Chips", + "value": 11 }, "set": 0, "memory_type": { @@ -4890,23 +6198,23 @@ "memory_type_details": [ "Synchronous" ], - "speed": 7467 + "speed": 6400 }, { - "handle": 10, - "location": "Controller1-ChannelC-DIMM0", + "handle": 4358, + "location": "Motherboard", "bank_location": "BANK 2", - "manufacturer": "Micron Technology", - "part_number": "RMCA1000MBC2JDF-7500", - "array_handle": 3, + "manufacturer": "", + "part_number": "MT62F1G64D8CH-031", + "array_handle": 4096, "error_handle": 65534, - "width": 16, + "width": 64, "ecc_bits": 0, - "size": 8388608, + "size": 2097152, "form_factor": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "000b", + "name": "Row of Chips", + "value": 11 }, "set": 0, "memory_type": { @@ -4917,23 +6225,23 @@ "memory_type_details": [ "Synchronous" ], - "speed": 7467 + "speed": 6400 }, { - "handle": 11, - "location": "Controller1-ChannelD-DIMM0", + "handle": 4359, + "location": "Motherboard", "bank_location": "BANK 3", - "manufacturer": "Micron Technology", - "part_number": "RMCA1000MBC2JDF-7500", - "array_handle": 3, + "manufacturer": "", + "part_number": "MT62F1G64D8CH-031", + "array_handle": 4096, "error_handle": 65534, - "width": 16, + "width": 64, "ecc_bits": 0, - "size": 8388608, + "size": 2097152, "form_factor": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "000b", + "name": "Row of Chips", + "value": 11 }, "set": 0, "memory_type": { @@ -4944,158 +6252,38 @@ "memory_type_details": [ "Synchronous" ], - "speed": 7467 - } - ], - "memory_error": [ - { - "handle": 63, - "error_type": { - "hex": "0003", - "name": "OK", - "value": 3 - }, - "granularity": { - "hex": "0002", - "name": "Unknown", - "value": 2 - }, - "operation": { - "hex": "0002", - "name": "Unknown", - "value": 2 - }, - "syndrome": 0, - "array_address": "0x80000000", - "device_address": "0x80000000", - "range": 2147483648 + "speed": 6400 } ], "pointing_device": [ { - "handle": 64, - "mouse_type": { - "hex": "0005", - "name": "Track Point", - "value": 5 - }, - "interface": { - "hex": "0004", - "name": "PS/2", - "value": 4 - }, - "buttons": 3 - }, - { - "handle": 65, + "handle": 5376, "mouse_type": { "hex": "0007", "name": "Touch Pad", "value": 7 }, "interface": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "0007", + "name": "Bus Mouse", + "value": 7 }, "buttons": 2 } ], - "port_connector": [ + "power_controls": [ { - "handle": 32, - "port_type": { - "hex": "0010", - "name": "USB", - "value": 16 - }, - "internal_reference_designator": "Not Available", - "external_connector_type": { - "hex": "0012", - "name": "Access Bus [USB]", - "value": 18 - }, - "external_reference_designator": "USB 1" - }, - { - "handle": 33, - "port_type": { - "hex": "0010", - "name": "USB", - "value": 16 - }, - "internal_reference_designator": "Not Available", - "external_connector_type": { - "hex": "0012", - "name": "Access Bus [USB]", - "value": 18 - }, - "external_reference_designator": "USB 2" - }, - { - "handle": 34, - "port_type": { - "hex": "0010", - "name": "USB", - "value": 16 - }, - "internal_reference_designator": "Not Available", - "external_connector_type": { - "hex": "0012", - "name": "Access Bus [USB]", - "value": 18 - }, - "external_reference_designator": "USB 3" - }, - { - "handle": 35, - "port_type": { - "hex": "0010", - "name": "USB", - "value": 16 - }, - "internal_reference_designator": "Not Available", - "external_connector_type": { - "hex": "0012", - "name": "Access Bus [USB]", - "value": 18 - }, - "external_reference_designator": "USB 4" - }, - { - "handle": 42, - "port_type": { - "hex": "001c", - "name": "Video Port", - "value": 28 - }, - "internal_reference_designator": "Not Available", - "external_connector_type": { - "hex": "00ff", - "name": "Other", - "value": 255 - }, - "external_reference_designator": "Hdmi1" - }, - { - "handle": 46, - "port_type": { - "hex": "001d", - "name": "Audio Port", - "value": 29 - }, - "internal_reference_designator": "Not Available", - "external_connector_type": { - "hex": "001f", - "name": "Mini-jack [headphones]", - "value": 31 - }, - "external_reference_designator": "Headphone/Microphone Combo Jack1" + "handle": 6400, + "month": 0, + "day": 0, + "hour": 0, + "minute": 0, + "second": 0 } ], "processor": [ { - "handle": 27, + "handle": 1024, "socket": "U3E1", "socket_type": { "hex": "0001", @@ -5104,17 +6292,17 @@ }, "socket_populated": true, "manufacturer": "Intel(R) Corporation", - "version": "Intel(R) Core(TM) Ultra 7 155H", - "part": "None", + "version": "12th Gen Intel(R) Core(TM) i7-1250U", + "part": "", "processor_type": { "hex": "0003", "name": "CPU", "value": 3 }, "processor_family": { - "hex": "0001", + "hex": "00c6", "name": "Other", - "value": 1 + "value": 198 }, "processor_status": { "hex": "0001", @@ -5122,25 +6310,25 @@ "value": 1 }, "clock_ext": 100, - "clock_max": 4800, - "cache_handle_l1": 24, - "cache_handle_l2": 25, - "cache_handle_l3": 26 + "clock_max": 4700, + "cache_handle_l1": 1797, + "cache_handle_l2": 1798, + "cache_handle_l3": 1799 } ], "slot": [ { - "handle": 48, - "designation": "SimCard Slot", + "handle": 2304, + "designation": "PCI-Express 0", "slot_type": { - "hex": "0001", + "hex": "00a5", "name": "Other", - "value": 1 + "value": 165 }, "bus_width": { - "hex": "0001", + "hex": "0008", "name": "Other", - "value": 1 + "value": 8 }, "usage": { "hex": "0003", @@ -5148,18 +6336,113 @@ "value": 3 }, "length": { - "hex": "0001", - "name": "Other", - "value": 1 + "hex": "0004", + "name": "Long", + "value": 4 }, - "id": 0 + "id": 0, + "features": [ + "3.3 V", + "PME#", + "Hot-Plug" + ] + }, + { + "handle": 2305, + "designation": "PCI-Express 1", + "slot_type": { + "hex": "00a5", + "name": "Other", + "value": 165 + }, + "bus_width": { + "hex": "0008", + "name": "Other", + "value": 8 + }, + "usage": { + "hex": "0003", + "name": "Available", + "value": 3 + }, + "length": { + "hex": "0004", + "name": "Long", + "value": 4 + }, + "id": 1, + "features": [ + "3.3 V", + "PME#", + "Hot-Plug" + ] + }, + { + "handle": 2306, + "designation": "PCI-Express 2", + "slot_type": { + "hex": "00a5", + "name": "Other", + "value": 165 + }, + "bus_width": { + "hex": "0008", + "name": "Other", + "value": 8 + }, + "usage": { + "hex": "0003", + "name": "Available", + "value": 3 + }, + "length": { + "hex": "0004", + "name": "Long", + "value": 4 + }, + "id": 2, + "features": [ + "3.3 V", + "PME#", + "Hot-Plug" + ] + }, + { + "handle": 2307, + "designation": "PCI-Express 3", + "slot_type": { + "hex": "00a5", + "name": "Other", + "value": 165 + }, + "bus_width": { + "hex": "0008", + "name": "Other", + "value": 8 + }, + "usage": { + "hex": "0003", + "name": "Available", + "value": 3 + }, + "length": { + "hex": "0004", + "name": "Long", + "value": 4 + }, + "id": 3, + "features": [ + "3.3 V", + "PME#", + "Hot-Plug" + ] } ], "system": { - "handle": 29, - "manufacturer": "LENOVO", - "product": "21KVCTO1WW", - "version": "ThinkPad P1 Gen 7", + "handle": 256, + "manufacturer": "Dell Inc.", + "product": "XPS 9315", + "version": "", "wake_up": { "hex": "0006", "name": "Power Switch", diff --git a/machines/blocktech/pkunis.home.nix b/machines/sue/pim.home.nix similarity index 66% rename from machines/blocktech/pkunis.home.nix rename to machines/sue/pim.home.nix index 808129b..3664f01 100644 --- a/machines/blocktech/pkunis.home.nix +++ b/machines/sue/pim.home.nix @@ -1,54 +1,43 @@ { - lib, self, pkgs, config, ... -}: let - inherit (self.packages.${pkgs.system}) neovim; -in { +}: { config = { pim = { - tidal.enable = false; + tidal.enable = true; gnome.enable = true; vscode.enable = true; syncthing.enable = true; + neovim.enable = true; firefox.enable = true; }; - programs = { - chromium.enable = true; - git.extraConfig.core.editor = lib.getExe neovim; - }; + programs.chromium.enable = true; home = { - username = "pkunis"; - homeDirectory = "/home/pkunis"; + username = "pim"; + homeDirectory = "/home/pim"; stateVersion = "23.05"; - sessionVariables = { - MANPAGER = "${lib.getExe neovim} +Man!"; - EDITOR = lib.getExe neovim; - }; }; sops = { - defaultSopsFile = "${self}/secrets/blocktech/pkunis.yaml"; + defaultSopsFile = "${self}/secrets/sue/pim.yaml"; age.keyFile = "${config.xdg.configHome}/sops/age/keys.txt"; secrets."keepassxc".path = "${config.xdg.configHome}/keepassxc/keepassxc.ini"; }; home.packages = - [self.packages.${pkgs.system}.neovim] - ++ (with pkgs; [ + (with pkgs; [ jellyfin-media-player virt-manager - bottles-unwrapped - feishin ]) ++ (with pkgs.unstable; [ attic-client dbeaver-bin devenv + bottles-unwrapped gimp hexchat impression @@ -57,6 +46,7 @@ in { krita libreoffice # logseq # Has insecure electron dependency + moonlight-qt nicotine-plus qFlipper signal-desktop @@ -67,6 +57,7 @@ in { wireshark # nheko # Has insecure olm dependency handbrake + feishin redfishtool ]); }; diff --git a/machines/warwick/configuration.nix b/machines/warwick/configuration.nix index 9d60370..3e3052b 100644 --- a/machines/warwick/configuration.nix +++ b/machines/warwick/configuration.nix @@ -3,9 +3,7 @@ config, inputs, ... -}: let - gatusPort = 8080; -in { +}: { imports = [inputs.nixos-hardware.nixosModules.raspberry-pi-4]; config = { @@ -37,289 +35,5 @@ in { fsType = "ext4"; options = ["noatime"]; }; - - networking.firewall.allowedTCPPorts = [gatusPort]; - - services.gatus = { - enable = true; - environmentFile = config.sops.secrets."gatus/env".path; - - settings = { - maintenance = { - start = "00:00"; - duration = "5h"; - timezone = "Europe/Amsterdam"; - }; - - alerting = let - default-alert = { - enabled = true; - failure-threshold = 2; - success-threshold = 1; - send-on-resolved = true; - }; - in { - email = { - from = "gatus@kun.is"; - host = "mail.smtp2go.com"; - port = 2525; - to = "pim@kunis.nl"; - client.insecure = true; - username = "$SMTP_USERNAME"; - password = "$SMTP_PASSWORD"; - click = "http://warwick:${toString gatusPort}"; - inherit default-alert; - }; - - ntfy = { - url = "https://ntfy.kun.is"; - token = "$NTFY_ACCESS_TOKEN"; - topic = "gatus"; - inherit default-alert; - }; - }; - - web.port = gatusPort; - endpoints = let - status = code: "[STATUS] == ${toString code}"; - bodyContains = text: "[BODY] == pat(*${text}*)"; - maxResponseTime = ms: "[RESPONSE_TIME] < ${toString ms}"; - serviceEndpoints = [ - { - name = "Blog"; - url = "https://pim.kun.is"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "Cyberchef"; - url = "https://cyberchef.kun.is"; - conditions = [ - (status 200) - (maxResponseTime 300) - (bodyContains "CyberChef - The Cyber Swiss Army Knife") - ]; - } - { - name = "HedgeDoc"; - url = "https://md.kun.is/status"; - conditions = [ - (status 200) - (maxResponseTime 300) - "[BODY].notesCount > 0" - ]; - } - { - name = "Forgejo"; - url = "https://git.kun.is"; - conditions = [ - (status 200) - (maxResponseTime 300) - (bodyContains "Forgejo: Beyond coding. We forge.") - ]; - } - { - name = "Authentik"; - url = "https://authentik.kun.is/-/health/live/"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "Ntfy"; - url = "https://ntfy.kun.is"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "Jellyfin"; - url = "https://media.kun.is/health"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "Attic"; - url = "https://attic.kun.is"; - conditions = [ - (status 200) - (bodyContains "attic push") - (maxResponseTime 300) - ]; - } - { - name = "Esrom"; - url = "https://esrom.kun.is/seinlamp"; - conditions = [ - (status 200) - (bodyContains "Welcome to") - (maxResponseTime 300) - ]; - } - { - name = "Atuin"; - url = "https://atuin.kun.is"; - conditions = [ - (status 200) - (maxResponseTime 300) - "[BODY].total_history > 0" - ]; - } - { - name = "KitchenOwl"; - url = "https://boodschappen.kun.is"; - conditions = [ - (status 200) - (maxResponseTime 300) - (bodyContains "KitchenOwl") - ]; - } - { - name = "Inbucket"; - url = "https://inbucket.griffin-mermaid.ts.net/status"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "FreshRSS"; - url = "https://freshrss.griffin-mermaid.ts.net/i"; - conditions = [ - (status 401) - (maxResponseTime 300) - ]; - } - { - name = "Paperless-ngx"; - url = "https://paperless.griffin-mermaid.ts.net/accounts/login/"; - conditions = [ - (status 200) - (maxResponseTime 300) - (bodyContains "Please sign in.") - ]; - } - { - name = "Jellyseerr"; - url = "https://jellyseerr.griffin-mermaid.ts.net/login"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "Radarr"; - url = "https://radarr.griffin-mermaid.ts.net"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "Sonarr"; - url = "https://sonarr.griffin-mermaid.ts.net/login"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "Bazarr"; - url = "https://bazarr.griffin-mermaid.ts.net/system/status"; - conditions = [ - (status 200) - (maxResponseTime 300) - (bodyContains "Bazarr") - ]; - } - { - name = "Prowlarr"; - url = "https://prowlarr.griffin-mermaid.ts.net/login"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "Deluge"; - url = "https://deluge.griffin-mermaid.ts.net"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "SyncThing"; - url = "https://syncthing.griffin-mermaid.ts.net/"; - conditions = [ - (status 200) - (maxResponseTime 300) - ]; - } - { - name = "Radicale"; - url = "https://radicale.griffin-mermaid.ts.net/.web/"; - conditions = [ - (status 200) - (maxResponseTime 300) - (bodyContains "Sign in") - ]; - } - { - name = "Nextcloud"; - url = "https://nextcloud.griffin-mermaid.ts.net/status.php"; - conditions = [ - (status 200) - (maxResponseTime 300) - "[BODY].installed == true" - "[BODY].maintenance == false" - "[BODY].needsDbUpgrade == false" - ]; - } - { - name = "kms"; - url = "tcp://kms.kun.is:1688"; - conditions = [ - "[CONNECTED] == true" - ]; - } - { - name = "BIND"; - url = "192.168.30.134"; - dns = { - query-type = "SOA"; - query-name = "kun.is"; - }; - conditions = [ - "[DNS_RCODE] == NOERROR" - ]; - } - { - name = "Immich"; - url = "https://immich.griffin-mermaid.ts.net"; - conditions = [ - (status 200) - (maxResponseTime 300) - (bodyContains "To use Immich, you must enable JavaScript or use a JavaScript compatible browser.") - ]; - } - ]; - in - map - (endpoint: - endpoint - // { - interval = "5m"; - alerts = [{type = "email";} {type = "ntfy";}]; - }) - serviceEndpoints; - }; - }; }; } diff --git a/machines/warwick/facter.json b/machines/warwick/facter.json index 58c4e41..b30a26a 100644 --- a/machines/warwick/facter.json +++ b/machines/warwick/facter.json @@ -7,12 +7,7 @@ { "index": 8, "attached_to": 0, - "class_list": [ - "pci", - "bridge" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -21,31 +16,25 @@ "number": 0 }, "base_class": { - "hex": "0006", "name": "Bridge", "value": 6 }, "sub_class": { - "hex": "0004", "name": "PCI bridge", "value": 4 }, "pci_interface": { - "hex": "0000", "name": "Normal decode", "value": 0 }, "vendor": { - "hex": "14e4", "name": "Broadcom", "value": 5348 }, "device": { - "hex": "2711", "value": 10001 }, "revision": { - "hex": "0020", "value": 32 }, "model": "Broadcom PCI bridge", @@ -54,7 +43,7 @@ "resources": [ { "type": "irq", - "base": 35, + "base": 30, "triggered": 0, "enabled": true } @@ -64,7 +53,7 @@ "command": 6, "header_type": 1, "secondary_bus": 1, - "irq": 35, + "irq": 30, "prog_if": 0 }, "driver": "pcieport", @@ -93,24 +82,366 @@ "fpu": false, "fpu_exception": false, "write_protect": false, - "address_sizes": { - "physical": "0x0", - "virtual": "0x0" - } + "address_sizes": {} } ], "disk": [ { - "index": 15, - "attached_to": 7, - "class_list": [ - "disk", - "usb", - "scsi", - "block_device" + "index": 14, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram2", + "unix_device_name": "/dev/ram2", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 2, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram2" ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 15, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram0", + "unix_device_name": "/dev/ram0", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 0, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram0" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 16, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram9", + "unix_device_name": "/dev/ram9", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 9, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram9" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 17, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram14", + "unix_device_name": "/dev/ram14", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 14, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram14" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 18, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram7", + "unix_device_name": "/dev/ram7", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 7, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram7" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 19, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram12", + "unix_device_name": "/dev/ram12", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 12, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram12" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 20, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram5", + "unix_device_name": "/dev/ram5", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 5, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram5" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 21, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram10", + "unix_device_name": "/dev/ram10", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 10, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram10" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 22, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram3", + "unix_device_name": "/dev/ram3", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 3, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram3" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 23, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram1", + "unix_device_name": "/dev/ram1", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 1, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram1" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 24, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram15", + "unix_device_name": "/dev/ram15", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 15, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram15" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 25, + "attached_to": 7, "bus_type": { - "hex": "0084", "name": "SCSI", "value": 132 }, @@ -119,27 +450,22 @@ "number": 0 }, "base_class": { - "hex": "0106", "name": "Mass Storage Device", "value": 262 }, "sub_class": { - "hex": "0000", "name": "Disk", "value": 0 }, "vendor": { - "hex": "090c", "name": "Samsung", "value": 2316 }, "device": { - "hex": "1000", "name": "Flash Drive", "value": 4096 }, "revision": { - "hex": "0000", "name": "1100", "value": 0 }, @@ -156,6 +482,7 @@ "range": 16 }, "unix_device_names": [ + "/dev/disk/by-diskseq/25", "/dev/disk/by-id/usb-Samsung_Flash_Drive_0374021110005452-0:0", "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usb-0:1:1.0-scsi-0:0:0:0", "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usbv3-0:1:1.0-scsi-0:0:0:0", @@ -174,7 +501,7 @@ "cylinders": 61188, "heads": 64, "sectors": 32, - "size": "0x0", + "size": 0, "geo_type": "logical" }, { @@ -185,23 +512,182 @@ } ], "driver": "usb-storage", + "driver_module": "usb_storage", "drivers": [ "sd", "usb-storage" ], + "driver_modules": [ + "usb_storage" + ], "module_alias": "usb:v090Cp1000d1100dc00dsc00dp00ic08isc06ip50in00" + }, + { + "index": 26, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram8", + "unix_device_name": "/dev/ram8", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 8, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram8" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 27, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram13", + "unix_device_name": "/dev/ram13", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 13, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram13" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 28, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram6", + "unix_device_name": "/dev/ram6", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 6, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram6" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 29, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram11", + "unix_device_name": "/dev/ram11", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 11, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram11" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] + }, + { + "index": 30, + "attached_to": 0, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/ram4", + "unix_device_name": "/dev/ram4", + "unix_device_number": { + "type": 98, + "major": 1, + "minor": 4, + "range": 1 + }, + "unix_device_names": [ + "/dev/ram4" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 8192, + "value_2": 512 + } + ] } ], "hub": [ { - "index": 17, + "index": 32, "attached_to": 7, - "class_list": [ - "usb", - "hub" - ], "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -210,27 +696,23 @@ "number": 0 }, "base_class": { - "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "hex": "1d6b", - "name": "Linux 6.13.12 xhci-hcd", + "name": "Linux 6.1.63 xhci-hcd", "value": 7531 }, "device": { - "hex": "0002", "name": "xHCI Host Controller", "value": 2 }, "revision": { - "hex": "0000", - "name": "6.13", + "name": "6.01", "value": 0 }, "serial": "0000:01:00.0", - "model": "Linux 6.13.12 xhci-hcd xHCI Host Controller", + "model": "Linux 6.1.63 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ @@ -245,23 +727,19 @@ ], "detail": { "device_class": { - "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 1, "interface_class": { - "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, @@ -271,20 +749,19 @@ }, "hotplug": "usb", "driver": "hub", + "driver_module": "usbcore", "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0613dc09dsc00dp01ic09isc00ip00in00" + "driver_modules": [ + "usbcore" + ], + "module_alias": "usb:v1D6Bp0002d0601dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 18, - "attached_to": 17, - "class_list": [ - "usb", - "hub" - ], + "index": 33, + "attached_to": 32, "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -293,21 +770,17 @@ "number": 0 }, "base_class": { - "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "hex": "2109", "value": 8457 }, "device": { - "hex": "3431", "name": "USB2.0 Hub", "value": 13361 }, "revision": { - "hex": "0000", "name": "4.21", "value": 0 }, @@ -326,23 +799,19 @@ ], "detail": { "device_class": { - "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 1, "interface_class": { - "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, @@ -352,20 +821,19 @@ }, "hotplug": "usb", "driver": "hub", + "driver_module": "usbcore", "drivers": [ "hub" ], + "driver_modules": [ + "usbcore" + ], "module_alias": "usb:v2109p3431d0421dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 19, + "index": 34, "attached_to": 7, - "class_list": [ - "usb", - "hub" - ], "bus_type": { - "hex": "0086", "name": "USB", "value": 134 }, @@ -374,48 +842,40 @@ "number": 0 }, "base_class": { - "hex": "010a", "name": "Hub", "value": 266 }, "vendor": { - "hex": "1d6b", - "name": "Linux 6.13.12 xhci-hcd", + "name": "Linux 6.1.63 xhci-hcd", "value": 7531 }, "device": { - "hex": "0003", "name": "xHCI Host Controller", "value": 3 }, "revision": { - "hex": "0000", - "name": "6.13", + "name": "6.01", "value": 0 }, "serial": "0000:01:00.0", - "model": "Linux 6.13.12 xhci-hcd xHCI Host Controller", + "model": "Linux 6.1.63 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { "device_class": { - "hex": "0009", "name": "hub", "value": 9 }, "device_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, "device_protocol": 3, "interface_class": { - "hex": "0009", "name": "hub", "value": 9 }, "interface_subclass": { - "hex": "0000", "name": "per_interface", "value": 0 }, @@ -425,26 +885,25 @@ }, "hotplug": "usb", "driver": "hub", + "driver_module": "usbcore", "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0613dc09dsc00dp03ic09isc00ip00in00" + "driver_modules": [ + "usbcore" + ], + "module_alias": "usb:v1D6Bp0003d0601dc09dsc00dp03ic09isc00ip00in00" } ], "memory": [ { "index": 6, "attached_to": 0, - "class_list": [ - "memory" - ], "base_class": { - "hex": "0101", "name": "Internally Used Class", "value": 257 }, "sub_class": { - "hex": "0002", "name": "Main Memory", "value": 2 }, @@ -453,7 +912,7 @@ { "type": "mem", "base": 0, - "range": 3932459008, + "range": 3964207104, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -467,13 +926,9 @@ ], "mmc_controller": [ { - "index": 14, + "index": 10, "attached_to": 0, - "class_list": [ - "mmc_controller" - ], "bus_type": { - "hex": "0093", "name": "MMC", "value": 147 }, @@ -482,56 +937,34 @@ "number": 1 }, "base_class": { - "hex": "0117", "name": "MMC Controller", "value": 279 }, "vendor": "", "device": "SDIO Controller 1", "model": "SDIO Controller 1", - "sysfs_id": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001", "sysfs_bus_id": "mmc1:0001" } ], "network_controller": [ { - "index": 10, + "index": 9, "attached_to": 0, - "class_list": [ - "network_controller", - "wlan_card" - ], - "bus_type": { - "hex": "0094", - "name": "SDIO", - "value": 148 - }, - "slot": { - "bus": 0, - "number": 0 - }, "base_class": { - "hex": "0002", "name": "Network controller", "value": 2 }, "sub_class": { - "hex": "0082", "name": "WLAN controller", "value": 130 }, - "vendor": { - "hex": "02d0", - "name": "Broadcom Corp.", - "value": 720 - }, "device": { - "hex": "a9a6", - "name": "BCM43438 combo WLAN and Bluetooth Low Energy (BLE)", - "value": 43430 + "name": "ARM Ethernet controller", + "value": 0 }, - "model": "Broadcom BCM43438 combo WLAN and Bluetooth Low Energy (BLE)", - "sysfs_id": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001/mmc1:0001:1", + "model": "ARM Ethernet controller", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1", "sysfs_bus_id": "mmc1:0001:1", "unix_device_name": "wlan0", "unix_device_names": [ @@ -560,9 +993,16 @@ "9", "10", "11", + "12", + "13", + "14", + "34", "36", + "38", "40", + "42", "44", + "46", "48", "52", "56", @@ -573,14 +1013,7 @@ "108", "112", "116", - "120", - "124", - "128", - "132", - "136", - "140", - "144", - "149" + "120" ], "frequencies": [ "2.412", @@ -594,9 +1027,16 @@ "2.452", "2.457", "2.462", + "2.467", + "2.472", + "2.484", + "5.17", "5.18", + "5.19", "5.2", + "5.21", "5.22", + "5.23", "5.24", "5.26", "5.28", @@ -607,14 +1047,7 @@ "5.54", "5.56", "5.58", - "5.6", - "5.62", - "5.64", - "5.66", - "5.68", - "5.7", - "5.72", - "5.745" + "5.6" ], "auth_modes": [ "open", @@ -640,71 +1073,60 @@ "brcmfmac", "brcmfmac" ], - "module_alias": "sdio:c00v02D0dA9A6" + "module_alias": "of:NmmcnrT(null)Cbrcm,bcm2835-mmcCbrcm,bcm2835-sdhci" }, { "index": 12, - "attached_to": 0, - "class_list": [ - "network_controller" - ], + "attached_to": 10, + "bus_type": { + "name": "SDIO", + "value": 148 + }, + "slot": { + "bus": 0, + "number": 0 + }, "base_class": { - "hex": "0002", "name": "Network controller", "value": 2 }, "sub_class": { - "hex": "0000", - "name": "Ethernet controller", - "value": 0 + "name": "Network controller", + "value": 128 + }, + "vendor": { + "name": "Broadcom Corp.", + "value": 720 }, "device": { - "hex": "0000", - "name": "ARM Ethernet controller", - "value": 0 + "name": "BCM43430 WLAN card", + "value": 43430 }, - "model": "ARM Ethernet controller", - "sysfs_id": "/devices/platform/scb/fd580000.ethernet", - "sysfs_bus_id": "fd580000.ethernet", - "unix_device_name": "end0", - "unix_device_names": [ - "end0" - ], - "resources": [ - { - "type": "hwaddr", - "address": 100 - }, - { - "type": "phwaddr", - "address": 100 - } - ], - "driver": "bcmgenet", - "driver_module": "genet", + "model": "Broadcom BCM43430 WLAN card", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1", + "sysfs_bus_id": "mmc1:0001:1", + "driver": "brcmfmac", + "driver_module": "brcmfmac", "drivers": [ - "bcmgenet" + "brcmfmac" ], "driver_modules": [ - "genet" + "brcmfmac", + "brcmfmac", + "brcmfmac" ], - "module_alias": "of:NethernetT(null)Cbrcm,bcm2711-genet-v5" + "module_alias": "sdio:c00v02D0dA9A6" } ], "network_interface": [ { - "index": 20, - "attached_to": 12, - "class_list": [ - "network_interface" - ], + "index": 36, + "attached_to": 0, "base_class": { - "hex": "0107", "name": "Network Interface", "value": 263 }, "sub_class": { - "hex": "0001", "name": "Ethernet", "value": 1 }, @@ -726,33 +1148,42 @@ } ], "driver": "bcmgenet", - "driver_module": "genet", "drivers": [ "bcmgenet" - ], - "driver_modules": [ - "genet" ] }, { - "index": 21, - "attached_to": 10, - "class_list": [ - "network_interface" - ], + "index": 37, + "attached_to": 0, + "base_class": { + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] + }, + { + "index": 38, + "attached_to": 9, "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/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001/mmc1:0001:1", + "sysfs_device_link": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1", "unix_device_name": "wlan0", "unix_device_names": [ "wlan0" @@ -777,41 +1208,14 @@ "brcmfmac", "brcmfmac" ] - }, - { - "index": 22, - "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" - ] } ], "system": {}, "unknown": [ { - "index": 9, - "attached_to": 0, - "class_list": [ - "unknown" - ], + "index": 11, + "attached_to": 10, "bus_type": { - "hex": "0094", "name": "SDIO", "value": 148 }, @@ -820,38 +1224,30 @@ "number": 0 }, "base_class": { - "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { - "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { - "hex": "02d0", "name": "Broadcom Corp.", "value": 720 }, "device": { - "hex": "a9a6", - "name": "BCM43438 combo WLAN and Bluetooth Low Energy (BLE)", + "name": "BCM43430 WLAN card", "value": 43430 }, - "model": "Broadcom BCM43438 combo WLAN and Bluetooth Low Energy (BLE)", - "sysfs_id": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001/mmc1:0001:3", + "model": "Broadcom BCM43430 WLAN card", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:3", "sysfs_bus_id": "mmc1:0001:3", "module_alias": "sdio:c02v02D0dA9A6" }, { - "index": 11, - "attached_to": 0, - "class_list": [ - "unknown" - ], + "index": 13, + "attached_to": 10, "bus_type": { - "hex": "0094", "name": "SDIO", "value": 148 }, @@ -860,27 +1256,23 @@ "number": 0 }, "base_class": { - "hex": "0000", "name": "Unclassified device", "value": 0 }, "sub_class": { - "hex": "0000", "name": "Unclassified device", "value": 0 }, "vendor": { - "hex": "02d0", "name": "Broadcom Corp.", "value": 720 }, "device": { - "hex": "a9a6", - "name": "BCM43438 combo WLAN and Bluetooth Low Energy (BLE)", + "name": "BCM43430 WLAN card", "value": 43430 }, - "model": "Broadcom BCM43438 combo WLAN and Bluetooth Low Energy (BLE)", - "sysfs_id": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001/mmc1:0001:2", + "model": "Broadcom BCM43430 WLAN card", + "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:2", "sysfs_bus_id": "mmc1:0001:2", "driver": "brcmfmac", "driver_module": "brcmfmac", @@ -899,12 +1291,7 @@ { "index": 7, "attached_to": 8, - "class_list": [ - "usb_controller", - "pci" - ], "bus_type": { - "hex": "0004", "name": "PCI", "value": 4 }, @@ -913,37 +1300,29 @@ "number": 0 }, "base_class": { - "hex": "000c", "name": "Serial bus controller", "value": 12 }, "sub_class": { - "hex": "0003", "name": "USB Controller", "value": 3 }, "pci_interface": { - "hex": "0030", "value": 48 }, "vendor": { - "hex": "1106", "value": 4358 }, "sub_vendor": { - "hex": "1106", "value": 4358 }, "device": { - "hex": "3483", "value": 13443 }, "sub_device": { - "hex": "3483", "value": 13443 }, "revision": { - "hex": "0001", "value": 1 }, "model": "USB Controller", @@ -952,7 +1331,7 @@ "resources": [ { "type": "irq", - "base": 36, + "base": 37, "triggered": 0, "enabled": true }, @@ -970,64 +1349,18 @@ "command": 1350, "header_type": 0, "secondary_bus": 0, - "irq": 36, + "irq": 37, "prog_if": 48 }, "driver": "xhci_hcd", + "driver_module": "xhci_pci", "drivers": [ "xhci_hcd" ], + "driver_modules": [ + "xhci_pci" + ], "module_alias": "pci:v00001106d00003483sv00001106sd00003483bc0Csc03i30" - }, - { - "index": 13, - "attached_to": 0, - "class_list": [ - "usb_controller" - ], - "base_class": { - "hex": "000c", - "name": "Serial bus controller", - "value": 12 - }, - "sub_class": { - "hex": "0003", - "name": "USB Controller", - "value": 3 - }, - "pci_interface": { - "hex": "0000", - "name": "UHCI", - "value": 0 - }, - "device": { - "hex": "0000", - "name": "ARM USB controller", - "value": 0 - }, - "model": "ARM USB controller", - "sysfs_id": "/devices/platform/soc/fe980000.usb", - "sysfs_bus_id": "fe980000.usb", - "driver": "dwc2", - "drivers": [ - "dwc2" - ], - "driver_info": { - "type": "module", - "db_entry_0": [ - "uhci-hcd" - ], - "active": false, - "modprobe": true, - "names": [ - "uhci-hcd" - ], - "module_args": [ - "" - ], - "conf": "" - }, - "module_alias": "of:NusbT(null)Cbrcm,bcm2835-usb" } ] }, diff --git a/nixos-configurations.nix b/nixos-configurations.nix index d306877..12539cf 100644 --- a/nixos-configurations.nix +++ b/nixos-configurations.nix @@ -3,7 +3,7 @@ inputs @ { self, ... }: { - nixosConfigurations = nixpkgs.lib.mapAttrs (_: { + nixosConfigurations = nixpkgs.lib.mapAttrs (name: { system, nixosModule, }: diff --git a/nixos/backups-ng.nix b/nixos/backups-ng.nix deleted file mode 100644 index 3a7c76b..0000000 --- a/nixos/backups-ng.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: let - borgBackupOpts = { - options = { - paths = lib.mkOption { - type = with lib.types; listOf str; - }; - scaleDeployments = lib.mkOption { - type = lib.types.bool; - default = true; - }; - deploymentName = lib.mkOption { - type = lib.types.str; - }; - deploymentNamespace = lib.mkOption { - type = lib.types.str; - }; - replicaCount = lib.mkOption { - type = lib.types.int; - default = 1; - }; - }; - }; -in { - options.pim.backups = { - borgBackups = lib.mkOption { - type = with lib.types; attrsOf (submodule borgBackupOpts); - default = {}; - }; - }; - - # TODO: should have some timeout and alerting? - config = { - services.borgbackup.jobs = - lib.mapAttrs (name: c: let - preHook = '' - ${pkgs.k3s}/bin/kubectl scale deployment -n ${c.deploymentNamespace} ${c.deploymentName} --replicas=0 - - while [ -n "$(${pkgs.k3s}/bin/kubectl get deployment -n ${c.deploymentNamespace} ${c.deploymentName} -o jsonpath='{.status.replicas}')" ]; do - echo "Waiting for replicas to scale down to 0..." - sleep 2 - done - ''; - postHook = "${pkgs.k3s}/bin/kubectl scale deployment -n ${c.deploymentNamespace} ${c.deploymentName} --replicas=${toString c.replicaCount}"; - in { - inherit (c) paths; - repo = "ssh://w553a7cb@w553a7cb.repo.borgbase.com/./repo"; - startAt = "*-*-* 00:00:00"; - # TODO: low benefit, but we could set borgbase's host keys here as they are published online. - environment.BORG_RSH = "ssh -i ${config.sops.secrets."borg/borgbasePrivateKey".path} -o StrictHostKeychecking=no"; - postHook = lib.mkIf c.scaleDeployments postHook; - archiveBaseName = name; - - prune.keep = { - within = "7d"; - weekly = 4; - monthly = 6; - }; - - preHook = lib.mkIf c.scaleDeployments preHook; - - encryption = { - passCommand = "cat ${config.sops.secrets."borg/borgPassphrase".path}"; - mode = "repokey-blake2"; - }; - }) - config.pim.backups.borgBackups; - - systemd.timers = lib.mapAttrs' (name: _c: lib.nameValuePair "borgbackup-job-${name}" {timerConfig.RandomizedDelaySec = "5h";}) config.pim.backups.borgBackups; - }; -} diff --git a/nixos/backups.nix b/nixos/backups.nix new file mode 100644 index 0000000..967343b --- /dev/null +++ b/nixos/backups.nix @@ -0,0 +1,94 @@ +{ + pkgs, + lib, + config, + ... +}: let + cfg = config.pim.backups; + + borgmaticConfig = pkgs.writeTextFile { + name = "borgmatic-config.yaml"; + + text = lib.generators.toYAML {} { + source_directories = ["/mnt/longhorn/persistent/longhorn-backup"]; + + repositories = [ + { + path = cfg.repoLocation; + label = "nfs"; + } + { + path = "ssh://s6969ym3@s6969ym3.repo.borgbase.com/./repo"; + label = "borgbase"; + } + ]; + + ssh_command = "${pkgs.openssh}/bin/ssh -i ${config.sops.secrets."borg/borgbasePrivateKey".path} -o StrictHostKeychecking=no"; + keep_daily = 7; + keep_weekly = 4; + keep_monthly = 12; + keep_yearly = -1; + encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.sops.secrets."borg/borgPassphrase".path}"; + }; + }; +in { + options.pim.backups = { + enable = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + Whether to enable backups of persistent data on this machine. + ''; + }; + + repoLocation = lib.mkOption { + default = "/mnt/longhorn/persistent/nfs.borg"; + type = lib.types.str; + description = '' + Location of the Borg repository to back up to. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [borgbackup]; + # Converted from: + # https://github.com/borgmatic-collective/borgmatic/tree/84823dfb912db650936e3492f6ead7e0e0d32a0f/sample/systemd + systemd.services.borgmatic = { + description = "borgmatic backup"; + wants = ["network-online.target"]; + after = ["network-online.target"]; + unitConfig.ConditionACPower = true; + preStart = "${pkgs.coreutils}/bin/sleep 10s"; + + serviceConfig = { + Type = "oneshot"; + Nice = 19; + CPUSchedulingPolicy = "batch"; + IOSchedulingClass = "best-effort"; + IOSchedulingPriority = 7; + IOWeight = 100; + Restart = "no"; + LogRateLimitIntervalSec = 0; + Environment = "BORG_PASSPHRASE_FILE=${config.sops.secrets."borg/borgPassphrase".path}"; + }; + + script = "${pkgs.systemd}/bin/systemd-inhibit --who=\"borgmatic\" --what=\"sleep:shutdown\" --why=\"Prevent interrupting scheduled backup\" ${pkgs.borgmatic}/bin/borgmatic --verbosity -2 --syslog-verbosity 1 -c ${borgmaticConfig}"; + }; + + systemd.timers.borgmatic = { + description = "Run borgmatic backup"; + wantedBy = ["timers.target"]; + timerConfig = { + OnCalendar = "*-*-* 3:00:00"; + Persistent = true; + RandomizedDelaySec = "1h"; + }; + }; + + sops.secrets = { + "borg/borgPassphrase" = {}; + "borg/borgbasePrivateKey" = {}; + }; + }; +} diff --git a/nixos/cinnamon.nix b/nixos/cinnamon.nix new file mode 100644 index 0000000..8cef6dd --- /dev/null +++ b/nixos/cinnamon.nix @@ -0,0 +1,24 @@ +{ + pkgs, + config, + lib, + ... +}: let + cfg = config.pim.cinnamon; +in { + options.pim.cinnamon.enable = lib.mkEnableOption "cinnamon"; + config = lib.mkIf cfg.enable { + services = { + displayManager.defaultSession = "cinnamon"; + libinput.enable = true; + xserver = { + desktopManager.cinnamon.enable = true; + displayManager.lightdm.enable = true; + }; + }; + + environment.cinnamon.excludePackages = [ + pkgs.gnome-terminal + ]; + }; +} diff --git a/nixos/compliance.nix b/nixos/compliance.nix new file mode 100644 index 0000000..e1181eb --- /dev/null +++ b/nixos/compliance.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + ... +}: let + cfg = config.pim.compliance; +in { + options.pim.compliance.enable = lib.mkEnableOption "compliance"; + config = lib.mkIf cfg.enable { + services.clamav = { + daemon.enable = true; + }; + }; +} diff --git a/nixos/data-sharing.nix b/nixos/data-sharing.nix new file mode 100644 index 0000000..6303be4 --- /dev/null +++ b/nixos/data-sharing.nix @@ -0,0 +1,47 @@ +{ + lib, + config, + ... +}: let + cfg = config.pim.data-sharing; + + nfsShares = [ + "/mnt/longhorn/persistent/media" + "/mnt/longhorn/persistent/media/books" + "/mnt/longhorn/persistent/media/movies" + "/mnt/longhorn/persistent/media/music" + "/mnt/longhorn/persistent/media/shows" + "/mnt/longhorn/persistent/longhorn-backup" + ]; + + nfsExports = lib.strings.concatLines ( + builtins.map + ( + share: "${share} 192.168.30.0/16(rw,sync,no_subtree_check,no_root_squash) 127.0.0.1/8(rw,sync,no_subtree_check,no_root_squash) 10.0.0.0/8(rw,sync,no_subtree_check,no_root_squash)" + ) + nfsShares + ); +in { + options.pim.data-sharing = { + enable = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + Configure this server to serve our data using NFS. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + networking.firewall.allowedTCPPorts = [ + 2049 # NFS + 111 # NFS + 20048 # NFS + ]; + + services.nfs.server = { + enable = true; + exports = nfsExports; + }; + }; +} diff --git a/nixos/default.nix b/nixos/default.nix index 47188a0..bce06e6 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -18,12 +18,15 @@ ./stylix.nix ./wireguard.nix ./gnome.nix + ./compliance.nix + ./cinnamon.nix ./ssh.nix ./desktop.nix ./server.nix ./prometheus.nix ./kubernetes - ./backups-ng.nix + ./data-sharing.nix + ./backups.nix ]; options = { @@ -42,6 +45,7 @@ config = { time.timeZone = "Europe/Amsterdam"; + hardware.pulseaudio.enable = false; sops.age.keyFile = "/root/.config/sops/age/keys.txt"; i18n = { @@ -93,7 +97,6 @@ xserver.excludePackages = [pkgs.xterm]; printing.drivers = [pkgs.hplip pkgs.gutenprint]; tailscale.enable = true; - pulseaudio.enable = false; pipewire = { alsa.enable = true; @@ -125,8 +128,6 @@ ncdu lshw sops - nix-tree - fd ]; }; @@ -145,8 +146,7 @@ }; nix = { - package = lib.mkDefault pkgs.nixVersions.stable; - channel.enable = false; + package = pkgs.nixVersions.stable; extraOptions = '' experimental-features = nix-command flakes @@ -170,6 +170,8 @@ }; nixpkgs = { + # hostPlatform = lib.mkDefault "x86_64-linux"; + config = { allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ @@ -179,16 +181,11 @@ "steam-run" "steam-unwrapped" ]; - - permittedInsecurePackages = [ - "electron-33.4.11" - ]; }; overlays = [ - inputs.nur.overlays.default - (_final: _prev: { - inherit (inputs.nixpkgs-oldstable.legacyPackages.x86_64-linux) containerd; + inputs.nur.overlay + (final: _prev: { unstable = import inputs.nixpkgs-unstable { inherit (pkgs) system; config.allowUnfree = true; @@ -197,13 +194,9 @@ ]; }; - boot = { - kernelPackages = pkgs.linuxKernel.packages.linux_6_14; - - kernel.sysctl = { - "net.core.default_qdisc" = "fq"; - "net.ipv4.tcp_congestion_control" = "bbr"; - }; + boot.kernel.sysctl = { + "net.core.default_qdisc" = "fq"; + "net.ipv4.tcp_congestion_control" = "bbr"; }; home-manager = { diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 5a98a5a..1b2709f 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -6,11 +6,6 @@ config = lib.mkIf (builtins.elem "desktop" config.deployment.tags) { programs.ssh.startAgent = true; - hardware.graphics = { - enable = true; - enable32Bit = true; - }; - services = { xserver.enable = true; printing.enable = true; diff --git a/nixos/kubernetes/k3s/default.nix b/nixos/kubernetes/k3s/default.nix index 1ed7b0f..5964f7d 100644 --- a/nixos/kubernetes/k3s/default.nix +++ b/nixos/kubernetes/k3s/default.nix @@ -46,6 +46,8 @@ in { config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ k3s + openiscsi # Required for Longhorn + nfs-utils # Required for Longhorn ]; # TODO!!!!! @@ -119,13 +121,27 @@ in { serverFlags = builtins.concatStringsSep " " serverFlagList; in { enable = true; - inherit (cfg) role clusterInit; + role = cfg.role; tokenFile = config.sops.secrets."k3s/serverToken".path; extraFlags = lib.mkIf (cfg.role == "server") (lib.mkForce serverFlags); + clusterInit = cfg.clusterInit; serverAddr = lib.mkIf (! (cfg.serverAddr == null)) cfg.serverAddr; }; + + # Required for Longhorn + openiscsi = { + enable = true; + name = "iqn.2016-04.com.open-iscsi:${config.networking.fqdn}"; + }; }; + # HACK: Symlink binaries to /usr/local/bin such that Longhorn can find them + # when they use nsenter. + # https://github.com/longhorn/longhorn/issues/2166#issuecomment-1740179416 + systemd.tmpfiles.rules = [ + "L+ /usr/local/bin - - - - /run/current-system/sw/bin/" + ]; + system.activationScripts = { k3s-bootstrap = lib.mkIf (cfg.role == "server") { text = ( diff --git a/nixos/prometheus.nix b/nixos/prometheus.nix index 24f71b4..f786506 100644 --- a/nixos/prometheus.nix +++ b/nixos/prometheus.nix @@ -12,39 +12,42 @@ services.prometheus = { enable = true; - scrapeConfigs = let - node = { - job_name = "node"; - static_configs = [ - { - targets = lib.pipe nodes [ - (lib.filterAttrs (_name: node: node.config.services.prometheus.exporters.node.enable)) - (lib.attrsets.mapAttrsToList - (_name: node: "${node.config.networking.fqdn}:${toString node.config.services.prometheus.exporters.node.port}")) - ]; - } + scrapeConfigs = ( + let + generated = lib.pipe nodes [ + (lib.filterAttrs (name: node: node.config.services.prometheus.exporters.node.enable)) + (lib.attrsets.mapAttrsToList + (name: node: { + job_name = name; + static_configs = [ + { + targets = ["${node.config.networking.fqdn}:${toString node.config.services.prometheus.exporters.node.port}"]; + } + ]; + })) ]; - }; - pikvm = { - job_name = "pikvm"; - metrics_path = "/api/export/prometheus/metrics"; - scheme = "https"; - tls_config.insecure_skip_verify = true; + pikvm = { + job_name = "pikvm"; + metrics_path = "/api/export/prometheus/metrics"; + scheme = "https"; + tls_config.insecure_skip_verify = true; - # We don't care about security here, it's behind a VPN. - basic_auth = { - username = "admin"; - password = "admin"; + # We don't care about security here, it's behind a VPN. + basic_auth = { + username = "admin"; + password = "admin"; + }; + + static_configs = [ + { + targets = ["pikvm.dmz"]; + } + ]; }; - - static_configs = [ - { - targets = ["pikvm.dmz"]; - } - ]; - }; - in [node pikvm]; + in + generated ++ [pikvm] + ); }; services.nginx = { diff --git a/nixos/server.nix b/nixos/server.nix index 54b5ee1..10beb4e 100644 --- a/nixos/server.nix +++ b/nixos/server.nix @@ -2,7 +2,6 @@ lib, config, self, - pkgs, ... }: { options.pim.tailscale.advertiseExitNode = lib.mkOption { @@ -11,8 +10,6 @@ }; config = lib.mkIf (builtins.elem "server" config.deployment.tags) { - environment.systemPackages = [pkgs.unar]; - networking = { firewall.allowedTCPPorts = [config.services.prometheus.exporters.node.port]; domain = "dmz"; @@ -55,11 +52,7 @@ extraUpFlags = [ - ( - if builtins.elem "kubernetes" config.deployment.tags - then "--accept-dns=false" - else "--accept-dns=true" - ) + "--accept-dns=false" "--hostname=${config.networking.hostName}" ] ++ lib.lists.optional config.pim.tailscale.advertiseExitNode "--advertise-exit-node" @@ -67,11 +60,8 @@ }; }; - sops.secrets = { - "tailscale/authKey".sopsFile = "${self}/secrets/servers.yaml"; - "borg/borgPassphrase".sopsFile = "${self}/secrets/servers.yaml"; - "borg/borgbasePrivateKey".sopsFile = "${self}/secrets/servers.yaml"; - "gatus/env".sopsFile = "${self}/secrets/servers.yaml"; + sops.secrets."tailscale/authKey" = { + sopsFile = "${self}/secrets/servers.yaml"; }; }; } diff --git a/nixos/stylix.nix b/nixos/stylix.nix index 50d4bf3..99120a1 100644 --- a/nixos/stylix.nix +++ b/nixos/stylix.nix @@ -19,11 +19,6 @@ in { enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml"; - # targets = { - # firefox.profileNames = ["default"]; - # librewolf.profileNames = ["default"]; - # }; - cursor = { package = pkgs.bibata-cursors; name = "Bibata-Modern-Classic"; @@ -31,7 +26,10 @@ in { }; fonts = { - monospace.package = pkgs.nerd-fonts.jetbrains-mono; + monospace = { + package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}; + name = "JetBrainsMono Nerd Font Mono"; + }; sansSerif = { package = pkgs.dejavu_fonts; diff --git a/nixos/tidal.nix b/nixos/tidal.nix index ad59567..ab70501 100644 --- a/nixos/tidal.nix +++ b/nixos/tidal.nix @@ -5,7 +5,6 @@ }: let cfg = config.pim.tidal; in { - # TODO: this is bad and broken options.pim.tidal.enable = lib.mkEnableOption "tidal"; config = lib.mkIf cfg.enable { diff --git a/nixos/wireguard.nix b/nixos/wireguard.nix index a82a129..e954415 100644 --- a/nixos/wireguard.nix +++ b/nixos/wireguard.nix @@ -15,16 +15,32 @@ in { wg-quick.interfaces = { home = { privateKeyFile = config.sops.secrets."wireguard/home/privateKey".path; - address = ["10.225.191.7/24" "5ee:bad:c0de::7/128"]; - dns = ["10.225.191.1"]; + address = ["10.225.191.4/24"]; + dns = ["192.168.30.131"]; autostart = false; mtu = 1412; peers = [ { presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path; endpoint = "wg.kun.is:51820"; - publicKey = "1+gTBx8ghAt/BJICtgUKMKu52rufxuM6e46MN2g0Dlc="; - allowedIPs = ["0.0.0.0/0" "::/0"]; + publicKey = "fa3mQ7ximJbH7cu2ZbWidto5xBGxEEfWvCCiUDk00Hg="; + allowedIPs = ["0.0.0.0/0"]; + } + ]; + }; + + home-no-pihole = { + privateKeyFile = config.sops.secrets."wireguard/home/privateKey".path; + address = ["10.225.191.4/24"]; + dns = ["192.168.10.1"]; + autostart = false; + mtu = 1412; + peers = [ + { + presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path; + endpoint = "wg.kun.is:51820"; + publicKey = "fa3mQ7ximJbH7cu2ZbWidto5xBGxEEfWvCCiUDk00Hg="; + allowedIPs = ["0.0.0.0/0"]; } ]; }; diff --git a/packages.nix b/packages.nix index 8c0536d..c5c5267 100644 --- a/packages.nix +++ b/packages.nix @@ -2,129 +2,12 @@ nixpkgs, flake-utils, treefmt-nix, - nvf, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix; treefmtWrapper = treefmtEval.config.build.wrapper; - neovimConfigured = nvf.lib.neovimConfiguration { - inherit pkgs; - modules = [ - { - config.vim = { - preventJunkFiles = true; - telescope.enable = true; - autopairs.nvim-autopairs.enable = true; - autocomplete.nvim-cmp.enable = true; - snippets.luasnip.enable = true; - filetree.neo-tree.enable = true; - tabline.nvimBufferline.enable = true; - dashboard.alpha.enable = true; - notify.nvim-notify.enable = true; - projects.project-nvim.enable = true; - comments.comment-nvim.enable = true; - extraPlugins.vim-sleuth.package = pkgs.vimPlugins.vim-sleuth; - - keymaps = [ - { - key = ""; - mode = ["n"]; - action = ":Neotree toggle"; - silent = true; - desc = "Toggle Neotree"; - } - ]; - - lsp = { - enable = true; - formatOnSave = true; - lightbulb.enable = true; - trouble.enable = true; - lspSignature.enable = true; - otter-nvim.enable = true; - }; - - languages = { - enableFormat = true; - enableTreesitter = true; - enableExtraDiagnostics = true; - nix.enable = true; - markdown.enable = true; - bash.enable = true; - clang.enable = true; - css.enable = true; - html.enable = true; - sql.enable = true; - go.enable = true; - python.enable = true; - - rust = { - enable = true; - crates.enable = true; - }; - }; - - visuals = { - nvim-web-devicons.enable = true; - cinnamon-nvim.enable = true; - fidget-nvim.enable = true; - highlight-undo.enable = true; - cellular-automaton.enable = true; - }; - - statusline.lualine = { - enable = true; - theme = "gruvbox"; - }; - - theme = { - enable = true; - name = "gruvbox"; - style = "dark"; - transparent = false; - }; - - binds = { - whichKey.enable = true; - cheatsheet.enable = true; - }; - - git = { - enable = true; - gitsigns.enable = true; - }; - - utility = { - surround.enable = true; - diffview-nvim.enable = true; - - motion = { - hop.enable = true; - leap.enable = true; - }; - }; - - terminal.toggleterm = { - enable = true; - lazygit.enable = true; - }; - - ui = { - borders.enable = true; - noice.enable = true; - colorizer.enable = true; - smartcolumn.enable = true; - fastaction.enable = true; - }; - }; - } - ]; - }; in { - packages = { - formatter = treefmtWrapper; - inherit (neovimConfigured) neovim; - }; + packages.formatter = treefmtWrapper; }) diff --git a/secrets/blocktech/nixos.yaml b/secrets/blocktech/nixos.yaml deleted file mode 100644 index 15eca95..0000000 --- a/secrets/blocktech/nixos.yaml +++ /dev/null @@ -1,19 +0,0 @@ -wireguard: - home: - presharedKey: ENC[AES256_GCM,data:ayLbDjTDMnLNr5v7hDVtV2iCQ4/VMXk6qWpp2CjJI+NCIMxUOb2Ozd+6hMs=,iv:jkfYVgJebkbRFXfUMefn6A1+rkQW/md13rpoaJKCdik=,tag:itsm94ieGagpoiPqfyNGcQ==,type:str] - privateKey: ENC[AES256_GCM,data:DkVLF6YZsNYEMS7pKK5BWPxgcar2Bv8U/Nk9Wssktbfvt60vqa4YBCnO314=,iv:PZ6adaCeEXhodO2k5O2E1GRLLajyE3aMzUtWYPfsDZM=,tag:d4EMsDlPiOvTHOMIktVV5A==,type:str] -sops: - age: - - recipient: age1w99m9klvc7m5qtmtmu3l0jx8ksdzp5c4p9rkvh5fdullfc6afemqv5py2q - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoWEc5K3p3QytpZ1pxeEJy - TUtENXdnT3ZJUGNXaHo0ZktwK21OMVJmNzA4CjdlMUtWY2hBc3U1UVZQZEllK2xC - NGZSK2VyQVdBRmZYejBWM0FIeFE5K2MKLS0tIEQ3MHhOcW92dlo4NUdBdFlKdEM0 - N1Rab3RNZ00vd0xPOVBYRHphaldWU1EKNKnKPWO1l8NwWXG2e15Y3td9I0rN9Wwn - QdoeVf2+cPJOO5g9stZpl2DBF3QxJojt+dQhwjuEbP9nQtlVQPAlMQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-07-02T19:43:11Z" - mac: ENC[AES256_GCM,data:GtaZa2Ce0rr6c5rB+u2q8R8y0zDfNRbFesEnbSaQlxGjXF/6tzEfARbMhVjpjrUn7HCvNK3dbtm5QtCOFqtjyUkbS5NoelH9fdNj1SqzITuhLynxwldfkWpo0TpDf0MA3OjzxPhQz9FiIN58d94wCEhS4ma3yyPq0kvNmYopQN0=,iv:nmtkdSnSwKGNlantq6aWBQMySpkRMJ+cxdEji46DL5I=,tag:Ix0EnzWJXZzyNR4FQx5Rag==,type:str] - unencrypted_suffix: _unencrypted - version: 3.10.2 diff --git a/secrets/gamepc/pim.yaml b/secrets/gamepc/pim.yaml index c8c51be..d3fd6a4 100644 --- a/secrets/gamepc/pim.yaml +++ b/secrets/gamepc/pim.yaml @@ -1,3 +1,4 @@ +sunshine_credentials: ENC[AES256_GCM,data:P1sttD3H65DQje+Cs5CVLqvhtXWtoBgu/TBZ3WFIWqErRKtKa31V2lLrgixrty4TVM5qq06zE5z3lQ78ZAHLNh80jMPvoAcCqTXXoWwIYwdHJT0iG09f0ZfpiVTZU4MuCn0uuaJ6873AYe60siZW8uFntu3v230izoAqY9Ex+BzIOOliuqrnIRzdw06TCrrBTJUr,iv:WZqkSZOsiCWx7VPuTDA1Js1DcHZLK9YLDxTQ2nVlFQ8=,tag:iJ6bSofnPWWm7B+VPm+MyQ==,type:str] sops: kms: [] gcp_kms: [] diff --git a/secrets/jefke/colmena.yaml b/secrets/jefke/colmena.yaml new file mode 100644 index 0000000..ac64a0b --- /dev/null +++ b/secrets/jefke/colmena.yaml @@ -0,0 +1,40 @@ +sops_nix_keys: + root: ENC[AES256_GCM,data:BvaIcGQhrYyq+2OA4r1n8Jg5NS6RZXFarzcOGAlRMpYZSJkP3x4difJgorSGEqufRxKtm2aboLWmyTSso1EXxcICb0B+RRLXIJc=,iv:eLPkpCnS7qr8/nu/xKU1qPx9BIMrWUNtqbeDeeNohJw=,tag:4EljW04w9qM4xx2xHzVzxA==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age189laethzry4ylnd790dmpuc4xjjuwqxruc76caj3ceqhqug4g9qs0upuvw + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIenFvSVdyZ3kxSXMwdnha + MTNyT2RUTTh3OHkrSFpzYkhmSW81aEx6MURJClpoQVNWTXI3d0F0aEgwSjJJZTVK + aEZFSFJ1OXRsUjVvM0dWZFlwcEYyYlEKLS0tIEgyUHU5RkdldUUrNnhZTHFQaG0w + TkFXcGNURFo0d1U1UXZ5a2pwMHRtMmsKODDUjZ+PdbmTMYKfmHNqG2t7FG6ItdRA + A+usHM6Y/fwwN1j4+Uszcy69874XhVMOFXkcODmf/12RRpHNuI2W/g== + -----END AGE ENCRYPTED FILE----- + - recipient: age1w99m9klvc7m5qtmtmu3l0jx8ksdzp5c4p9rkvh5fdullfc6afemqv5py2q + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOSjY1WXMwcHhmY0xFMVFx + WFhiUmN1VGh1NGIyQ0ViRDh1ME1nVStTYVJzCm1wMHhHcWhNdXlENGlNVnJnbmND + MlB4T3NvRDJhRzFTU28wUDdKY3c5NkUKLS0tIHh6VUxqRUxWYlZ4eWtQby9DRVZp + UjdxZGF6dEIzQXR0eGNiQUh4bjZjSVkKZfMdF9BuvVQQbKloZ57WJXYzpUFfwB/5 + Hsdr5DySNaObp/gkddAIB6y79ogx/pl8jV58/ptYKEVk4rq+ga5NJg== + -----END AGE ENCRYPTED FILE----- + - recipient: age159whjxeyw94xmkkephmtlur8e85xd9d5vnvkwkcayfv7el0neqfq863yga + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYMHRrejBrcU55bHAvd0tL + ajNkT0N3SmcyaVZEbXB5ZXpRbHk5cVF2Y0N3CitBa2x5N1FRNDg2SzlJKzhjeXBF + SXh3cWxiZnlINmtnY2hrb2lVOG5LSEkKLS0tIGhEREZnWHRnSUF5bjlmNHB1ZDZt + SW1jaG02MEZzTVV6OHQrWDNkcG1Oc3MK63Z6TyYvNus/+25GaSVDCNFajfdKDCtb + zgMKIpx9BsJH1NHfx711MwQVD1r5Vx0Tuwg7j6A6UdGOf2GdIhNiaA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-12-01T14:09:02Z" + mac: ENC[AES256_GCM,data:gO7uviWsVA28EmhJuc7M8/lrRdZPfsXsyCWHJEt6m5EofIk96Il0GAbcI5VNmbIPCjt5Ihlm6MFp7MHo0+6AnOseW53wgZy4jMdQ9JmdgL6Mw8kuqrxublOZD56TqmRDYdMZo5IYxgBZcRFQm7UfjEgAjp4cradcAv/vhbQNN7k=,iv:hcCJLD8zdLPQ2qcvknsJ7eENcjR0RNZbI9iIAqaMFZ0=,tag:AYROyHfhcE0dqfIMVkFM3w==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.1 diff --git a/secrets/kubernetes.yaml b/secrets/kubernetes.yaml index 01a88d1..2839afd 100644 --- a/secrets/kubernetes.yaml +++ b/secrets/kubernetes.yaml @@ -9,71 +9,67 @@ k3s: peerCAKey: ENC[AES256_GCM,data:guzHtQx+rn778FE3omR7h5VrFvMcR1pVeIRT19b6i1ZyfR1YLAEyzZU/gAiokb3XDNF+UcR2D0zR7ra9k7WcNtyHlskU7vctT2iURssexMS9XbbS3nlklx0utsqO1KKeuLI+bU+/cuf4zAYxoSKpO8NcqBhfTRlNu53IBF+mHZtSQ5BbWlOjvHiBXMxRMNiTRvzC0XlkSFOF7ERslWPkOWDkIuKv6Jd+LuQ3tnxIpjp4g9HSsmLlARf9IdVp9qpeZMXrnjfyLmbNABVYPL6XJHyMudYtzG+tpwW08Q6qKZy2KEw=,iv:tnGOwMyDQOXzguTh4pBJumpaV5ObgAT50qtPIu5u9O4=,tag:agUs9H7i7Mm5rAFj3eligw==,type:str] serverCAKey: ENC[AES256_GCM,data:S79OqkFK+z7+YecsH8Mdlel8+T50rhBnixfB9047uCZIIZ6LsxknGs1wkCAFPnymUVEzIIGW3lCog9xIvIWJSfV4wh2TMOetPGj95OBV0zQy4vdMhHHt2OV5+R6e262n0FwaQkn+kndPlVvnlPnFbkiQys0vO8GashWWddyBGQf6P/5TvYuJtz+qjW1FsrtjDTu77Vn85y7bYRENQ1o6sZxevftTHnEjSmvWHgcYey0TytkIYZpMHm1G1Up3+HtgiFAFDy1VtSv913El5W4EfLeRhV3B51ktG+SR0bxfMv/P+qU=,iv:UkWTAXYiaRqptN4PyCfMDot20Ln+/QkPIBSGabJSj+c=,tag:I056m8hcwNyOkoxsNRjYXw==,type:str] sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] age: - recipient: age1unkshctcpucc298kmw9a0qzvtjzgdnjytrxr5p750dv0z95feymqpn68qf enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBNUQwMFR5cTQ2UmFkQUdp - WEZGNHZnMWlLRVBhdEdzeERMc0JQL25ORzFRCnZqQTFiak9UTTlyVnZrOTVFbDJv - VUdCUXcwazhZelB6VDRCRWd1KzhjT1UKLS0tIEpyeGNHcjRNQWVBYS9YNzVEY3Vr - S1JMakx0VURKMFcyMXdheVhJeVJ3WG8KTRcEpMxIXVlVmh2u1+GIEWWPgR4ETK3W - t0ISYfu/7+SsVtkWDSydWlrXLjn6yiWG3qXBI7xVLszO56a6/dRklw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2anAraGp2YlNWZnNENWMw + WVFqMW4zQUl6UWNRK0lSVnNZMVl0SjJGdFJFCndyVnQwejFFWUxTQ0pmRnNDbUJK + VjM1ajl5cHhHN1A1cjdhdFhtcnVEcWMKLS0tIHNUQWx2endUUFNMUENUNjhvdDZl + Qk9yY0N5N05UZG4rcG5iS3NkR2hVaVUKxRS9Mf17cG8WyDdCLwpqPiMObbKCTz/4 + iejyULwJNOBcl3Tvzgc9FANNZpC4UrO51HTCzQvmw9tBboVkEkLA0Q== -----END AGE ENCRYPTED FILE----- - recipient: age1upnqu4rpxppdw9zmqu8x3rnaqq2r6m82y25zvry5cec63vjsd9gqtl9e02 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYL2xkV2FhTUp2ekFSOHpW - QnF6Y0xoRXFqd2R2Q1ZNYTE5Y1ptYTVHZG1zCjhwQk5pMXZDWVlVZitUSExvb3Vj - VEw3dVUxbmFJN1NrYU83bzhmL3UyZDQKLS0tIDQ4MUdQb2Y1Q2l6UHpXdWNFUUJs - WG5qdkVNWHBSN2lZd1UxY3o0NWdSYW8KtGdyCOGNnCsuDW+H2E6HBxwGUh6ZjkY2 - Kc2W8kzxfsRLLzll2n61G2dG0Rg/oRwj2CKJR3PfCsrmK4RAdy2ogQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpY1lJQ3BKSFhia0RUZFdV + dldKbmoxN1pwY2Z4V1VXNlY3cWE4cnJOYm5BCkNMc3hZbzF3RHlUMmdSRndMWDBy + eUFjOCtMaXZQY2R6N2RsRDNDNDhOZkkKLS0tIFVSRzFySG00VktGa1ZmYkx6Um1W + V25mbkcxQjhqb1cxa0hkTWlFNkVsS2sKbP1bqNh0DRiZtK3fXaZ4J1d2b+nYwFqQ + knwond7pkN9YBRsU4/HHtFCp1XPxRiNQCXXfzWy0X365VzON32huqQ== -----END AGE ENCRYPTED FILE----- - recipient: age108fn93z2c55g9dm9cv5v4w47pykf3khz7e3dmnpv5dhchwnaau0qs20stq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvTzIxSXJjRFExS1JocFNt - cm5TVWdYS2RsR3FVOWtyblJvOTgxSUlGdnpjClhhM2poSHZrK1QyMENqaTgrdlo4 - bmw0ODlJWnByclZEZ3pmTE91QXRmcXMKLS0tIFJFbXJoZkM2Y2d1SERJeDFoVitm - Z3JySC9zRGl0MUQwZXdVajkwamxHVXMKoxxZjUpYyG3XqHNmDXv3SwMqdST74gK7 - KvdWf65QRCX1M0bgg+5CKmd69fS6KkBqUvy/i/jNO57QHuGIL4/4Dg== - -----END AGE ENCRYPTED FILE----- - - recipient: age15qrzsk9t7uyuuy7m0xt3qzk3cmcsegt5wfe5zew4d8najwjnm30sfjc3pk - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxS3d1YzVyRmZ1N042Vllw - VmFxUzBEeS9lTHoxSUpFVlRzWUxuaS9DRW1ZCmpCMEVxbGpvL2hueW16UlJuR0xw - MEF2RExSYWdIUDFtV3dBVnVsWGZ6VWcKLS0tIDNNV1V1UGVMNEc2SUtXMkZtQzcx - dURxSVdiMWdEOVpldUloRmhzUFVXeWMKaaOOD9i6HrhvqPICJRqSR454zFr0NAgP - 5eYj00O9TVZwVzmjxd/tqecLKVDKeCelyHjKerQvAUy1TPVhRCxqCQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLL0xwbXNENzQ2N1BIZGZC + YzhMdFdyREpMQlRHaTZmRTllUnhEUm1lcm40Cmc3MzRheDYrQjgvaWVaZE1tNUp5 + RTFZbXltV05lRDNBdVJ3VFEyeFlxQTgKLS0tIEx1ZG1IMHF5a25LZGlzWjNrZTJ1 + c3VCWjRmKytyVzE1SzBlMXQvblptNmsKNnl6VQIBn2Gfkrlatf23kOMWW+1Ej2wv + O9Q8twttjPoTPx/9pWHOCNHmbnkabwi94lRujbXgIAQXUAL00n3M7Q== -----END AGE ENCRYPTED FILE----- - recipient: age189laethzry4ylnd790dmpuc4xjjuwqxruc76caj3ceqhqug4g9qs0upuvw enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUTFlUSG0yNkZRRDlZMTZz - WUVTNEJTZkcwbURWY1NMcktNZDhHMFhyWlVNCnY2OEpzamxzNGR2OEY0a0NKRkQ0 - NmgySjJIWUIxeGpRbUQ3c0JvcU5CSGMKLS0tIGZBcEl6dVRBNFh2c05QeW1ROWhl - MWdUS3lmREJGMFI3bUZzSzlsZ1loNjQKET1S0K1Rq8VeK1DfD0CFUI7Mewp+dDVQ - +TzooK5oDHD3RsUqN1zDILxH7Iz/+IZps/HigdpBVtEU6jmxANtCVA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPTGdrWlE2SER5OUNjQWEw + MUdEZ3VJbCtwTytZU3ZWM3lNclJBUXhBdm5VCmRpQXNxVVV1cGxlMUJNa1lEcUdx + Qkt4clg1cVpOV0FhdEd6aEQ2ZkdlUTgKLS0tIGl3YWxjRlM0MHFncm5wdlpSeEdj + TkRSZmJyQmg2QnpYanZLVFRlWnowY3MKvM9kUm/F0vtQcwdnIKff3HWUtGbR2vmH + eOKnbOE5WMAWIi8oSR/uBMzE9lK2kyisby19XZUf5JcG4wS4YRlC1Q== -----END AGE ENCRYPTED FILE----- - recipient: age1w99m9klvc7m5qtmtmu3l0jx8ksdzp5c4p9rkvh5fdullfc6afemqv5py2q enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0OWxRVGdqYnc4YXF2UGI2 - cERlbFJlUkloSkI1RFZuTlZyZnVVRmJCWDFzCnBqNDR5NWo4bGFGQ3Y1WkNTSFlh - WWU3dmZOVE4xcGpmZk1wSGxYVHYyNk0KLS0tIFAzaFI1T1djMDBCS0p5SE5UR1dK - eVZweUhBOXVoN21QQzNvbWFDU0VpTEkKpvI0Fy+ybDcasrT/IvIecMnr8kTKTFmV - +RC9+6+oSHCHScl3nVloA8ewAO3U4ChTvNKiHy0QAr5iT4BNtklxxQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCZDhSMEw3RVcyQ2NmZkpD + bVp6SFpMckZmNGdoeCtzQVo0VDFEWkZ0dVUwClA2WVd5NG90MkVRZEUyeW9JaW1r + YVpJbEpDV0VCREFVMy9taFJBODlGWkUKLS0tIHN0eCtrNUM2K3VTaHNMWTRXUFA4 + WEhTSHNtdE9qSVJVay93R2ZxeXI5SEkK7ZjIfQevnd1yyz8Ra9kBJb2DvlajgNEn + 88JXgtSrxtiVfrCFUKEIsEV6v/fT7BECOGCYaoxskwgLgCZ9mL6sTA== -----END AGE ENCRYPTED FILE----- - recipient: age159whjxeyw94xmkkephmtlur8e85xd9d5vnvkwkcayfv7el0neqfq863yga enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2SURHU2laa3k0TXhlMkZq - eXZOVWRxWVdsc0FKWFRUbUhmZDh2QVkxMVhzCklvTU5ReTA5MGNLcUsvTUlCWE90 - S3l6dDJ5ajhSY0RGRnFCTldkeFhKOVEKLS0tIG9lUzJxRFNKUTRTcnd3cTlUbnNC - aFRKNlRXZTZEWllHeWNlTEJ3NUNXc00KHDPf+CN63UqMslALi8g5bjryE8TtTF5f - XPjlIt0jUm1EDIyFWTjeHwgmRaC6VBfO1qCNiELEUVWOHrpycqGQBg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyR2xBS291Q1lHc3UrT293 + TlUvVnRxcUFHT01iNWJ5NFJtcVYyd3dLVFdnCjVqQlVLVzBEMlRFbjdDZkV2VWJa + c1RyKzh0S25VTk1wQ04xdEFCOHVySkEKLS0tIHkxMXJUbWxZNDU2VmFuRVpobUpF + djd1d01oTzh3WGNVaml1RWJ6alllQ3MKfiUTGCuQ0+6CbkRPFAKnIh2icOScNSVq + qbhQZVbF1zkTAACtJYRsw9LYhjK0QlT52fcLVuyWL9GRI5ZL6n3GRg== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-12-01T11:24:36Z" mac: ENC[AES256_GCM,data:aQQPjSLHgvBPU0eZA95qFoRsklw3Jaj2N42DpKSheDoSJ5SwWV1GK0IJqkis71eBpMG9Mjn2wWj/1IdU1upRqfZU5dwNPdVXFb2+qPZyTkz1jhvBVTRGUNedd/L3t2a2nsaj5frZyzUPBELMs7n335pB9I36e+xOgTmA8OW3XAE=,iv:UI82ZmzcXtjO9fv2bSBZVVzNs7uvlopyxKXW+wBmNf8=,tag:HySaRX4Ihpnx+a8lASHicw==,type:str] + pgp: [] unencrypted_suffix: _unencrypted version: 3.9.1 diff --git a/secrets/roeland/colmena.yaml b/secrets/roeland/colmena.yaml deleted file mode 100644 index 14bb01f..0000000 --- a/secrets/roeland/colmena.yaml +++ /dev/null @@ -1,35 +0,0 @@ -sops_nix_keys: - root: ENC[AES256_GCM,data:+V4RZsyfGlaZokQ0LFxfbUuWuNnOGxdAkxerIgA+fnwdsz+3msXWPwAVcCsGM5PLRSGtJ5NhDPT2J7yVmB6RxVqaVHBsxHp5kPs=,iv:ooHX2MQfddREDyWanVtkBzJhf78s9gb6P73Qgn+db7M=,tag:+Ky7upH2Lph9IcnjAiSbJQ==,type:str] -sops: - age: - - recipient: age189laethzry4ylnd790dmpuc4xjjuwqxruc76caj3ceqhqug4g9qs0upuvw - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByc3JPZmlzeUFqU252bXAw - UFhEWk53V1VLVE5PMC9EeHlhZkdZcHhRbVJZClFObnhYVDBxS21HWWNoUWxrdXVj - RGY4T0djdmVSMXdrdG1iWTlDVTRkTDQKLS0tIFRNVTdJYmZjMkNLdUoyWXZFZkNn - ckdSTUdyWUtacDVMc3FPMTFQbGpSa0kKlo3KBNj4OIn4BepD7PTebBQVBjR+agxv - h0SE/t+0TTYcVe6Aq6l1w/IDFumpSmoNMYOyzkA4ABbqQy0WHkNfOA== - -----END AGE ENCRYPTED FILE----- - - recipient: age1w99m9klvc7m5qtmtmu3l0jx8ksdzp5c4p9rkvh5fdullfc6afemqv5py2q - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVRE1OWUN5OTg4TTJaY0dy - eXJTVmpuTWVEQ2tGb1RKMlU5ZGlRMXo2enh3CnpTdTkyVG1wcGt6bkhoM3YwdTZG - K1llQVM4ajZXT1ZMU2dPSUI1NEQ2Tk0KLS0tIC83aVZQZFNsa3VnT2FlbGEya1Ir - WmJGeEh4QUg4bDk5U3dRNG1VaUthVjAKNiD5srj8mCy9QO4PwjdKR/Y4qyie04dQ - NOSpfDnVNKUF65oR4xr4B6eyQahctFt4yrk4IoYQBlG4N0zqE1bu2w== - -----END AGE ENCRYPTED FILE----- - - recipient: age159whjxeyw94xmkkephmtlur8e85xd9d5vnvkwkcayfv7el0neqfq863yga - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2VFB6WDcwOVhqZWs5RDJ6 - L0J4TXY2bWZDTmEwL3d1bGZLdzVuQi96Nm1BClc3WlBENkhwTW9PT1J1MHdtZ3pz - a2s2S3ZLS204MGZ2Tms1TGpPYnFOK0kKLS0tIFhFWFJDblBWQngwMTZDbWlIdGhJ - OFIwVUxQTlFsSldFRG5qdkJ3NWxEUGsKzUNf6dUX8CA6sD2P0blrvAyso4dnDcwi - 4mE7veq3arjyd0qcvoNIifs8omM4jgE97zjQfY1AOTEgAlFykgqhzA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-07-05T14:18:20Z" - mac: ENC[AES256_GCM,data:5K+tBj8JFF2wY1bdzOc8nYThH39sYAmDGp/8gylINV6s87ROUy4XPdQhRGkd5y5BknGfIh8XnxrUmRvsf9t1FYSJwgPed0V/nU+Bl8cnMlzN87V5qgjbRKV8Aqd7fKm9SJKejdx3S7WoT2VLg6avc8PSOlqSaBVBjLp3F816XiA=,iv:GBLL+7MhfiGo4Alt6ffwlud4+ugeHAH8Yq5wXW9Book=,tag:xrQwBHTKMtWtycV279zxDg==,type:str] - unencrypted_suffix: _unencrypted - version: 3.10.2 diff --git a/secrets/servers.yaml b/secrets/servers.yaml index 6c505ce..5c7d0b4 100644 --- a/secrets/servers.yaml +++ b/secrets/servers.yaml @@ -1,85 +1,76 @@ tailscale: authKey: ENC[AES256_GCM,data:3eXxQBY6AVqU4R1NlsyhGCfXW5wL58ODRH/f+zo5YFRad/ys1vB9JeKagq0SJSj/w4zxRAEpCf1o47Ypww==,iv:QklyIFuXlbH6cM/I0gqDH/Xeay9gqxqeyulQ7W/dbig=,tag:E/3UqtsfSVOi6otSlReO0Q==,type:str] -borg: - borgPassphrase: ENC[AES256_GCM,data:UWA2sBLPi63MRVOPTYPWYLujF2M=,iv:FQq/IsZK7LWo30gZc7oT2E9feCLn7Oeg6wDGuezkhu8=,tag:fWYaZUwJrM8x6cemXzz6xg==,type:str] - borgbasePrivateKey: ENC[AES256_GCM,data:O7eIY1yvbnBTS96tt5a8vcOEOzit4tEbIHmxnSbNsowC7YNk2g6MShQ6ll86GDiunLY33/Px0bqq9+4z/dk4N3FWQ1v5KQjr/gh+CS8VpIrv9zLv+Ru9UzeWQusbYxqnCu/IAQ1aB8UGV2LSCesQ0r/B6XEe51Phi65uWkbUYa/8voSiws3T3hnNrUDqiHdzfBgWZIQszz7zD92Q+aXu/kGNSxVKbXjWVfqBiyDEtuLEWoC1eENeEs41Ov5YT0Lm6+CUWadPqEwkDSvZWnBhoPwPLTZ/+ftZ/nizXUujsTdRwjcbOwJER+ObhgWDxbJE2WifxFOmHt3ggfSmAN842u5PjfT5gqpXMlTdCwYAYEJvDMqGsADe4p7+vPWJbetaahFrFGN8uBw7rs7W2wIiUKB5bAbAG0o6hdTpWfysuzMOFK/fROvCJsNhhKbbdiQbI0+SogtCkwv69+3uaRTFi33uqKCO6PQ6rMIahjo1lutm9iWq2nX4oI40W1KPC6EU/wF2,iv:rzkjjSnyrs58ZEO8XLsCSFsPHbtnL39SF6NJ6lUg3Ww=,tag:q0sunVc+9bLFoSdeykuT6g==,type:str] -gatus: - env: ENC[AES256_GCM,data:HKZFD9yKUxUl42ucUvV/i6gzzIkQ9zlUQ1p06ImRwW0T/DIOHp6G2QHlWr60Q5Xc9HWfVCSNby5Su5DLAso3pX/a+b4CoG7q4pRhekVNQwcDYVWzfek33onDLtAhL/AUVLfT1m3LXFR1xBJc87lbP/KWG4IEYI5+ZVgQXKC47HVADXE=,iv:EbiHksIFeG6j90fdAACnD5ukalI58So5DV9ztytR5p8=,tag:OLDa4NOpYs+UWLMlndEqow==,type:str] sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] age: - recipient: age1th8rdw4fs3vmgy9gzc0k9xy88tddjj4vasepckfx9h4nlzsg3q3q4cjgwu enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnazB6cTFiNHVrWXBuQjk2 - NmYxT0FldVE5Qk8rMkRrdHlFeUFPYlJKUkNRCmpGMVpyVmgrVDZ5R0pZQVNraFht - enRUSU81eG5ZOGQ5TVVKUkp0NGs4cWcKLS0tIDBJczllVVRJQ3UyVEs2UlRyalJa - RTZKdTU4QjNxWFpYYzBmZ2o4QWhuY1UKR2L8Og8LIXlAyiseRbexCn2S67y549Lx - Fi78+c5Kn+FDep6GDpaO/cGzFyJ1cG3OX3nT9KdRiGiNg54dOH31DQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBielJoNjNXQW9SRDY1dE9y + akw5M2hTSkgvbWJxaGZqZnNsdGVhVWFlRnkwCmN6bDRYclJNY2d5NVJvcllCdjhu + UkJxMDRyMmFMc3hQVUp3Q2RKRDJaN3cKLS0tIHlFV21zZ3RNYW10UTQ0SmdBbVpG + TFI2eVorL3BCYUZpcGNCU21mcHpBNXMK0JBvnhT2fNNWfLcXFYbelee5OlkCrRyv + ZHKawtyH60g1nUB+AQqneUJhiYH0UJ40Ttz06rVyzOYUCV8M6tghsQ== -----END AGE ENCRYPTED FILE----- - recipient: age1unkshctcpucc298kmw9a0qzvtjzgdnjytrxr5p750dv0z95feymqpn68qf enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5U0IvTnJwUEdqM0tXV3h4 - WllxZHBEblNoMmRub1FCaldJTlgwMDBUYVhrCm1iSmVFK2NTU2tjazdwdnIxT2xT - ZWJ0cm9qZURrUnZaWnJVRkIvZ3pJbFkKLS0tIEFsbDJaT3piUENuVHJPNkFuSVhO - VDFQcnBiMjNyQUFjdTJGZk92R1cydTQKlodgshGR87gz+qhrBFzmFZ2iKy4yPVWk - 1YYfPkN6PvJr3JZ2grcVLbjFF+/gQnIGcSrluv8WikvBb3TqVuDGyg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyc29QQ1FoT1RIbE9neG56 + T1MrQzdHWEFORnF3ZlRBMUVvdVRtWjRxYUFzCjd5aDBISHlVdUFSQ3dySmFRZ284 + SHNjdjlBeVFjbW5kSmVKM2doTHczS2cKLS0tIDkrOVpHUVIwSUl4Zno3cENoTDJu + V3krQU1VUjFaY0pFbVJkQ0E2STF1N00KrqqxZo8CzJLwiE/uibJMA6V/g4vlRFhB + mj/lWkEAek7MhncNKFPgoNON+5rU1bqmEHufhpLaBV8NYEWMTM5/XQ== -----END AGE ENCRYPTED FILE----- - recipient: age1upnqu4rpxppdw9zmqu8x3rnaqq2r6m82y25zvry5cec63vjsd9gqtl9e02 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0VjZzME9VMFlLR0Z3L2VH - amFncUlka3BVbEdVSlB0S09seGZWd0lpblJvCmFJcmJZM0RUL0xkR0psSEp2U1dz - eEYvenl6NEZyb0FnK0Z3SFhNK1BhazQKLS0tIDU3djVua256ak5JdDFKbGlQbXVk - Z0FybjFQakJPQmtLM3djRElpYnlPK0kKl48acrM96svviQh3wGNFW1cTnX9l/8L2 - IzHpGGg47lEsEaefm1wQuR89AzToWECLKgz3uFrl1vtXFzmQ/qGJag== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByZVJCblJHZGo3bFA3NitQ + OXMvakVVOUdISUlCYW9SL0xIZEluUzZENEVNCmNqMGg0azVac3pRVW9obzVOUEpz + RFZTYnhIU0E3c2h5aS9mL3NvK1lGMkkKLS0tIGdZOUlhbjMxTUcrdHN0VTFqK0lj + bzFiakFNNUE4RllrdkR4WW4rN1hJTE0KnIrPDg9U2eXrQU20hpFBULFv4AQZn18J + TGrgn5CzRHEjWrDBxQfN5u0tNu/07KJN5xRvd3MroH1KVe2Z0pQn4g== -----END AGE ENCRYPTED FILE----- - recipient: age108fn93z2c55g9dm9cv5v4w47pykf3khz7e3dmnpv5dhchwnaau0qs20stq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWbXgveXJxc1BlYXlxRjNQ - aXEyUVRvS3ZqTTNXVmdtaytsT2Y0YWgwR3hFCkZpd1VGQ1NVVC9FaVNOc2c4K2ZX - aWVjd2FXU1BzS3MyWVorRzJJRnRpWG8KLS0tIDNsZjhwOXZhTjN1c1Z2SXV2Q0Ey - MzFCRFFLR1dqVUlMOEJhdVNoR2hZaHcKY6bNAv9EnGQg83wC0cvm3Sd+WXCGb1bW - WSGMbrEWULo1kTbtzal9LbM3uiEytp1Ei7WDtEy9knfhuV+RggwVyg== - -----END AGE ENCRYPTED FILE----- - - recipient: age15qrzsk9t7uyuuy7m0xt3qzk3cmcsegt5wfe5zew4d8najwjnm30sfjc3pk - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxQWlhclFKRTgvdmU5aWwr - VlhxVGk3cmkrTGo0RjlXSVlPZ3ZJMVhIa1U4Ci9MT3ZQZUNVZ0VuZ0t3eFZRVkN0 - bUEwQThSSmJ0OUhRc1F0RVZ6aHcwODAKLS0tIHgrM3NxaWhpaHA5QVlYL014aWlB - dlNQS3UwdEVQVEV1TGE4ai9RU0xzaHMKA0NpL+bikvjJFd4UJOOqaRINXVX64uZA - 3cOqv0PbUfsp2ON3Nm8SX5g74hraDaKGRtTA2XWJBHfXv0C+WDbbiA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiS2lpSWQ4R3U4QVhRcU8y + OXVKcVNWTzJ1L3k1a2lIUE1FeE50VzcwOXlnCm1na1JiSmVPUHlVVFdGVzkwZzNB + b3ZlN2R5NExBeU9YZlhBRHY5VThrb1kKLS0tIC93bEFLdWxZaDRpanJDV3V5VXVM + ZGExZXl1ZWtTMExLalhMUlJqWk01MUkKhCweI+hyY3qCf+XA5XP/QiMG57LQ98/i + msKrrNp6yX5FX32n0mPiVehb/6xY2/mTAtGtIt17MxdMY6QwXjQmEg== -----END AGE ENCRYPTED FILE----- - recipient: age189laethzry4ylnd790dmpuc4xjjuwqxruc76caj3ceqhqug4g9qs0upuvw enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArTklFei8xcUYyKys3WFN4 - UXlubmpWdC9WdUlOVm9nTlVGdUdTaE12SXlBCkZkNVN4aGUxTkJNb1dxLzVMczE1 - ZzdjdWR0SE10Qkx2eXJ3TFltV1pRb0EKLS0tIHJNNmZhV3BCQUtoRjFNM2lLRlh1 - VTA1K0luREtnMU9kSVUrMTBLNEo2WlkK23HeYnA/NIsdXqhqTQIOGSNGmWcgp8KV - yXdyozkRxnBm0xFgGJ+qjCDlOIIBQbgzT66SX+arGEY3g8UGDFEsrA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyU1Nnc2taYWIyVVhEZXVE + MTJLSjhNcG13S2Nqa0E4YnU2ZklZUS9QVUNJCkVUdWRWMGNnRTNSYjNvMjA1YTIx + UXZhTkNwY0Z6VXI1b09yRHl4aUVpYmsKLS0tIE5CZ0VmVHFZTlZJSzB3OTRKeUlz + L2gzMDdySit6VWd4RzBMcENobTJLVGcKMYhRprFglCN5gUpcZ2ZKV8YgwdcRNuOs + h+rEUaHuMlPSGe/t29hU6FfRGJ3vbPAKJpYDWANC6QTF+/TnFokzew== -----END AGE ENCRYPTED FILE----- - recipient: age1w99m9klvc7m5qtmtmu3l0jx8ksdzp5c4p9rkvh5fdullfc6afemqv5py2q enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2aFQrVjcrUFBTVkhkNlhx - cnR6WFdJNW43bDhxWWNLcUtqTENGUkFHVkVZCjBNbHQrNWMzWk9zdE95Wm9CR3hU - RDhBMHdVUXgzditLMTJaM2tJU3ZBVDAKLS0tIGc4MEgwUXBaT2gyNGhnUytjMld5 - OVQzNFJJT0VQT1ZOZ3YwaTUzV09ZbUUK6ZX7XonLQGVQKawwyFAJSlZq9jwKyR+l - MJYtGMFAZv+qGTe/TN2Lhxkfo5VIXQUknt/ud94ceOW8A87WJ5RFIw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGQktCL0QrRGNpVkI5UXQx + bUNQZnc0ZUI0Q3lHQkNnbTk2VGZ1ZDYwY0NnCi9OZkhUc3hSTWhiejZPWVhhdHc1 + d2llWjBKNTVNS21LODIwTlVLNTFUVFEKLS0tIGJLWEZaUGR5YXYvVHIvQUpBU2Jr + QjF6SDZhWktHR1BwdVdBRWIvVTFpT1kK4id9BOXza/HPySMgGi+kjLuQvokUZNlf + 0+vleCcyAIT/9sv/RHm7ctAxsGp/NkdUBr//ED0hhYVd2zszejXHFw== -----END AGE ENCRYPTED FILE----- - recipient: age159whjxeyw94xmkkephmtlur8e85xd9d5vnvkwkcayfv7el0neqfq863yga enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwYlVTci8wU0Q3aWhMKzY0 - UmxIMWRxaHVORS90Tm5rQjJPRERVNSs5VURrCmNCWGN0MEtBMWxGTUsrYlcvWG5s - RTNwc3pFV0J4MERqWENESFFDKzEyYzAKLS0tIGwvM3Y0QU9SM1F6dk9STHJmYnhO - OXptbEVubTdZdHhKc01sdmJ2bTh4L1kKusHQnya/o0TzGK3y084bKrWD67tdQ/aW - 6va2HjLoCBu/dO6yPl9XU+Ocub9AY8p+Rs8XcQS+ypi2sSNi4i2Syw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGd2tSVmR5SjhmR3BSTCtH + NzJLNEYvSVVvaytZOEM0NnJsRjdoL3d2VDJJCi9nbVZzdlJZS2plUjlKWEt3SWxm + WEVrVlpqRUIzYjJTOGFveWR4UjIyWTAKLS0tIEFFajNrLzdXT1JXSXN3eXhGd1Vr + Y2cwK05uWXFhbndyRlhrSFNjYUlmZ1UKZ1vFRu1QhGGf7BIP8TxK2BIlMZlP3muA + R3qLr1lEQmob4O0ilwn65nSCEd1/9W6dUWqeSlJ6CavjG59AvSHfIA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-06-07T16:08:34Z" - mac: ENC[AES256_GCM,data:uMpavfH72TyTc+tRTw+hyv5N+NHdTvO7J4TThOTqV1ACOl9DOIBimUsREDONEgUn4cOdDOZzSR6LDlva60+B30xoJUL8fsRzNXtHkZ/aR0WJmkFcKu5rkVvRQjJt378ICid/et0R4SEojxeIvhI3MzGxyF25NdhIswGKgDh2lMU=,iv:gUbAdaxBJFBXxJHJXeRXTynC4cwaP8vL9Z61TN2pIEw=,tag:lUFk/ydWRO/ZjA4V89IdHw==,type:str] + lastmodified: "2024-11-30T18:44:29Z" + mac: ENC[AES256_GCM,data:SG6a5pWa3gMaSz9d9fOchUXtXbRTpMOXmbOjZo5Fdx8Es1MEDwezwscQaj9p1dzmGa+7U8UUUzMYxlg2SmGgGdPgCs0a5RQVYvQFNdgpRiuknflFMcdgXLv7XFsTqsqSmbN0O662YDvCcz4DWRKjNCZAimlLym8pwDihj1D8dcU=,iv:JmCbcazDK2KPyYsoVy39sr4IbfiGfmGoopit5ojVADk=,tag:6tKYfMkJBjsThaa4qLqobw==,type:str] + pgp: [] unencrypted_suffix: _unencrypted - version: 3.10.2 + version: 3.9.1 diff --git a/secrets/blocktech/colmena.yaml b/secrets/sue/colmena.yaml similarity index 63% rename from secrets/blocktech/colmena.yaml rename to secrets/sue/colmena.yaml index e6c04cc..7d468b0 100644 --- a/secrets/blocktech/colmena.yaml +++ b/secrets/sue/colmena.yaml @@ -1,6 +1,6 @@ sops_nix_keys: root: ENC[AES256_GCM,data:CxF2wjcQ2OFuS7Pgjnc8zc7sqGEz3dcHt4NXkL+V6w7kGPP+b4wBhOlT7b+bEESNslpK2htLY7x+IZWIA8JQpeRKHAKymAUK86I=,iv:5qNFDb86/Vr9Iqzx1eES4wUVY5XTq3iOR4VQliuP1lg=,tag:gx/Q7t52l9kMhPRXdpsB6A==,type:str] - pkunis: ENC[AES256_GCM,data:192vkgOdMoDEhPU6yilatIfaFS/1LJFvteEMYI1/3SBP773lN62pWoDiJDiBtjBCisA/3yHriL3Dpvs1PwbV0BChmbL+svwKrFE=,iv:/YyZ+NSyZwyGp4NJYUSeYOOUfGaH5jOiVUH8QeWnFUA=,tag:sWN0bQvm8Ejw5+XST0pAEQ==,type:str] + pim: ENC[AES256_GCM,data:PWFlRBaqImbCpj3IXU+BtNIRvwru+GRwxDQO4QwINRvxRqC36LE6JpMqaJNrTdCPy+aQ01brTN8y99qXTDlrul32cZnopc37r78=,iv:1tG7rDB5D7D2myes6Ro8hXC140ugjXpiwNpivWFw/xw=,tag:BNm/Ep55tt7xBWZFyzTR5g==,type:str] sops: kms: [] gcp_kms: [] @@ -16,8 +16,8 @@ sops: NkJzL3JSN2sxbnF6NGNhQlJqTHpHRTAKK+3FqqBAGxdlMtnbsySEcZT1lkQwJWvK GFB+6CtH9UtyIGrdK8Pm/0ahsolYGAim2OjeiKBbs3Q8kLm5WAsgRg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-02-25T13:53:06Z" - mac: ENC[AES256_GCM,data:lLojNOq2QtdeqiCHOg6+Kssfa+Ey6JefPQulFkgnr1Onrt60ds2qWg5TTMHMlUaa6vB1S78WqyquTRBLv9Ek/alOae+CgdDi+vVX8hG5Mc2Edcfl+z8rRNFB+2mOEl1gJwKntyxySx6YBiDhZsH0p+Xflw9WGm/lL/FyRCJCwq0=,iv:8PqXupgwdfgdfIzsymVSrjQACoMODR+XYPgLMvASjos=,tag:rLGJlL3alm/qy+3qeS637g==,type:str] + lastmodified: "2024-11-30T23:42:51Z" + mac: ENC[AES256_GCM,data:fo856uaz54nxHDJVDpMOPc6GHAzMdVJTfqBiMtJkEwm3AVICtRcI8ucceBnmfKZf9DM2MC2DffU1tvJd5iqpqFZMXCElRnBxWVZGhvrZqIZtmoAin5zBgwOudf1o6msmdNGmZk1ECq/HpHNO/QMQ3rnFdBvOZwL0zu6iZm9XwC0=,iv:T6Tv1ukk0CWbTRVWYdfn/bWQoETk8DRVMOzpJE9mCWE=,tag:eICIYTBvAJLUTpRcMYqc5Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.1 diff --git a/secrets/sue/nixos.yaml b/secrets/sue/nixos.yaml new file mode 100644 index 0000000..8066caa --- /dev/null +++ b/secrets/sue/nixos.yaml @@ -0,0 +1,24 @@ +wireguard: + home: + presharedKey: ENC[AES256_GCM,data:nFOqWcdo8zG83v1ceod8Uy4wX3w2LHmDPp2PaAAJ/lUexU4DhY9RZ4wtgC8=,iv:UvzQSZZ62I+QVFHMkHczC2KPeqX8z+DodS7nxLmXr4U=,tag:otwdNc2636DJdkzg22puqQ==,type:str] + privateKey: ENC[AES256_GCM,data:RCQ3hvrnxCerTmKYfZFV7c9smMj5tbP+iFWouo1oxfhbec5K3uXipkL+KSg=,iv:zKSPvtDH3WcuxVpQydGScX6m0isZzLKk/F+/Wlpt/YQ=,tag:BDag2DSoHQDzg8xTS3SX3A==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1w99m9klvc7m5qtmtmu3l0jx8ksdzp5c4p9rkvh5fdullfc6afemqv5py2q + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoWEc5K3p3QytpZ1pxeEJy + TUtENXdnT3ZJUGNXaHo0ZktwK21OMVJmNzA4CjdlMUtWY2hBc3U1UVZQZEllK2xC + NGZSK2VyQVdBRmZYejBWM0FIeFE5K2MKLS0tIEQ3MHhOcW92dlo4NUdBdFlKdEM0 + N1Rab3RNZ00vd0xPOVBYRHphaldWU1EKNKnKPWO1l8NwWXG2e15Y3td9I0rN9Wwn + QdoeVf2+cPJOO5g9stZpl2DBF3QxJojt+dQhwjuEbP9nQtlVQPAlMQ== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-11-30T23:42:09Z" + mac: ENC[AES256_GCM,data:nHLeqi4DAoyIi0CfARfx9b753BFdMmIR/fkOrhV5yehl7rUWvSh0+H7sb/ncgW6Blrc5g6Ek8BxXAt8a2SXfCEQaFU6tI1wJ/3mPtEPSvWQnZ75wAQLRgaBE3oxdL2FxSu3sjXMRjipPa/ACbau60FpNFzVbGuwNYfQAquwWtFg=,iv:LYn+36pfIw8zCnhQE4nCyt9yhetoHZRVNrBXL8N12Jo=,tag:aZsxtfEdK99+aBQS6OEwWg==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.1 diff --git a/secrets/blocktech/pkunis.yaml b/secrets/sue/pim.yaml similarity index 100% rename from secrets/blocktech/pkunis.yaml rename to secrets/sue/pim.yaml