fix monitors

This commit is contained in:
danny 2024-12-13 23:26:36 +08:00
parent 3e6847c1ef
commit 49a3a1128a
6 changed files with 23 additions and 17 deletions

View file

@ -64,16 +64,3 @@ bind = ,XF86AudioPlay, exec, playerctl play-pause
bind = ,XF86AudioStop, exec, playerctl stop bind = ,XF86AudioStop, exec, playerctl stop
bind = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle bind = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle
# F override (neo65)
# bind = ,code:232, exec, xdotool key F1
# bind = ,code:233, exec, xdotool key F2
# bind = ,code:128, exec, xdotool key F3
# bind = ,code:212, exec, xdotool key F4
# bind = ,code:237, exec, xdotool key F5
# bind = ,code:238, exec, xdotool key F6
# bind = ,code:173, exec, xdotool key F7
# bind = ,code:172, exec, xdotool key F8
# bind = ,code:171, exec, xdotool key F9
# bind = ,code:121, exec, xdotool key F10
# bind = ,code:122, exec, xdotool key F11
# bind = ,code:123, exec, xdotool key F12

View file

@ -1,3 +1,3 @@
monitor=desc:ASUSTek COMPUTER INC ASUS VG32VQ1B 0x00002271,2560x1440@164.55, 0x0, 1 monitor=desc:ASUSTek COMPUTER INC ASUS VG32VQ1B 0x00002271,2560x1440@164.55, 0x0, 1
monitor=desc:Acer Technologies XV272U V3 7422007E54222, 2560x1440@143.91, -2560x-560, 1, transform, 1 monitor=desc:Acer Technologies XV272U V3 7422007E54222, 2560x1440@143.91, -1440x-560, 1, transform, 1

View file

@ -13,6 +13,7 @@ let
rebuild = "sudo nixos-rebuild switch --flake /etc/nixos/#dn-nix"; rebuild = "sudo nixos-rebuild switch --flake /etc/nixos/#dn-nix";
windows = "sudo bootctl set-oneshot auto-windows"; windows = "sudo bootctl set-oneshot auto-windows";
toWindows = "sudo bootctl set-oneshot auto-windows && reboot"; toWindows = "sudo bootctl set-oneshot auto-windows && reboot";
toBIOS = "sudo bootctl set-oneshot auto-reboot-to-firmware-setup && reboot";
}; };
in { in {
programs = { programs = {

View file

@ -2,7 +2,10 @@
{ {
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
# boot.initrd.verbose = true; boot.extraModprobeConfig = ''
options hid_apple fnmode=2
'';
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
boot.swraid.enable = true; boot.swraid.enable = true;
boot.swraid.mdadmConf = boot.swraid.mdadmConf =

View file

@ -1,11 +1,25 @@
{ config, pkgs, ... }: { config, pkgs, nixpkgs, ... }:
{ {
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["nvidia"];
nixpkgs.config.packageOverrides = pkgs: {
intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; } ;
};
environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; # Force intel-media-driver
hardware = { hardware = {
bluetooth.enable = true; bluetooth.enable = true;
graphics.enable = true; graphics = {
enable = true;
extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD
intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
libvdpau-va-gl
];
};
nvidia.open = false; nvidia.open = false;
nvidia.modesetting.enable = true; nvidia.modesetting.enable = true;

View file

@ -21,6 +21,7 @@
glxinfo # OpenGL info glxinfo # OpenGL info
pciutils # PCI info pciutils # PCI info
xdotool # Keyboard input simulation xdotool # Keyboard input simulation
ffmpeg # video encoding
# Dev # Dev
git git