Updates thinkpad host for new Hyprland config and WiFi

home/linux/hyprland.nix

@@ -3,8 +3,11 @@
   pkgs,
   lib,
   globals,
+  osConfig,
   ...
-}: {
+}: let
+  host = osConfig.networking.hostName;
+in {
   imports = [
     ./fonts.nix
     ./swaylock.nix
@@ -47,9 +50,16 @@
         gaps_out = 10;
       };
 
-      monitor = [
-        "eDP-1, 3456x2160, 0x0, 1.2"
-      ];
+      monitor =
+        if host == "voyager"
+        then [
+          "eDP-1, 3456x2160, 0x0, 1.2"
+        ]
+        else if host == "thinkpad"
+        then [
+          "eDP-1, 1920x1080, 0x0, 1.0"
+        ]
+        else [];
 
       exec = [
         "${pkgs.swaybg}/bin/swaybg -i ${config.stylix.image} -m fill"
@@ -152,7 +162,9 @@
         accel_profile = "adaptive";
         touchpad = {
           natural_scroll = true;
+          clickfinger_behavior = true;
           scroll_factor = 0.45;
+          drag_lock = true;
           tap-and-drag = true;
         };
       };

home/linux/waybar.nix

@@ -5,12 +5,18 @@
   osConfig,
   ...
 }: let
-  networkInterface.eth =
+  networkInterface =
     if osConfig.networking.hostName == "voyager"
     then "wlan0"
     else if osConfig.networking.hostName == "nixbox"
     then "enp6s0"
+    else if osConfig.networking.hostName == "thinkpad"
+    then "wlan0"
     else "";
+  battery =
+    if osConfig.networking.hostName == "voyager"
+    then "macsmc-battery"
+    else "BAT0";
   colors = config.lib.stylix.colors.withHashtag;
   primaryColor = colors.base04;
   altColor = colors.base0C;
@@ -79,7 +85,7 @@ in {
         };
 
         "battery" = {
-          "bat" = "macsmc-battery";
+          "bat" = battery;
           "format" = "<span color='${primaryColor}'>Battery: {capacity}% (P)</span>";
           "format-charging" = "<span color='${primaryColor}'>Battery: {capacity}% (C)</span>";
           "format-discharging" = "<span color='${primaryColor}'>Battery: {capacity}% (D)</span>";
@@ -96,7 +102,7 @@ in {
         };
 
         "network" = {
-          "interface" = "${networkInterface.eth}";
+          "interface" = "${networkInterface}";
           "interval" = 2;
           "format-ethernet" = "<span color='${primaryColor}'>Ether: Up: {bandwidthUpBits} Down: {bandwidthDownBits} </span>";
           "tooltip-format-ethernet" = "<span color='${primaryColor}'>{ifname}</span>";

nixos/hosts/thinkpad.nix

@@ -35,6 +35,13 @@
     {device = "/dev/disk/by-uuid/aed88966-e44e-4d2f-99ba-1fe6fb57cf89";}
   ];
 
+  hardware.opengl.enable = true;
+
+  networking.wireless.iwd = {
+    enable = true;
+    settings.General.EnableNetworkConfiguration = true;
+  };
+
   networking.useDHCP = lib.mkDefault true;
   networking.hostName = "thinkpad";