mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
xorg.conf clean up
This commit is contained in:
parent
0b75a56516
commit
82b2d4971e
5 changed files with 38 additions and 74 deletions
|
|
@ -1,29 +1,3 @@
|
|||
Section "InputClass"
|
||||
Identifier "libinput mouse configuration"
|
||||
MatchDriver "libinput"
|
||||
MatchIsPointer "on"
|
||||
Option "AccelerationProfile" "0"
|
||||
Option "AccelerationScheme" "flat"
|
||||
Option "AccelSpeed" "3"
|
||||
Option "LeftHanded" "off"
|
||||
Option "MiddleEmulation" "on"
|
||||
Option "NaturalScrolling" "off"
|
||||
Option "ScrollMethod" "twofinger"
|
||||
Option "HorizontalScrolling" "on"
|
||||
Option "SendEventsMode" "enabled"
|
||||
Option "Tapping" "on"
|
||||
Option "TappingDragLock" "on"
|
||||
Option "DisableWhileTyping" "off"
|
||||
Option "Resolution" "3000"
|
||||
EndSection
|
||||
|
||||
Section "ServerFlags"
|
||||
Option "StandbyTime" "0"
|
||||
Option "SuspendTime" "0"
|
||||
Option "OffTime" "0"
|
||||
Option "BlankTime" "0"
|
||||
EndSection
|
||||
|
||||
Section "ServerLayout"
|
||||
Identifier "X.org Configured"
|
||||
Screen 0 "Screen0" 0 0
|
||||
|
|
@ -40,7 +14,6 @@ Section "Monitor"
|
|||
Option "Primary" "true"
|
||||
Modeline "1920x1080_144" 332.75 1920 1952 2016 2080 1080 1084 1089 1111 +HSync +VSync
|
||||
Option "PreferredMode" "1920x1080_144"
|
||||
Option "DPMS" "false"
|
||||
EndSection
|
||||
|
||||
Section "Device"
|
||||
|
|
|
|||
|
|
@ -1,42 +1,13 @@
|
|||
Section "ServerFlags"
|
||||
Option "AllowMouseOpenFail" "on"
|
||||
Option "DontZap" "on"
|
||||
Option "StandbyTime" "0"
|
||||
Option "SuspendTime" "0"
|
||||
Option "OffTime" "0"
|
||||
Option "BlankTime" "0"
|
||||
EndSection
|
||||
|
||||
Section "Monitor"
|
||||
Identifier "Monitor"
|
||||
Option "DPMS" "false"
|
||||
EndSection
|
||||
|
||||
Section "InputClass"
|
||||
Identifier "libinput mouse configuration"
|
||||
MatchDriver "libinput"
|
||||
MatchIsPointer "on"
|
||||
Option "AccelerationProfile" "0"
|
||||
Option "AccelerationScheme" "flat"
|
||||
Option "AccelSpeed" "3"
|
||||
Option "LeftHanded" "off"
|
||||
Option "MiddleEmulation" "on"
|
||||
Option "NaturalScrolling" "off"
|
||||
Option "ScrollMethod" "twofinger"
|
||||
Option "HorizontalScrolling" "on"
|
||||
Option "SendEventsMode" "enabled"
|
||||
Option "Tapping" "on"
|
||||
Option "TappingDragLock" "on"
|
||||
Option "DisableWhileTyping" "off"
|
||||
Option "Resolution" "3000"
|
||||
EndSection
|
||||
|
||||
Section "ServerLayout"
|
||||
Identifier "layout"
|
||||
Screen 0 "nvidia"
|
||||
Inactive "amdgpu"
|
||||
EndSection
|
||||
|
||||
Section "Monitor"
|
||||
Identifier "Monitor"
|
||||
EndSection
|
||||
|
||||
Section "Device"
|
||||
Identifier "nvidia"
|
||||
Driver "nvidia"
|
||||
|
|
@ -47,7 +18,6 @@ EndSection
|
|||
Section "Screen"
|
||||
Identifier "nvidia"
|
||||
Device "nvidia"
|
||||
Option "RandRRotation" "on"
|
||||
Option "AllowEmptyInitialConfiguration"
|
||||
EndSection
|
||||
|
||||
|
|
|
|||
16
hosts/gerg-desktop/shared.conf
Normal file
16
hosts/gerg-desktop/shared.conf
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
Section "ServerFlags"
|
||||
Option "AllowMouseOpenFail" "on"
|
||||
Option "DontZap" "on"
|
||||
Option "StandbyTime" "0"
|
||||
Option "SuspendTime" "0"
|
||||
Option "OffTime" "0"
|
||||
Option "BlankTime" "0"
|
||||
EndSection
|
||||
|
||||
Section "InputClass"
|
||||
Identifier "libinput pointer catchall"
|
||||
MatchIsPointer "on"
|
||||
MatchDevicePath "/dev/input/event*"
|
||||
Driver "libinput"
|
||||
Option "AccelProfile" "flat"
|
||||
EndSection
|
||||
|
|
@ -32,14 +32,14 @@ in
|
|||
};
|
||||
|
||||
services.xserver = {
|
||||
config = lib.mkForce "";
|
||||
|
||||
displayManager.setupCommands = lib.mkBefore ''
|
||||
if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then
|
||||
${lib.getExe cfg_monitors}
|
||||
fi
|
||||
${lib.getExe pkgs.xorg.xset} -dpms
|
||||
'';
|
||||
|
||||
config = lib.mkForce (builtins.readFile "${_dir}/shared.conf");
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue