gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xorg.conf clean up

Browse source
This commit is contained in:
Gerg-L 2024-06-22 19:02:58 -04:00
parent 0b75a56516
commit 82b2d4971e
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
5 changed files with 38 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

27
hosts/gerg-desktop/1_mon.conf
View file

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

38
hosts/gerg-desktop/2_mon.conf
View file

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

4
hosts/gerg-desktop/vfio.nix
View file

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

27
modules/DE/dwm.nix
View file

@ -11,9 +11,8 @@
config = lib.mkIf config.local.DE.dwm.enable {
systemd.user.services = {
sxhkd = {
path = [ pkgs.sxhkd ];
script = "sxhkd -c /etc/sxhkd/sxhkdrc";
serviceConfig = {
ExecStart = "${lib.getExe pkgs.sxhkd} -c /etc/sxhkd/sxhkdrc";
Restart = "always";
RestartSec = 2;
ExecReload = "pkill -usr1 -x $MAINPID";
@ -21,9 +20,8 @@
};
picom = {
path = [ pkgs.picom ];
script = "picom";
serviceConfig = {
ExecStart = "${lib.getExe pkgs.picom} --backend glx";
Restart = "always";
RestartSec = 2;
ExecReload = "pkill -usr1 -x $MAINPID";
@ -79,15 +77,22 @@
numlockx
picom
sxhkd
alock
xscreensaver
;
xsecurelock = pkgs.writeShellScriptBin "xsecurelock" ''
export XSECURELOCK_BLANK_TIMEOUT="30"
export XSECURELOCK_AUTH_TIMEOUT="30"
export XSECURELOCK_BLANK_DPMS_STATE="off"
export XSECURELOCK_BACKGROUND_COLOR="#000000"
export XSECURELOCK_AUTH_BACKGROUND_COLOR="#080808"
export XSECURELOCK_AUTH_FOREGROUND_COLOR="#bdbdbd"
export XSECURELOCK_FONT="Overpass"
export XSECURELOCK_SHOW_DATETIME="1"
${lib.getExe pkgs.xsecurelock}
'';
};
etc = {
"xdg/Xresources".text = ''
ALock*input.frame*input: #74b2ff
ALock*input.frame*check: #36c692
ALock*Input.frame*width: 2
'';
"sxhkd/sxhkdrc".text = ''
XF86AudioPlay
playerctl play-pause
@ -116,7 +121,7 @@
super + ctrl + r
pkill -usr1 -x sxhkd
super + ctrl + l
sleep 1 && xset dpms force off && alock
xsecurelock
'';
};
};