From b8bd5a3f216eb4025cdb57e2ce2287ea483d31f0 Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Fri, 2 May 2025 18:14:56 +0200
Subject: [PATCH 1/4] X270: Use nixos-hardware, update graphics option

---
 hosts/x270.nix | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/hosts/x270.nix b/hosts/x270.nix
index 30f75e8..1fc9ee7 100644
--- a/hosts/x270.nix
+++ b/hosts/x270.nix
@@ -1,38 +1,19 @@
 { lib, pkgs, ... }:
 {
+    imports = [
+        <nixos-hardware/lenovo/thinkpad/x270>
+    ];
     hardware.trackpoint = {
         enable = true;
         sensitivity = 230;
         speed = 170;
     };
 
-    # Ensure that trackpoint mouse buttons work after suspend without having
-    # to touch the trackpoint first
-    powerManagement = {
-        powerDownCommands = ''
-            modprobe -r psmouse
-        '';
-        resumeCommands = ''
-            modprobe psmouse
-        '';
-    };
-
-    services.xserver.videoDrivers = [ "modesetting" ];
-
-    boot.initrd.kernelModules = [ "i915" ];
-    hardware.opengl = {
+    hardware.graphics = {
         enable = true;
         # driSupport = true;
         # driSupport32Bit = true;
     };
-    environment.variables = {
-        VDPAU_DRIVER = "va_gl";
-    };
-    hardware.opengl.extraPackages = with pkgs; [
-        (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver)
-        libvdpau-va-gl
-        intel-media-driver
-    ];
 
     console = {
         font = "Lat2-Terminus16";

From 84550fffa2f5f42b41c7f41f1663ab52e7af16f8 Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Fri, 2 May 2025 18:16:54 +0200
Subject: [PATCH 2/4] Remove Horizon draw-surface patch

Does not seem to be necessary any more.
---
 overlays/default.nix                         |  1 -
 overlays/horizon-eda.nix                     | 13 -------------
 overlays/horizon_software_draw_surface.patch | 10 ----------
 3 files changed, 24 deletions(-)
 delete mode 100644 overlays/horizon-eda.nix
 delete mode 100644 overlays/horizon_software_draw_surface.patch

diff --git a/overlays/default.nix b/overlays/default.nix
index eab7738..7cd1fd2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,6 +2,5 @@
 {
     imports = [
         ./burp.nix
-        ./horizon-eda.nix
     ];
 }
diff --git a/overlays/horizon-eda.nix b/overlays/horizon-eda.nix
deleted file mode 100644
index 3022fdf..0000000
--- a/overlays/horizon-eda.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, ... }:
-{
-    nixpkgs.overlays = [
-        (self: super: {
-            horizon-eda = (super.horizon-eda.overrideAttrs (old: {
-                # Add an environment variable to fix redraw issues on Intel Graphics
-                patches = [
-                    ./horizon_software_draw_surface.patch
-                ];
-            }));
-        })
-    ];
-}
diff --git a/overlays/horizon_software_draw_surface.patch b/overlays/horizon_software_draw_surface.patch
deleted file mode 100644
index c44c667..0000000
--- a/overlays/horizon_software_draw_surface.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/org.horizon_eda.HorizonEDA.desktop b/org.horizon_eda.HorizonEDA.desktop
-index 7551df54..d8df7800 100644
---- a/org.horizon_eda.HorizonEDA.desktop
-+++ b/org.horizon_eda.HorizonEDA.desktop
-@@ -5,4 +5,4 @@ Categories=Development;Engineering;Electronics;
- Type=Application
- Terminal=false
- Icon=org.horizon_eda.HorizonEDA
--Exec=horizon-eda %U
-+Exec=env GDK_GL=software-draw-surface horizon-eda %U

From a8922cb72d59b1c4fa30d61468cc5e975e35b0a9 Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Fri, 2 May 2025 18:18:32 +0200
Subject: [PATCH 3/4] Update XFCE configuration, switch to PipeWire

---
 hosts/xfce.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/hosts/xfce.nix b/hosts/xfce.nix
index 42d0d2f..d2e996e 100644
--- a/hosts/xfce.nix
+++ b/hosts/xfce.nix
@@ -3,11 +3,15 @@
     services.xserver = {
         enable = true;
         desktopManager = {
-            xfce.enable = true;
+            xfce= {
+                enable = true;
+                enableXfwm = true;
+            };
             xterm.enable = false;
         };
         displayManager = {
             lightdm.enable = true;
+            gdm.wayland = false;
         };
     };
     services.displayManager = {
@@ -16,8 +20,12 @@
         autoLogin.user = "fruchti";
     };
     services.libinput.enable = true;
-    nixpkgs.config.pulseaudio = true;
-    hardware.pulseaudio.enable = true;
+    services.pipewire = {
+        enable = true;
+        alsa.enable = true;
+        alsa.support32Bit = true;
+        pulse.enable = true;
+    };
     hardware.bluetooth.enable = true;
     services.blueman.enable = true;
     # environment.xfce.excludePackages = with pkgs.xfce; [
@@ -32,7 +40,7 @@
         lounge-gtk-theme
         hackneyed
         blueman
-        gnome.file-roller
+        file-roller
     ];
     security.pam.services.lightdm.enableGnomeKeyring = true;
     services.gnome.gnome-keyring.enable = true;

From 2fda9075b06512c5f47ca2a7c0187412504c1860 Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Fri, 2 May 2025 18:19:26 +0200
Subject: [PATCH 4/4] Add udev rule for USB thermal printer

---
 base/hardware.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/base/hardware.nix b/base/hardware.nix
index d7f0905..bc59584 100644
--- a/base/hardware.nix
+++ b/base/hardware.nix
@@ -3,5 +3,8 @@
     services.udev.extraRules = ''
         # Keychron C2 function key fix
         SUBSYSTEMS=="input", ATTRS{name}=="Keychron Keychron C2", RUN+="${pkgs.bash}/bin/bash -c 'echo 0 > /sys/module/hid_apple/parameters/fnmode'"
+
+        # EM8026 thermal printer
+        SUBSYSTEM=="usb", ATTRS{idVendor}=="28e9", ATTRS{idProduct}=="0289", MODE="0660", GROUP="plugdev"
     '';
 }