bollock scommit

Arming the built-in xHCI root hubs made them wake on hub-level events
(USB-C PD negotiation, SD card reader, internal peripherals), causing the
laptop to immediately self-wake from suspend. Drop the root-hub rule and arm
only the keyboard leaf by VID:PID; a leaf device's remote-wakeup propagates
through the hub without the hub's own wakeup flag being set.

modules/attrs/cad/default.nix

@@ -0,0 +1,16 @@
+{
+  self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.cad = moduleWithSystem ({...}: let
+    modules = with self.nixosModules; [
+      freecad
+      openscad
+      prusa-slicer
+    ];
+  in {
+    imports = modules;
+  });
+}
+

modules/features/freecad/default.nix

@@ -0,0 +1,9 @@
+{...}: {
+  # Screenshot capture, region selection, annotation, and clipboard support for
+  # the Hyprland screenshot keybinds managed in the dotfiles repo.
+  flake.nixosModules.freecad = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      freecad
+    ];
+  };
+}

modules/features/openscad/default.nix

@@ -0,0 +1,10 @@
+{...}: {
+  # Screenshot capture, region selection, annotation, and clipboard support for
+  # the Hyprland screenshot keybinds managed in the dotfiles repo.
+  flake.nixosModules.openscad = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      openscad
+      openscad-lsp
+    ];
+  };
+}

modules/features/quickshell/default.nix

@@ -5,5 +5,6 @@
     environment.systemPackages = with pkgs; [
       quickshell
     ];
+    qt.enable = true;
   };
 }

modules/features/sunshine/default.nix

@@ -0,0 +1,12 @@
+{...}: {
+  # TODO: previously injected SLSsteam via LD_AUDIT from the sls-steam flake. Now stock.
+  flake.nixosModules.sunshine = {pkgs, ...}: {
+    services.sunshine = {
+      enable = true;
+      autoStart = true;
+      capSysAdmin = true;
+      openFirewall = true;
+    };
+    hardware.uinput.enable = true;
+  };
+}

modules/hosts/shadow/default.nix

@@ -24,6 +24,7 @@
       printing
       via
       nextcloud
+      sunshine
     ];
   };
 }

modules/hosts/t480/default.nix

@@ -19,6 +19,12 @@
       obsidian
       discord
       gaming
+      winbox
+      cad
+      prusa-slicer
+      netops
+      via
+      t480UsbWakeup
     ];
   };
 }

modules/hosts/t480/t480Configuration.nix

@@ -7,6 +7,13 @@
     networking = {
       hostName = "t480";
     };
+    services.logind = {
+      lidSwitch = "suspend";
+      lidSwitchDocked = "ignore";
+    };
+    services.fwupd = {
+      enable = true;
+    };
   };
 }
 

modules/hosts/t480/usb-wakeup.nix

@@ -0,0 +1,19 @@
+{...}: {
+  flake.nixosModules.t480UsbWakeup = {...}: {
+    services.udev.extraRules = ''
+      # Wake the T480 from S3 suspend via a keyboard plugged into a built-in USB
+      # port. The dock connects over the Thunderbolt-3 controller (3c:00.0), which
+      # powers down in S3 and cannot detect a cold replug — so dock-connected input
+      # cannot wake the machine after an unplug-triggered suspend. The built-in xHCI
+      # (00:14.0) stays wake-capable in S3, so a keyboard on a built-in port works.
+      #
+      # Arm ONLY the keyboard itself (match by VID:PID — the USB bus path is
+      # unstable across re-enumeration). Deliberately do NOT arm the built-in root
+      # hubs: arming a whole root hub makes it wake on hub-level events (USB-C PD
+      # negotiation, the SD card reader, internal peripherals), causing spurious
+      # self-wakes. A leaf device's remote-wakeup propagates through the hub without
+      # the hub's own wakeup flag being set.
+      ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="320f", ATTR{idProduct}=="5055", ATTR{power/wakeup}="enabled"
+    '';
+  };
+}

modules/system/core/user.nix

@@ -36,6 +36,7 @@
       extraGroups = [
         "networkmanager"
         "wheel"
+        "uinput"
       ];
     };
   };