Skip to content

Commit

Permalink
Merge pull request #102 from severinkaderli/master
Browse files Browse the repository at this point in the history
Add XDG specification support
  • Loading branch information
Witko authored May 6, 2019
2 parents c1f373c + 62a0015 commit af3b734
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ When the nvidia-xrun command is used, the device is added again to the tree so t
* **/etc/default/nvidia-xrun** - nvidia-xrun config file
* **/usr/share/xsessions/nvidia-xrun-openbox.desktop** - xsession file for openbox
* **/usr/share/xsessions/nvidia-xrun-plasma.desktop** - xsession file for plasma
* **[OPTIONAL] ~/.nvidia-xinitrc** - user-level custom xinit script file. You can put here your favourite window manager for example
* **[OPTIONAL] $XDG_CONFIG_HOME/X11/nvidia-xinitrc** - user-level custom xinit script file. You can put here your favourite window manager for example


## Setting the right bus id
Expand Down
7 changes: 4 additions & 3 deletions nvidia-xinitrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/usr/bin/env bash

userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
CONFIG_DIR=${XDG_CONFIG_HOME:-$HOME/.config}/X11
userresources=$CONFIG_DIR/xresources
usermodmap=$CONFIG_DIR/xmodmap
sysresources=/etc/X11/xinit/.Xresources
sysmodmap=/etc/X11/xinit/.Xmodmap
userxinitrc=$HOME/.nvidia-xinitrc
userxinitrc=$CONFIG_DIR/nvidia-xinitrc

# merge in defaults and keymaps
if [[ -f ${sysresources} ]]; then
Expand Down

0 comments on commit af3b734

Please sign in to comment.