diff options
| author | Tim Keller <tjk@tjkeller.xyz> | 2024-10-02 22:07:10 -0500 |
|---|---|---|
| committer | Tim Keller <tjk@tjkeller.xyz> | 2024-10-02 22:07:10 -0500 |
| commit | 4730b215fdc4095800fedfdf690c12fec994bb6b (patch) | |
| tree | 3c746ece0089625a8093d4ae6bf1149ea903b7dc /modules/x11 | |
| parent | 34b0bb8df42194a0ea433592e3cac27546f0af4e (diff) | |
| download | nixos-4730b215fdc4095800fedfdf690c12fec994bb6b.tar.xz nixos-4730b215fdc4095800fedfdf690c12fec994bb6b.zip | |
more reorganizing and modularizing
Diffstat (limited to 'modules/x11')
| -rw-r--r-- | modules/x11/default.nix | 30 | ||||
| -rw-r--r-- | modules/x11/xinit-startx-xdg.patch | 14 |
2 files changed, 0 insertions, 44 deletions
diff --git a/modules/x11/default.nix b/modules/x11/default.nix deleted file mode 100644 index 8fa1d27..0000000 --- a/modules/x11/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, lib, config, ... }: { - options = { - xserver.enable = lib.mkEnableOption "enables xserver"; - }; - - config = lib.mkIf config.xserver.enable { - services.xserver.enable = true; - services.xserver.displayManager.startx.enable = true; - services.libinput.enable = true; # Enable touchpad support - - environment.systemPackages = with pkgs; [ - unclutter - xcape - xclip - xdotool - xorg.setxkbmap - xorg.xinput - xorg.xkill - xorg.xrandr - xorg.xset - xwallpaper - # Patch startx to be compliant with xdg base dir spec - (xorg.xinit.overrideAttrs (old: rec { - patches = [ - ./xinit-startx-xdg.patch - ]; - })) - ]; - }; -} diff --git a/modules/x11/xinit-startx-xdg.patch b/modules/x11/xinit-startx-xdg.patch deleted file mode 100644 index c1bca97..0000000 --- a/modules/x11/xinit-startx-xdg.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/startx.cpp b/startx.cpp -index dfbebe1..472a1b0 100644 ---- a/startx.cpp -+++ b/startx.cpp -@@ -272,7 +272,7 @@ if [ x"$enable_xauth" = x1 ] ; then - dummy=0 - - XCOMM create a file with auth information for the server. ':0' is a dummy. -- xserverauthfile=$HOME/.serverauth.$$ -+ xserverauthfile="${XAUTHORITY:-$HOME/.Xauthority}" - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM - xauth -q -f "$xserverauthfile" << EOF - add :$dummy . $mcookie - |