From 3ff659d3d35fd20be2d908b3c79be5cf0ae0d023 Mon Sep 17 00:00:00 2001
From: pupbrained <mars@pupbrained.xyz>
Date: Thu, 14 Nov 2024 18:26:02 -0500
Subject: [PATCH] nother update

---
 flake.lock                             |  86 +++++-----
 systems/x86_64-linux/navis/facter.json | 221 +++++++++++++++++--------
 2 files changed, 199 insertions(+), 108 deletions(-)

diff --git a/flake.lock b/flake.lock
index b34a537..af6a2e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730968822,
-        "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=",
+        "lastModified": 1731496216,
+        "narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14",
+        "rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1731455157,
-        "narHash": "sha256-wvJANj/uqb0faYvdll+boJ2unDEfzAT/bvg131Mw0Hw=",
+        "lastModified": 1731549423,
+        "narHash": "sha256-856g6/DYtrC+O9yRlksrKaEWP3jDgJQ9UMmQx/twxBc=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "9dd4ee2b46644cc736c789bcfbf8f904ecbf3529",
+        "rev": "c37212a15dd0dc472d75df4c21c092d1cc9df897",
         "type": "github"
       },
       "original": {
@@ -653,11 +653,11 @@
         "systems": "systems_10"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -671,11 +671,11 @@
         "systems": "systems_11"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -886,11 +886,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731235328,
-        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
+        "lastModified": 1731535640,
+        "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
+        "rev": "35b055009afd0107b69c286fca34d2ad98940d57",
         "type": "github"
       },
       "original": {
@@ -906,11 +906,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731235328,
-        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
+        "lastModified": 1731604581,
+        "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
+        "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
         "type": "github"
       },
       "original": {
@@ -984,11 +984,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1731425185,
-        "narHash": "sha256-hhmwtcOncg/RMmi2KDuvQfhYeahrhc4UsL36/NNdqYI=",
+        "lastModified": 1731616696,
+        "narHash": "sha256-WS7B8lo4zoKZ4K5Djl7GhFdP4trs5TXpKmSTIyNkUCA=",
         "ref": "refs/heads/main",
-        "rev": "bb160cfe377da2d2b2e4431a3399fa60114f3911",
-        "revCount": 5450,
+        "rev": "940ed3d525d838bc255070bd8cfc2f75df04229a",
+        "revCount": 5454,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -1016,11 +1016,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731169722,
-        "narHash": "sha256-hOljwsXpY4Y6guvcr51tWCnXo6c56yaBknnLXk1m3Vk=",
+        "lastModified": 1731619734,
+        "narHash": "sha256-ZroMITOTQ3eu6z+3m7DJtaKePJWDTPuElkgmKl3rl9g=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "844eb98250da448e17471f20beed23a5f5d33a3a",
+        "rev": "344a69db96fa8c6dc3b8f1f8f5a75f6eb441cbf2",
         "type": "github"
       },
       "original": {
@@ -1095,11 +1095,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731163338,
-        "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=",
+        "lastModified": 1731518387,
+        "narHash": "sha256-aZZw1ZvTMLkcA6udlvkA3hrCkuipoWLy8s/JNnIclxY=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "60d3dece30f98e8ad85131829c8529950630d6bc",
+        "rev": "315fba5d21d87ddb756d4bebdb49f99d86b0ffe8",
         "type": "github"
       },
       "original": {
@@ -1306,11 +1306,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731209121,
-        "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
+        "lastModified": 1731593150,
+        "narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
+        "rev": "40d882b55e89add1ded379cc99edaab24983d6d9",
         "type": "github"
       },
       "original": {
@@ -1470,11 +1470,11 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1731319897,
+        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
         "type": "github"
       },
       "original": {
@@ -1745,11 +1745,11 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1731139594,
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
         "type": "github"
       },
       "original": {
@@ -1842,11 +1842,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1730814269,
-        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
+        "lastModified": 1731363552,
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
         "type": "github"
       },
       "original": {
@@ -2214,11 +2214,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1731319897,
+        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
         "type": "github"
       },
       "original": {
diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json
index 9ce24c1..7f3c1f8 100644
--- a/systems/x86_64-linux/navis/facter.json
+++ b/systems/x86_64-linux/navis/facter.json
@@ -102,7 +102,7 @@
         "module_alias": "usb:v8087p0032d0000dcE0dsc01dp01icE0isc01ip01in00"
       },
       {
-        "index": 68,
+        "index": 69,
         "attached_to": 52,
         "class_list": [
           "usb",
@@ -1804,7 +1804,7 @@
         "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00"
       },
       {
-        "index": 65,
+        "index": 66,
         "attached_to": 19,
         "class_list": [
           "usb",
@@ -1887,7 +1887,7 @@
         "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 72,
+        "index": 73,
         "attached_to": 19,
         "class_list": [
           "usb",
@@ -1962,7 +1962,7 @@
     ],
     "keyboard": [
       {
-        "index": 64,
+        "index": 65,
         "attached_to": 54,
         "class_list": [
           "keyboard",
@@ -2005,18 +2005,18 @@
         "model": "Logitech USB Receiver",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.1/3-3.2.1:1.1",
         "sysfs_bus_id": "3-3.2.1:1.1",
-        "unix_device_name": "/dev/input/event10",
+        "unix_device_name": "/dev/input/event13",
         "unix_device_number": {
           "type": 99,
           "major": 13,
-          "minor": 74,
+          "minor": 77,
           "range": 1
         },
         "unix_device_names": [
           "/dev/input/by-id/usb-Logitech_USB_Receiver-if01-event-kbd",
           "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.1:1.1-event-kbd",
           "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.1:1.1-event-kbd",
-          "/dev/input/event10"
+          "/dev/input/event13"
         ],
         "resources": [
           {
@@ -2071,7 +2071,7 @@
         "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip01in01"
       },
       {
-        "index": 67,
+        "index": 68,
         "attached_to": 52,
         "class_list": [
           "keyboard",
@@ -2202,7 +2202,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 67154280448,
+            "range": 67154276352,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -2448,11 +2448,11 @@
         "unix_device_names": [
           "/dev/input/mice"
         ],
-        "unix_device_name2": "/dev/input/mouse0",
+        "unix_device_name2": "/dev/input/mouse1",
         "unix_device_number2": {
           "type": 99,
           "major": 13,
-          "minor": 32,
+          "minor": 33,
           "range": 1
         },
         "resources": [
@@ -2514,7 +2514,7 @@
         "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip02in00"
       },
       {
-        "index": 63,
+        "index": 64,
         "attached_to": 52,
         "class_list": [
           "mouse",
@@ -2569,11 +2569,11 @@
         "unix_device_names": [
           "/dev/input/mice"
         ],
-        "unix_device_name2": "/dev/input/mouse1",
+        "unix_device_name2": "/dev/input/mouse0",
         "unix_device_number2": {
           "type": 99,
           "major": 13,
-          "minor": 33,
+          "minor": 32,
           "range": 1
         },
         "resources": [
@@ -2931,48 +2931,6 @@
       }
     ],
     "network_interface": [
-      {
-        "index": 74,
-        "attached_to": 32,
-        "class_list": [
-          "network_interface"
-        ],
-        "base_class": {
-          "hex": "0107",
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "hex": "0001",
-          "name": "Ethernet",
-          "value": 1
-        },
-        "model": "Ethernet network interface",
-        "sysfs_id": "/class/net/enp5s0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0",
-        "unix_device_name": "enp5s0",
-        "unix_device_names": [
-          "enp5s0"
-        ],
-        "resources": [
-          {
-            "type": "hwaddr",
-            "address": 48
-          },
-          {
-            "type": "phwaddr",
-            "address": 48
-          }
-        ],
-        "driver": "r8169",
-        "driver_module": "r8169",
-        "drivers": [
-          "r8169"
-        ],
-        "driver_modules": [
-          "r8169"
-        ]
-      },
       {
         "index": 75,
         "attached_to": 36,
@@ -3037,6 +2995,48 @@
         "unix_device_names": [
           "lo"
         ]
+      },
+      {
+        "index": 77,
+        "attached_to": 32,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0001",
+          "name": "Ethernet",
+          "value": 1
+        },
+        "model": "Ethernet network interface",
+        "sysfs_id": "/class/net/enp5s0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0",
+        "unix_device_name": "enp5s0",
+        "unix_device_names": [
+          "enp5s0"
+        ],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 48
+          },
+          {
+            "type": "phwaddr",
+            "address": 48
+          }
+        ],
+        "driver": "r8169",
+        "driver_module": "r8169",
+        "drivers": [
+          "r8169"
+        ],
+        "driver_modules": [
+          "r8169"
+        ]
       }
     ],
     "pci": [
@@ -4411,7 +4411,7 @@
         "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in01"
       },
       {
-        "index": 70,
+        "index": 71,
         "attached_to": 45,
         "class_list": [
           "sound",
@@ -4502,7 +4502,7 @@
         "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in04"
       },
       {
-        "index": 71,
+        "index": 72,
         "attached_to": 52,
         "class_list": [
           "sound",
@@ -5090,18 +5090,18 @@
         "model": "SteelSeries Arctis 7",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.5",
         "sysfs_bus_id": "3-3.1:1.5",
-        "unix_device_name": "/dev/input/event13",
+        "unix_device_name": "/dev/input/event11",
         "unix_device_number": {
           "type": 99,
           "major": 13,
-          "minor": 77,
+          "minor": 75,
           "range": 1
         },
         "unix_device_names": [
           "/dev/input/by-id/usb-SteelSeries_SteelSeries_Arctis_7-event-if05",
           "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.1:1.5-event",
           "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.1:1.5-event",
-          "/dev/input/event13"
+          "/dev/input/event11"
         ],
         "resources": [
           {
@@ -5152,6 +5152,97 @@
       },
       {
         "index": 62,
+        "attached_to": 45,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
+        "bus_type": {
+          "hex": "0086",
+          "name": "USB",
+          "value": 134
+        },
+        "slot": {
+          "bus": 0,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0000",
+          "name": "Unclassified device",
+          "value": 0
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Unclassified device",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "1038",
+          "name": "SteelSeries",
+          "value": 4152
+        },
+        "device": {
+          "hex": "12ae",
+          "name": "SteelSeries Arctis 7 Bootloader",
+          "value": 4782
+        },
+        "revision": {
+          "hex": "0000",
+          "name": "1.19",
+          "value": 0
+        },
+        "model": "SteelSeries Arctis 7 Bootloader",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.0",
+        "sysfs_bus_id": "3-3.3:1.0",
+        "resources": [
+          {
+            "type": "baud",
+            "speed": 12000000,
+            "bits": 0,
+            "stop_bits": 0,
+            "parity": 0,
+            "handshake": 0
+          }
+        ],
+        "detail": {
+          "device_class": {
+            "hex": "0000",
+            "name": "per_interface",
+            "value": 0
+          },
+          "device_subclass": {
+            "hex": "0000",
+            "name": "per_interface",
+            "value": 0
+          },
+          "device_protocol": 0,
+          "interface_class": {
+            "hex": "0003",
+            "name": "hid",
+            "value": 3
+          },
+          "interface_subclass": {
+            "hex": "0000",
+            "name": "per_interface",
+            "value": 0
+          },
+          "interface_protocol": 0,
+          "interface_number": 0,
+          "interface_alternate_setting": 0
+        },
+        "hotplug": "usb",
+        "driver": "usbhid",
+        "driver_module": "usbhid",
+        "drivers": [
+          "usbhid"
+        ],
+        "driver_modules": [
+          "usbhid"
+        ],
+        "module_alias": "usb:v1038p12AEd0119dc00dsc00dp00ic03isc00ip00in00"
+      },
+      {
+        "index": 63,
         "attached_to": 54,
         "class_list": [
           "usb",
@@ -5235,7 +5326,7 @@
         "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in02"
       },
       {
-        "index": 66,
+        "index": 67,
         "attached_to": 54,
         "class_list": [
           "usb",
@@ -5340,7 +5431,7 @@
         "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in00"
       },
       {
-        "index": 69,
+        "index": 70,
         "attached_to": 52,
         "class_list": [
           "usb",
@@ -5443,7 +5534,7 @@
         "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic03isc00ip00in03"
       },
       {
-        "index": 73,
+        "index": 74,
         "attached_to": 52,
         "class_list": [
           "usb",
@@ -7012,4 +7103,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file