From 547d6dc4731b04a240048b0b95c0ea12e0d1f6bd Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Fri, 9 Jan 2026 20:36:36 -0600
Subject: lots of changes, including revamp of network services boot chain on
 mercury

---
 hosts/mercury/hjem.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'hosts/mercury')

diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index 1db654f..6eba4c9 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -6,6 +6,7 @@
     kdePackages.kleopatra
     mpv
     musescore
+    zed-editor # experimenting
 
     kew # music player
     prismlauncher
-- 
cgit v1.3.1


From 32a7e59b93a9c3748cd6aeca3d4fc9dadf8e0f59 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Sun, 11 Jan 2026 08:03:58 -0600
Subject: move various configs into modules where they belong

---
 hosts/ganymede/nixos.nix         | 23 ++---------------------
 hosts/jupiter/config.nix         |  5 +----
 hosts/jupiter/nixos.nix          | 15 +--------------
 hosts/mercury/config.nix         | 28 ++++++++++++----------------
 hosts/mercury/hjem.nix           |  1 -
 hosts/mercury/nixos.nix          | 11 +++++------
 modules/desktop/nixos/fonts.nix  |  3 +--
 modules/nix/nixos/default.nix    | 10 +++++-----
 modules/services/nixos/audio.nix |  5 +++--
 modules/services/options.nix     |  8 +++-----
 modules/user/nixos/default.nix   |  3 +--
 11 files changed, 34 insertions(+), 78 deletions(-)

(limited to 'hosts/mercury')

diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index ce30973..9dc6dec 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   inputs,
   ...
 }: {
@@ -23,24 +22,6 @@
     networkConfig.DHCP = "yes";
   };
 
-  services.openssh.settings.PasswordAuthentication = lib.mkForce true;
-
-  # services.tsnsrv = {
-  #   enable = true;
-  #   defaults = {
-  #     authKeyPath = config.collinux.secrets."tsnsrv-authkey".path;
-  #     ephemeral = true;
-  #     loginServerUrl = "https://williamsfam.us.com";
-  #   };
-
-  #   services = {
-  #     "adguard" = {
-  #       listenAddr = ":80";
-  #       toURL = "http://localhost:8001";
-  #     };
-  #   };
-  # };
-
-  nixpkgs.hostPlatform = "x86_64-linux";
-  system.stateVersion = "25.05";
+  # i broke something and this fixes it
+  environment.etc."systemd/resolved.conf.d/10-dns.conf".text = config.environment.etc."systemd/resolved.conf".text;
 }
diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index a0c1583..decaa61 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -57,10 +57,7 @@
         sshd.enable = true;
       };
 
-      audio = {
-        enable = true;
-        pulse.enable = true;
-      };
+      audio.enable = true;
 
       bluetooth.enable = true;
     };
diff --git a/hosts/jupiter/nixos.nix b/hosts/jupiter/nixos.nix
index e39328a..80ab0f4 100644
--- a/hosts/jupiter/nixos.nix
+++ b/hosts/jupiter/nixos.nix
@@ -1,21 +1,8 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{inputs, ...}: {
   imports = [
     ./disks.nix
     inputs.nixos-facter-modules.nixosModules.facter
   ];
 
-  boot.blacklistedKernelModules = ["snd_seq_dummy"];
-
-  systemd.network.wait-online.enable = false; # fix for weird wifi issue
-
-  fonts.packages = [pkgs.nerd-fonts.iosevka];
-
   facter.reportPath = ./facter.json;
-  time.timeZone = "America/Chicago";
-  nixpkgs.hostPlatform = "x86_64-linux";
-  system.stateVersion = "25.05";
 }
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 9ee29d0..3fb4753 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -1,20 +1,19 @@
-{pkgs, ...}: {
+{
   collinux = {
     theme = "catppuccin";
     user.name = "collin";
 
     desktop = {
       wallpaper = ./wallpaper.jpg;
-
-      # gtk.enable = true;
-
+      gtk.enable = true;
       greetd.enable = true;
 
       wm = {
-        # sway.enable = true;
         niri.enable = true;
-        components.fuzzel.enable = true;
-        components.dunst.enable = true;
+        components = {
+          fuzzel.enable = true;
+          dunst.enable = true;
+        };
       };
 
       programs = {
@@ -43,26 +42,23 @@
       shells.bash.enable = true; # for nix-shells
 
       programs = {
-        lazygit.enable = true;
         starship.enable = true;
-
         fzf.enable = true;
         bat.enable = true;
         eza.enable = true;
+        helix = {
+          enable = true;
+          hardMode = true;
+        };
 
+        lazygit.enable = true;
+        nh.enable = true;
         git = {
           enable = true;
           userName = "Collin Williams";
           userEmail = "96917990+bluedragon1221@users.noreply.github.com";
           installKey = true;
         };
-
-        nh.enable = true;
-
-        helix = {
-          enable = true;
-          hardMode = true;
-        };
       };
     };
 
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index 6eba4c9..1db654f 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -6,7 +6,6 @@
     kdePackages.kleopatra
     mpv
     musescore
-    zed-editor # experimenting
 
     kew # music player
     prismlauncher
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 558ae60..631a537 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -12,10 +12,11 @@
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
-  systemd.services.systemd-udev-settle.enable = false;
-  networking.interfaces.wlp2s0.useDHCP = false;
-
-  services.sshd.enable = true;
+  services.syncthing = {
+    enable = true;
+    user = "collin";
+    dataDir = "/home/collin/.local/syncthing";
+  };
 
   facter.reportPath = ./facter.json;
 
@@ -25,6 +26,4 @@
     allowedUDPPorts = [445];
     allowedTCPPorts = [8000];
   };
-
-  system.stateVersion = "25.05";
 }
diff --git a/modules/desktop/nixos/fonts.nix b/modules/desktop/nixos/fonts.nix
index 3f10d92..5ac17ec 100644
--- a/modules/desktop/nixos/fonts.nix
+++ b/modules/desktop/nixos/fonts.nix
@@ -1,8 +1,7 @@
 {pkgs, ...}: {
   fonts = {
     enableDefaultPackages = false;
-    # fontDir.enable = true;
     fontconfig.enable = true;
-    packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot)
+    packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot or ghostty)
   };
 }
diff --git a/modules/nix/nixos/default.nix b/modules/nix/nixos/default.nix
index 7116371..c817859 100644
--- a/modules/nix/nixos/default.nix
+++ b/modules/nix/nixos/default.nix
@@ -1,12 +1,9 @@
 {
-  inputs,
   config,
   pkgs,
   ...
 }: {
   nix = {
-    # package = inputs.determinate.packages.${pkgs.system}.default;
-
     gc.automatic = false; # use nh cleaner instead
 
     # Make builds run with low priority so my system stays responsive
@@ -27,9 +24,12 @@
 
   programs.nh = {
     enable = true;
-    flake = "/home/collin/nixos";
+    flake = "/home/${config.collinux.user.name}/nixos";
     clean.enable = true;
   };
 
-  hjem.users."${config.collinux.user.name}".packages = [pkgs.cached-nix-shell];
+  environment.systemPackages = [pkgs.cached-nix-shell];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+  system.stateVersion = "25.05";
 }
diff --git a/modules/services/nixos/audio.nix b/modules/services/nixos/audio.nix
index 93f8289..8f2f23e 100644
--- a/modules/services/nixos/audio.nix
+++ b/modules/services/nixos/audio.nix
@@ -12,9 +12,10 @@ in
       enable = true;
       wireplumber.enable = true;
       alsa.enable = true;
-
-      pulse.enable = cfg.pulse.enable;
+      pulse.enable = false;
     };
 
+    boot.blacklistedKernelModules = ["snd_seq_dummy"]; # remove extraneous alsa midi devices
+
     environment.systemPackages = [pkgs.pwvucontrol];
   }
diff --git a/modules/services/options.nix b/modules/services/options.nix
index df8bc52..16bf5ac 100644
--- a/modules/services/options.nix
+++ b/modules/services/options.nix
@@ -46,11 +46,9 @@ in {
           };
         };
       };
-      audio = {
-        enable = mkEnableOption "pipewire + wireplumber";
-        pulse.enable = mkEnableOption "pipewire-pulse";
-        # some config to make audio work with wine (TODO for jupiter)
-      };
+
+      audio.enable = mkEnableOption "pipewire + wireplumber";
+
       bluetooth = {
         enable = mkEnableOption "bluetooth";
         blueman.enable = mkEnableOption "graphical bluetooth manager";
diff --git a/modules/user/nixos/default.nix b/modules/user/nixos/default.nix
index b14e52d..0b0ae41 100644
--- a/modules/user/nixos/default.nix
+++ b/modules/user/nixos/default.nix
@@ -1,13 +1,12 @@
 {
   config,
-  hostname,
   lib,
   ...
 }: let
   cfg = config.collinux.user;
 in {
   users = {
-    mutableUsers = true;
+    mutableUsers = true; # system passwords stored mutably
 
     users."${cfg.name}" = {
       isNormalUser = true;
-- 
cgit v1.3.1


From 31626c1d32fba39f963ec37f7f2ce2943ea9bf29 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Mon, 12 Jan 2026 13:36:22 -0600
Subject: start using tmux

---
 hosts/mercury/config.nix                | 2 ++
 modules/terminal/hjem/programs/tmux.nix | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'hosts/mercury')

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 3fb4753..3427a2e 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -51,6 +51,8 @@
           hardMode = true;
         };
 
+        tmux.enable = true;
+
         lazygit.enable = true;
         nh.enable = true;
         git = {
diff --git a/modules/terminal/hjem/programs/tmux.nix b/modules/terminal/hjem/programs/tmux.nix
index 8525569..dd235c1 100644
--- a/modules/terminal/hjem/programs/tmux.nix
+++ b/modules/terminal/hjem/programs/tmux.nix
@@ -16,8 +16,8 @@ in {
       enable = true;
 
       theme = {
-        bg = config.collinux.palette.base01;
-        bg_dark = config.collinux.palette.base00;
+        bg = "#${config.collinux.palette.base01}";
+        bg_dark = "#${config.collinux.palette.base00}";
       };
 
       keys.leader = [
-- 
cgit v1.3.1


From bd5c9fd6ecb52095e463a2edc0d3ee32f43c849d Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Wed, 14 Jan 2026 13:34:55 -0600
Subject: configurable greeter for greetd

---
 hosts/mercury/config.nix                  |  9 ++++--
 modules/desktop/nixos/greeters/greetd.nix | 28 +++++++++++++----
 modules/desktop/options.nix               | 50 +++++++++++++++----------------
 3 files changed, 53 insertions(+), 34 deletions(-)

(limited to 'hosts/mercury')

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 3427a2e..657c4e5 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -6,10 +6,15 @@
     desktop = {
       wallpaper = ./wallpaper.jpg;
       gtk.enable = true;
-      greetd.enable = true;
+      greetd = {
+        enable = true;
+        autologin.enable = true;
+      };
 
       wm = {
-        niri.enable = true;
+        # niri.enable = true;
+        sway.enable = true;
+
         components = {
           fuzzel.enable = true;
           dunst.enable = true;
diff --git a/modules/desktop/nixos/greeters/greetd.nix b/modules/desktop/nixos/greeters/greetd.nix
index b612c86..02af31f 100644
--- a/modules/desktop/nixos/greeters/greetd.nix
+++ b/modules/desktop/nixos/greeters/greetd.nix
@@ -1,19 +1,35 @@
 {
+  pkgs,
   config,
   lib,
   ...
 }: let
   cfg = config.collinux.desktop.greetd;
+
+  session =
+    if cfg.cosmic-greeter.enable
+    then {
+      command = "${pkgs.cosmic-greeter}/bin/cosmic-greeter-start";
+      user = config.collinux.user.name;
+    }
+    else if cfg.autologin.enable
+    then {
+      user = config.collinux.user.name;
+      command = with config.collinux.desktop;
+        if (wm.sway.enable && !gnome.enable && !wm.niri.enable)
+        then lib.getExe pkgs.sway
+        else if (wm.niri.enable && !gnome.enable && !wm.sway.enable)
+        then "${pkgs.niri}/bin/niri-session"
+        else null;
+    }
+    else {};
 in
   lib.mkIf cfg.enable {
     services.greetd = {
       enable = true;
-      settings = rec {
-        initial_session = {
-          command = cfg.command;
-          user = config.collinux.user.name;
-        };
-        default_session = initial_session;
+      settings = {
+        initial_session = session;
+        default_session = session;
       };
     };
   }
diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix
index e59ed68..a4ba38d 100644
--- a/modules/desktop/options.nix
+++ b/modules/desktop/options.nix
@@ -22,18 +22,8 @@ in {
 
       greetd = {
         enable = mkEnableOption "greetd greeter";
-        command = mkOption {
-          type = lib.types.str;
-          internal = true;
-          default = let
-            cfg = config.collinux.desktop;
-          in
-            if (cfg.wm.sway.enable && !cfg.gnome.enable && !cfg.wm.niri.enable)
-            then lib.getExe pkgs.sway
-            else if (cfg.wm.niri.enable && !cfg.gnome.enable && !cfg.wm.sway.enable)
-            then "${pkgs.niri}/bin/niri-session"
-            else null;
-        };
+        autologin.enable = mkEnableOption "autologin";
+        cosmic-greeter.enable = mkEnableOption "cosmic-greeter";
       };
       gdm.enable = mkEnableOption "gdm display manager";
 
@@ -55,13 +45,15 @@ in {
         cursor_data = mkOption {
           internal = true;
           type = lib.types.submodule {
-            package = mkOption {
-              internal = true;
-              type = lib.types.package;
-            };
-            name = mkOption {
-              internal = true;
-              type = lib.types.str;
+            options = {
+              package = mkOption {
+                internal = true;
+                type = lib.types.package;
+              };
+              name = mkOption {
+                internal = true;
+                type = lib.types.str;
+              };
             };
           };
           default =
@@ -81,13 +73,15 @@ in {
         theme_data = mkOption {
           internal = true;
           type = lib.types.submodule {
-            package = mkOption {
-              internal = true;
-              type = lib.types.package;
-            };
-            name = mkOption {
-              internal = true;
-              type = lib.types.str;
+            options = {
+              package = mkOption {
+                internal = true;
+                type = lib.types.package;
+              };
+              name = mkOption {
+                internal = true;
+                type = lib.types.str;
+              };
             };
           };
 
@@ -141,6 +135,10 @@ in {
         assertion = with config.collinux.desktop; !(gdm.enable && greetd.enable);
         message = "Can't enable gdm and greetd at the same time";
       }
+      {
+        assertion = with config.collinux.desktop.greetd; enable && !(autologin.enable && cosmic-greeter.enable);
+        message = "Can't use autologin and cosmic-greeter at the same time";
+      }
     ];
   };
 }
-- 
cgit v1.3.1


From 1abc71deb39bcac0843f6eae6efa12a79255f166 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Fri, 16 Jan 2026 16:55:51 -0600
Subject: update facter (was wrongly generated for some reason)

---
 hosts/mercury/facter.json | 801 +++++++++++-----------------------------------
 1 file changed, 183 insertions(+), 618 deletions(-)

(limited to 'hosts/mercury')

diff --git a/hosts/mercury/facter.json b/hosts/mercury/facter.json
index 17aa2a1..cd802f7 100644
--- a/hosts/mercury/facter.json
+++ b/hosts/mercury/facter.json
@@ -23,8 +23,8 @@
     },
     "bluetooth": [
       {
-        "index": 42,
-        "attached_to": 44,
+        "index": 41,
+        "attached_to": 43,
         "class_list": [
           "usb",
           "bluetooth"
@@ -107,8 +107,8 @@
         "module_alias": "usb:v8087p0A2Bd0010dcE0dsc01dp01icE0isc01ip01in00"
       },
       {
-        "index": 47,
-        "attached_to": 44,
+        "index": 45,
+        "attached_to": 43,
         "class_list": [
           "usb",
           "bluetooth"
@@ -247,26 +247,21 @@
         "model": "Intel PCI bridge",
         "sysfs_id": "/devices/pci0000:00/0000:00:1c.0",
         "sysfs_bus_id": "0000:00:1c.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 120,
-            "triggered": 0,
-            "enabled": true
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 2,
-          "irq": 120,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00009D10sv000017AAsd0000225Cbc06sc04i00"
       },
       {
@@ -324,7 +319,6 @@
           "command": 7,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 0,
           "prog_if": 0
         },
         "module_alias": "pci:v00008086d00009D4Esv000017AAsd0000225Cbc06sc01i00"
@@ -384,26 +378,21 @@
         "model": "Intel PCI bridge",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0/0000:06:01.0",
         "sysfs_bus_id": "0000:06:01.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 124,
-            "triggered": 0,
-            "enabled": true
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 8,
-          "irq": 124,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000015D3sv00002222sd00001111bc06sc04i00"
       },
       {
@@ -461,26 +450,21 @@
         "model": "Intel PCI bridge",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0/0000:06:04.0",
         "sysfs_bus_id": "0000:06:04.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 126,
-            "triggered": 0,
-            "enabled": true
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 60,
-          "irq": 126,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000015D3sv00002222sd00001111bc06sc04i00"
       },
       {
@@ -538,7 +522,6 @@
           "command": 6,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 0,
           "prog_if": 0
         },
         "driver": "skl_uncore",
@@ -606,26 +589,21 @@
         "model": "Intel PCI bridge",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0/0000:06:00.0",
         "sysfs_bus_id": "0000:06:00.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 123,
-            "triggered": 0,
-            "enabled": true
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1030,
           "header_type": 1,
           "secondary_bus": 7,
-          "irq": 123,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000015D3sv00002222sd00001111bc06sc04i00"
       },
       {
@@ -683,26 +661,21 @@
         "model": "Intel PCI bridge",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0",
         "sysfs_bus_id": "0000:05:00.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 16,
-            "triggered": 0,
-            "enabled": true
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 7,
           "header_type": 1,
           "secondary_bus": 6,
-          "irq": 16,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000015D3sv00002222sd00001111bc06sc04i00"
       },
       {
@@ -760,26 +733,21 @@
         "model": "Intel PCI bridge",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0",
         "sysfs_bus_id": "0000:00:1d.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 122,
-            "triggered": 0,
-            "enabled": true
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 5,
-          "irq": 122,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00009D18sv000017AAsd0000225Cbc06sc04i00"
       },
       {
@@ -837,26 +805,21 @@
         "model": "Intel PCI bridge",
         "sysfs_id": "/devices/pci0000:00/0000:00:1c.4",
         "sysfs_bus_id": "0000:00:1c.4",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 121,
-            "triggered": 0,
-            "enabled": true
-          }
-        ],
         "detail": {
           "function": 4,
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 4,
-          "irq": 121,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00009D14sv000017AAsd0000225Cbc06sc04i00"
       },
       {
@@ -914,33 +877,28 @@
         "model": "Intel PCI bridge",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0/0000:06:02.0",
         "sysfs_bus_id": "0000:06:02.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 125,
-            "triggered": 0,
-            "enabled": true
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1030,
           "header_type": 1,
           "secondary_bus": 59,
-          "irq": 125,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000015D3sv00002222sd00001111bc06sc04i00"
       }
     ],
     "camera": [
       {
-        "index": 40,
-        "attached_to": 44,
+        "index": 39,
+        "attached_to": 43,
         "class_list": [
           "camera",
           "usb"
@@ -1040,8 +998,8 @@
         "module_alias": "usb:v5986p2115d5420dcEFdsc02dp01ic0Eisc02ip00in01"
       },
       {
-        "index": 46,
-        "attached_to": 44,
+        "index": 44,
+        "attached_to": 43,
         "class_list": [
           "camera",
           "usb"
@@ -1145,6 +1103,7 @@
       {
         "architecture": "x86_64",
         "vendor_name": "GenuineIntel",
+        "model_name": "Intel(R) Core(TM) i5-8250U CPU @ 1.60GHz",
         "family": 6,
         "model": 142,
         "stepping": 10,
@@ -1279,23 +1238,28 @@
           "srbds",
           "mmio_stale_data",
           "retbleed",
-          "gds"
+          "gds",
+          "vmscape"
+        ],
+        "power_management": [
+          ""
         ],
         "bogo": 3600,
         "cache": 6144,
         "units": 16,
+        "page_size": 4096,
         "physical_id": 0,
         "siblings": 8,
         "cores": 4,
-        "fpu": true,
-        "fpu_exception": true,
+        "fpu": false,
+        "fpu_exception": false,
         "cpuid_level": 22,
         "write_protect": false,
         "clflush_size": 64,
         "cache_alignment": 64,
         "address_sizes": {
-          "physical": 39,
-          "virtual": 48
+          "physical": "0x27",
+          "virtual": "0x30"
         }
       }
     ],
@@ -1349,13 +1313,6 @@
         "sysfs_id": "/class/block/nvme0n1",
         "sysfs_bus_id": "nvme0",
         "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.4/0000:04: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-LENSE20256GMSP34MEAT2TA_1204748913815",
           "/dev/disk/by-id/nvme-LENSE20256GMSP34MEAT2TA_1204748913815_1",
@@ -1369,7 +1326,7 @@
             "cylinders": 244198,
             "heads": 64,
             "sectors": 32,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -1390,22 +1347,11 @@
       },
       {
         "index": 38,
-        "attached_to": 33,
+        "attached_to": 0,
         "class_list": [
           "disk",
-          "usb",
-          "scsi",
           "block_device"
         ],
-        "bus_type": {
-          "hex": "0084",
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 0,
-          "number": 0
-        },
         "base_class": {
           "hex": "0106",
           "name": "Mass Storage Device",
@@ -1416,67 +1362,21 @@
           "name": "Disk",
           "value": 0
         },
-        "vendor": {
-          "hex": "0bda",
-          "name": "Generic-",
-          "value": 3034
-        },
-        "device": {
-          "hex": "0328",
-          "name": "SD/MMC CRW",
-          "value": 808
-        },
-        "revision": {
-          "hex": "0000",
-          "name": "1.00",
-          "value": 0
-        },
-        "serial": "2012062914345300",
-        "model": "Generic SD/MMC CRW",
-        "sysfs_id": "/class/block/sda",
-        "sysfs_bus_id": "0:0:0:0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb2/2-3/2-3:1.0/host0/target0:0:0/0:0:0:0",
-        "unix_device_name": "/dev/sda",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 0,
-          "range": 16
-        },
+        "model": "Disk",
+        "sysfs_id": "/class/block/zram0",
         "unix_device_names": [
-          "/dev/disk/by-id/usb-Generic-_SD_MMC_CRW_28203008282014000-0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:0",
-          "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3: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
-        },
+          "/dev/disk/by-label/zram0",
+          "/dev/disk/by-uuid/22842fef-9562-4ab2-9265-59e4f1f5d3f3",
+          "/dev/zram0"
+        ],
         "resources": [
           {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 0,
-            "sectors": 62,
-            "size": 0,
-            "geo_type": "logical"
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 986368,
+            "value_2": 4096
           }
-        ],
-        "driver": "usb-storage",
-        "driver_module": "usb_storage",
-        "drivers": [
-          "sd",
-          "usb-storage"
-        ],
-        "driver_modules": [
-          "sd_mod",
-          "usb_storage"
-        ],
-        "module_alias": "usb:v0BDAp0328d2908dc00dsc00dp00ic08isc06ip50in00"
+        ]
       }
     ],
     "graphics_card": [
@@ -1542,36 +1442,6 @@
             "range": 64,
             "enabled": true,
             "access": "read_write"
-          },
-          {
-            "type": "irq",
-            "base": 127,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 204547817472,
-            "range": 268435456,
-            "enabled": true,
-            "access": "read_only",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 206057766912,
-            "range": 16777216,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 786432,
-            "range": 131072,
-            "enabled": false,
-            "access": "read_write",
-            "prefetch": "no"
           }
         ],
         "detail": {
@@ -1579,7 +1449,6 @@
           "command": 1031,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 127,
           "prog_if": 0
         },
         "driver": "i915",
@@ -1595,7 +1464,7 @@
     ],
     "hub": [
       {
-        "index": 41,
+        "index": 40,
         "attached_to": 12,
         "class_list": [
           "usb",
@@ -1617,7 +1486,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.12.23 xhci-hcd",
+          "name": "Linux 6.12.64 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1631,7 +1500,7 @@
           "value": 0
         },
         "serial": "0000:3b:00.0",
-        "model": "Linux 6.12.23 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.12.64 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0/0000:06:02.0/0000:3b:00.0/usb3/3-0:1.0",
         "sysfs_bus_id": "3-0:1.0",
         "resources": [
@@ -1672,13 +1541,17 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
+        "driver_modules": [
+          "usbcore"
+        ],
         "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 43,
+        "index": 42,
         "attached_to": 12,
         "class_list": [
           "usb",
@@ -1700,7 +1573,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.12.23 xhci-hcd",
+          "name": "Linux 6.12.64 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1714,7 +1587,7 @@
           "value": 0
         },
         "serial": "0000:3b:00.0",
-        "model": "Linux 6.12.23 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.12.64 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0/0000:06:02.0/0000:3b:00.0/usb4/4-0:1.0",
         "sysfs_bus_id": "4-0:1.0",
         "detail": {
@@ -1745,13 +1618,17 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
+        "driver_modules": [
+          "usbcore"
+        ],
         "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00"
       },
       {
-        "index": 44,
+        "index": 43,
         "attached_to": 33,
         "class_list": [
           "usb",
@@ -1773,7 +1650,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.12.23 xhci-hcd",
+          "name": "Linux 6.12.64 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1787,7 +1664,7 @@
           "value": 0
         },
         "serial": "0000:00:14.0",
-        "model": "Linux 6.12.23 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.12.64 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": [
@@ -1828,13 +1705,17 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
+        "driver_modules": [
+          "usbcore"
+        ],
         "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 48,
+        "index": 46,
         "attached_to": 33,
         "class_list": [
           "usb",
@@ -1856,7 +1737,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.12.23 xhci-hcd",
+          "name": "Linux 6.12.64 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1870,7 +1751,7 @@
           "value": 0
         },
         "serial": "0000:00:14.0",
-        "model": "Linux 6.12.23 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.12.64 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": {
@@ -1901,9 +1782,13 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
+        "driver_modules": [
+          "usbcore"
+        ],
         "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00"
       }
     ],
@@ -1926,14 +1811,6 @@
         },
         "model": "Main Memory",
         "resources": [
-          {
-            "type": "mem",
-            "base": 0,
-            "range": 8080396288,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "unknown"
-          },
           {
             "type": "phys_mem",
             "range": 8053063680
@@ -2021,7 +1898,7 @@
     ],
     "mouse": [
       {
-        "index": 52,
+        "index": 51,
         "attached_to": 0,
         "bus_type": {
           "hex": "0008",
@@ -2046,7 +1923,7 @@
           "hex": "0000",
           "value": 0
         },
-        "sysfs_id": "/devices/pci0000:00/0000:00:1f.4/i2c-6/6-002c/rmi4-00/input/input9",
+        "sysfs_id": "/devices/pci0000:00/0000:00:1f.4/i2c-6/6-002c/rmi4-00/input/input14",
         "unix_device_names": [
           "/dev/input/event12",
           "/dev/input/ + handler"
@@ -2106,32 +1983,17 @@
         "model": "Intel WLAN controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:1c.0/0000:02:00.0",
         "sysfs_bus_id": "0000:02:00.0",
-        "unix_device_name": "wlp2s0",
         "unix_device_names": [
-          "wlp2s0"
+          "wlan0"
         ],
         "resources": [
           {
             "type": "hwaddr",
-            "address": 51
-          },
-          {
-            "type": "irq",
-            "base": 171,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 3995074560,
-            "range": 8192,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
+            "address": 100
           },
           {
             "type": "phwaddr",
-            "address": 51
+            "address": 100
           },
           {
             "type": "wlan",
@@ -2222,7 +2084,6 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 171,
           "prog_if": 0
         },
         "driver": "iwlwifi",
@@ -2285,7 +2146,6 @@
         "model": "Intel Ethernet controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:1f.6",
         "sysfs_bus_id": "0000:00:1f.6",
-        "unix_device_name": "enp0s31f6",
         "unix_device_names": [
           "enp0s31f6"
         ],
@@ -2294,20 +2154,6 @@
             "type": "hwaddr",
             "address": 56
           },
-          {
-            "type": "irq",
-            "base": 170,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 3996123136,
-            "range": 131072,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
           {
             "type": "phwaddr",
             "address": 56
@@ -2318,7 +2164,6 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 170,
           "prog_if": 0
         },
         "driver": "e1000e",
@@ -2334,8 +2179,8 @@
     ],
     "network_interface": [
       {
-        "index": 49,
-        "attached_to": 17,
+        "index": 47,
+        "attached_to": 29,
         "class_list": [
           "network_interface"
         ],
@@ -2350,34 +2195,33 @@
           "value": 1
         },
         "model": "Ethernet network interface",
-        "sysfs_id": "/class/net/wlp2s0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:02:00.0",
-        "unix_device_name": "wlp2s0",
+        "sysfs_id": "/class/net/enp0s31f6",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1f.6",
         "unix_device_names": [
-          "wlp2s0"
+          "enp0s31f6"
         ],
         "resources": [
           {
             "type": "hwaddr",
-            "address": 51
+            "address": 56
           },
           {
             "type": "phwaddr",
-            "address": 51
+            "address": 56
           }
         ],
-        "driver": "iwlwifi",
-        "driver_module": "iwlwifi",
+        "driver": "e1000e",
+        "driver_module": "e1000e",
         "drivers": [
-          "iwlwifi"
+          "e1000e"
         ],
         "driver_modules": [
-          "iwlwifi"
+          "e1000e"
         ]
       },
       {
-        "index": 50,
-        "attached_to": 0,
+        "index": 49,
+        "attached_to": 17,
         "class_list": [
           "network_interface"
         ],
@@ -2387,20 +2231,38 @@
           "value": 263
         },
         "sub_class": {
-          "hex": "0000",
-          "name": "Loopback",
-          "value": 0
+          "hex": "000a",
+          "name": "WLAN",
+          "value": 10
         },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_name": "lo",
+        "model": "WLAN network interface",
+        "sysfs_id": "/class/net/wlan0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:02:00.0",
         "unix_device_names": [
-          "lo"
+          "wlan0"
+        ],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 100
+          },
+          {
+            "type": "phwaddr",
+            "address": 100
+          }
+        ],
+        "driver": "iwlwifi",
+        "driver_module": "iwlwifi",
+        "drivers": [
+          "iwlwifi"
+        ],
+        "driver_modules": [
+          "iwlwifi"
         ]
       },
       {
-        "index": 51,
-        "attached_to": 29,
+        "index": 50,
+        "attached_to": 0,
         "class_list": [
           "network_interface"
         ],
@@ -2410,34 +2272,14 @@
           "value": 263
         },
         "sub_class": {
-          "hex": "0001",
-          "name": "Ethernet",
-          "value": 1
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
         },
-        "model": "Ethernet network interface",
-        "sysfs_id": "/class/net/enp0s31f6",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1f.6",
-        "unix_device_name": "enp0s31f6",
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
         "unix_device_names": [
-          "enp0s31f6"
-        ],
-        "resources": [
-          {
-            "type": "hwaddr",
-            "address": 56
-          },
-          {
-            "type": "phwaddr",
-            "address": 56
-          }
-        ],
-        "driver": "e1000e",
-        "driver_module": "e1000e",
-        "drivers": [
-          "e1000e"
-        ],
-        "driver_modules": [
-          "e1000e"
+          "lo"
         ]
       }
     ],
@@ -2492,22 +2334,11 @@
         "model": "Intel Memory controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:1f.2",
         "sysfs_bus_id": "0000:00:1f.2",
-        "resources": [
-          {
-            "type": "mem",
-            "base": 3996254208,
-            "range": 16384,
-            "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:v00008086d00009D21sv000017AAsd0000225Cbc05sc80i00"
@@ -2558,28 +2389,11 @@
         "model": "Intel System peripheral",
         "sysfs_id": "/devices/pci0000:00/0000:00:08.0",
         "sysfs_bus_id": "0000:00:08.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 255,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 206074736640,
-            "range": 4096,
-            "enabled": false,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 0,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 255,
           "prog_if": 0
         },
         "module_alias": "pci:v00008086d00001911sv000017AAsd0000225Cbc08sc80i00"
@@ -2634,28 +2448,11 @@
         "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": 206074675200,
-            "range": 32768,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 2,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 16,
           "prog_if": 0
         },
         "driver": "proc_thermal",
@@ -2718,28 +2515,11 @@
         "model": "Intel Communication controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:16.0",
         "sysfs_bus_id": "0000:00:16.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 136,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 206074728448,
-            "range": 4096,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 136,
           "prog_if": 0
         },
         "driver": "mei_me",
@@ -2802,36 +2582,11 @@
         "model": "Intel System peripheral",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0/0000:06:00.0/0000:07:00.0",
         "sysfs_bus_id": "0000:07:00.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 16,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 3992977408,
-            "range": 262144,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 3993239552,
-            "range": 4096,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 16,
           "prog_if": 0
         },
         "driver": "thunderbolt",
@@ -2894,28 +2649,11 @@
         "model": "Intel Signal processing controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.2",
         "sysfs_bus_id": "0000:00:14.2",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 18,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 206074732544,
-            "range": 4096,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
         "detail": {
           "function": 2,
           "command": 2,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 18,
           "prog_if": 0
         },
         "driver": "intel_pch_thermal",
@@ -2985,20 +2723,6 @@
             "range": 32,
             "enabled": true,
             "access": "read_write"
-          },
-          {
-            "type": "irq",
-            "base": 16,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 206074724352,
-            "range": 256,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
           }
         ],
         "detail": {
@@ -3006,7 +2730,6 @@
           "command": 3,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 16,
           "prog_if": 0
         },
         "driver": "i801_smbus",
@@ -3074,36 +2797,11 @@
         "model": "Intel Multimedia controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:1f.3",
         "sysfs_bus_id": "0000:00:1f.3",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 172,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 206074544128,
-            "range": 65536,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 206074707968,
-            "range": 16384,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
         "detail": {
           "function": 3,
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 172,
           "prog_if": 128
         },
         "driver": "snd_hda_intel",
@@ -3166,28 +2864,11 @@
         "model": "Mass storage controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:1c.4/0000:04:00.0",
         "sysfs_bus_id": "0000:04:00.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 16,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 3994025984,
-            "range": 16384,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 16,
           "prog_if": 2
         },
         "driver": "nvme",
@@ -3204,90 +2885,6 @@
     "system": {
       "form_factor": "laptop"
     },
-    "usb": [
-      {
-        "index": 39,
-        "attached_to": 44,
-        "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": "06cb",
-          "value": 1739
-        },
-        "device": {
-          "hex": "009a",
-          "value": 154
-        },
-        "revision": {
-          "hex": "0000",
-          "name": "1.64",
-          "value": 0
-        },
-        "serial": "4a76b8863642",
-        "model": "Unclassified device",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-9/1-9:1.0",
-        "sysfs_bus_id": "1-9:1.0",
-        "resources": [
-          {
-            "type": "baud",
-            "speed": 12000000,
-            "bits": 0,
-            "stop_bits": 0,
-            "parity": 0,
-            "handshake": 0
-          }
-        ],
-        "detail": {
-          "device_class": {
-            "hex": "00ff",
-            "name": "vendor_spec",
-            "value": 255
-          },
-          "device_subclass": {
-            "hex": "0010",
-            "name": "audio_video",
-            "value": 16
-          },
-          "device_protocol": 255,
-          "interface_class": {
-            "hex": "00ff",
-            "name": "vendor_spec",
-            "value": 255
-          },
-          "interface_subclass": {
-            "hex": "0000",
-            "name": "per_interface",
-            "value": 0
-          },
-          "interface_protocol": 0,
-          "interface_number": 0,
-          "interface_alternate_setting": 0
-        },
-        "hotplug": "usb",
-        "module_alias": "usb:v06CBp009Ad0164dcFFdsc10dpFFicFFisc00ip00in00"
-      }
-    ],
     "usb_controller": [
       {
         "index": 12,
@@ -3343,28 +2940,11 @@
         "model": "Intel USB Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:05:00.0/0000:06:02.0/0000:3b:00.0",
         "sysfs_bus_id": "0000:3b:00.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 137,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 3622830080,
-            "range": 65536,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
         "detail": {
           "function": 0,
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 137,
           "prog_if": 48
         },
         "driver": "xhci_hcd",
@@ -3431,28 +3011,11 @@
         "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": 206074609664,
-            "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",
@@ -3636,38 +3199,40 @@
         ]
       }
     ],
-    "chassis": {
-      "handle": 14,
-      "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": 14,
+        "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"
+      }
+    ],
     "config": {
       "handle": 34
     },
@@ -3736,7 +3301,7 @@
           "name": "None",
           "value": 3
         },
-        "max_size": 8388608,
+        "max_size": "0x800000",
         "error_handle": 65534,
         "slots": 2
       }
@@ -3745,8 +3310,8 @@
       {
         "handle": 6,
         "array_handle": 3,
-        "start_address": 0,
-        "end_address": 8589934592,
+        "start_address": "0x0",
+        "end_address": "0x200000000",
         "part_width": 2
       }
     ],
@@ -3825,8 +3390,8 @@
           "value": 2
         },
         "syndrome": 0,
-        "array_address": 2147483648,
-        "device_address": 2147483648,
+        "array_address": "0x80000000",
+        "device_address": "0x80000000",
         "range": 2147483648
       }
     ],
@@ -4069,4 +3634,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
-- 
cgit v1.3.1


From b45860b940d7082f1df9cd23be4e5f277fc777f1 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Fri, 16 Jan 2026 17:38:42 -0600
Subject: enable printing on ganymede

---
 hosts/mercury/nixos.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'hosts/mercury')

diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 631a537..dcdd8c6 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -18,6 +18,8 @@
     dataDir = "/home/collin/.local/syncthing";
   };
 
+  services.printing.enable = true;
+
   facter.reportPath = ./facter.json;
 
   environment.defaultPackages = lib.mkForce []; # im not a noob
-- 
cgit v1.3.1


From 5253ac591f124183c12a0d5527f9b52e1c855ea3 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Fri, 16 Jan 2026 17:46:31 -0600
Subject: reorganize and add wallpaper(s)

---
 hosts/mercury/config.nix                     |   3 +--
 hosts/mercury/hintergrund2.png               | Bin 11700308 -> 0 bytes
 hosts/mercury/riverboats.png                 | Bin 26692151 -> 0 bytes
 hosts/mercury/wallpaper.jpg                  | Bin 169046 -> 0 bytes
 hosts/mercury/wallpapers/abstract-swirls.jpg | Bin 0 -> 418147 bytes
 hosts/mercury/wallpapers/astronaut.jpg       | Bin 0 -> 169046 bytes
 hosts/mercury/wallpapers/hintergrund2.png    | Bin 0 -> 11700308 bytes
 hosts/mercury/wallpapers/riverboats.png      | Bin 0 -> 26692151 bytes
 8 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 hosts/mercury/hintergrund2.png
 delete mode 100644 hosts/mercury/riverboats.png
 delete mode 100644 hosts/mercury/wallpaper.jpg
 create mode 100644 hosts/mercury/wallpapers/abstract-swirls.jpg
 create mode 100644 hosts/mercury/wallpapers/astronaut.jpg
 create mode 100644 hosts/mercury/wallpapers/hintergrund2.png
 create mode 100644 hosts/mercury/wallpapers/riverboats.png

(limited to 'hosts/mercury')

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 657c4e5..e9c7d9e 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -4,7 +4,7 @@
     user.name = "collin";
 
     desktop = {
-      wallpaper = ./wallpaper.jpg;
+      wallpaper = ./wallpapers/abstract-swirls.jpg;
       gtk.enable = true;
       greetd = {
         enable = true;
@@ -12,7 +12,6 @@
       };
 
       wm = {
-        # niri.enable = true;
         sway.enable = true;
 
         components = {
diff --git a/hosts/mercury/hintergrund2.png b/hosts/mercury/hintergrund2.png
deleted file mode 100644
index 6cf9a8f..0000000
Binary files a/hosts/mercury/hintergrund2.png and /dev/null differ
diff --git a/hosts/mercury/riverboats.png b/hosts/mercury/riverboats.png
deleted file mode 100644
index c390ca7..0000000
Binary files a/hosts/mercury/riverboats.png and /dev/null differ
diff --git a/hosts/mercury/wallpaper.jpg b/hosts/mercury/wallpaper.jpg
deleted file mode 100644
index 039afcc..0000000
Binary files a/hosts/mercury/wallpaper.jpg and /dev/null differ
diff --git a/hosts/mercury/wallpapers/abstract-swirls.jpg b/hosts/mercury/wallpapers/abstract-swirls.jpg
new file mode 100644
index 0000000..0948796
Binary files /dev/null and b/hosts/mercury/wallpapers/abstract-swirls.jpg differ
diff --git a/hosts/mercury/wallpapers/astronaut.jpg b/hosts/mercury/wallpapers/astronaut.jpg
new file mode 100644
index 0000000..039afcc
Binary files /dev/null and b/hosts/mercury/wallpapers/astronaut.jpg differ
diff --git a/hosts/mercury/wallpapers/hintergrund2.png b/hosts/mercury/wallpapers/hintergrund2.png
new file mode 100644
index 0000000..6cf9a8f
Binary files /dev/null and b/hosts/mercury/wallpapers/hintergrund2.png differ
diff --git a/hosts/mercury/wallpapers/riverboats.png b/hosts/mercury/wallpapers/riverboats.png
new file mode 100644
index 0000000..c390ca7
Binary files /dev/null and b/hosts/mercury/wallpapers/riverboats.png differ
-- 
cgit v1.3.1