Compare commits

..

4 commits

Author SHA1 Message Date
2fda9075b0 Add udev rule for USB thermal printer 2025-05-02 18:19:26 +02:00
a8922cb72d Update XFCE configuration, switch to PipeWire 2025-05-02 18:18:32 +02:00
84550fffa2 Remove Horizon draw-surface patch
Does not seem to be necessary any more.
2025-05-02 18:16:54 +02:00
b8bd5a3f21 X270: Use nixos-hardware, update graphics option 2025-05-02 18:14:56 +02:00
6 changed files with 19 additions and 51 deletions

View file

@ -3,5 +3,8 @@
services.udev.extraRules = '' services.udev.extraRules = ''
# Keychron C2 function key fix # 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'" 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"
''; '';
} }

View file

@ -1,38 +1,19 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
imports = [
<nixos-hardware/lenovo/thinkpad/x270>
];
hardware.trackpoint = { hardware.trackpoint = {
enable = true; enable = true;
sensitivity = 230; sensitivity = 230;
speed = 170; speed = 170;
}; };
# Ensure that trackpoint mouse buttons work after suspend without having hardware.graphics = {
# to touch the trackpoint first
powerManagement = {
powerDownCommands = ''
modprobe -r psmouse
'';
resumeCommands = ''
modprobe psmouse
'';
};
services.xserver.videoDrivers = [ "modesetting" ];
boot.initrd.kernelModules = [ "i915" ];
hardware.opengl = {
enable = true; enable = true;
# driSupport = true; # driSupport = true;
# driSupport32Bit = 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 = { console = {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";

View file

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

View file

@ -2,6 +2,5 @@
{ {
imports = [ imports = [
./burp.nix ./burp.nix
./horizon-eda.nix
]; ];
} }

View file

@ -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
];
}));
})
];
}

View file

@ -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