diff options
Diffstat (limited to 'xorg-xinit')
| -rw-r--r-- | xorg-xinit/Makefile | 30 | ||||
| -rw-r--r-- | xorg-xinit/xinitrc | 6 |
2 files changed, 15 insertions, 21 deletions
diff --git a/xorg-xinit/Makefile b/xorg-xinit/Makefile index 6c314bd..0183895 100644 --- a/xorg-xinit/Makefile +++ b/xorg-xinit/Makefile @@ -1,28 +1,28 @@ .POSIX: -include ../common.mk XINITRC_ORDER = 50 # Testing that xmonad is installed because it is the default sessions # Testing that asroot, xorg-setxkbmap, and xorg-xmodmap are installed because setkeys uses them install: - $(CHECK_INSTALLED) asroot - $(CHECK_INSTALLED) dconf - $(CHECK_INSTALLED) xmonad - $(CHECK_INSTALLED) xorg-setxkbmap - $(CHECK_INSTALLED) xorg-xmodmap - $(CHECK_INSTALLED) xorg-xrandr - $(CHECK_INSTALLED) xorg-xrdb - $(CHECK_INSTALLED) xorg-xset - $(CHECK_INSTALLED) xorg-xsetroot + ../check-any-installed asroot asroot-libpassphrase + ../check-any-installed dconf dconf-cli + ../check-installed xmonad + ../check-any-installed xorg-setxkbmap x11-xkb-utils + ../check-any-installed xorg-xmodmap x11-xserver-utils + ../check-any-installed xorg-xrandr x11-xserver-utils + ../check-any-installed xorg-xrdb x11-xserver-utils + ../check-any-installed xorg-xset x11-xserver-utils + ../check-any-installed xorg-xsetroot x11-xserver-utils mkdir -p -- ~/.config/bash/aliases.d - test ! -d ~/.config/bash/aliases.d/xorg-xinit + test ! -e ~/.config/bash/aliases.d/xorg-xinit || test -L ~/.config/bash/aliases.d/xorg-xinit ln -sf -- ~/.dotfiles/xorg-xinit/bash-aliases ~/.config/bash/aliases.d/xorg-xinit mkdir -p -- ~/.config/X11/xinit - test ! -d ~/.config/X11/xinit/xinitrc + test ! -e ~/.config/X11/xinit/xinitrc || test -L ~/.config/X11/xinit/xinitrc ln -sf -- ~/.dotfiles/xorg-xinit/xinitrc ~/.config/X11/xinit/xinitrc mkdir -p -- ~/.config/X11/xinit/xinitrc.d - test ! -d ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xinit + test ! -e ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xinit || \ + test -L ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xinit ln -sf -- ~/.dotfiles/xorg-xinit/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xorg-xinit if test -x /usr/bin/orphan-reaper; then \ mkdir -p -- ~/.local/bin && \ @@ -30,6 +30,8 @@ install: fi uninstall: + +! ../check-installed xorg-xinit + +! ../check-installed xinit -unlink -- ~/.config/bash/aliases.d/xorg-xinit -rmdir -- ~/.config/bash/aliases.d -unlink -- ~/.config/X11/xinit/xinitrc @@ -38,5 +40,3 @@ uninstall: -rmdir -- ~/.config/X11/xinit -rmdir -- ~/.config/X11 -unlink -- ~/.local/bin/startx - -.PHONY: install uninstall diff --git a/xorg-xinit/xinitrc b/xorg-xinit/xinitrc index 23aa433..b781186 100644 --- a/xorg-xinit/xinitrc +++ b/xorg-xinit/xinitrc @@ -21,11 +21,5 @@ for f in ~/.config/X11/xinit/xinitrc.d/*; do fi done -# Set keyboard settings -setkeys - -# Start hotkey daemon -xkbdbind & - # Start session exec ${SESSION_WRAPPER} "$SESSION" |