diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2022-08-14 14:03:52 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2022-08-14 16:20:22 +1200 |
commit | 02d8c2c6784b49765c0a279f07148adfd6ab8f5d (patch) | |
tree | 5e3beec52b7443049d552dce14a31e684fa7b3a4 /Makefile | |
parent | Revert "Refactor X startup to accomodate differ... (diff) | |
download | dotfiles-02d8c2c6784b49765c0a279f07148adfd6ab8f5d.tar.gz dotfiles-02d8c2c6784b49765c0a279f07148adfd6ab8f5d.zip |
Reorganize X11 startup file again
I swear I'm going to figure this out.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 46 |
1 files changed, 26 insertions, 20 deletions
@@ -56,6 +56,7 @@ install-vint \ install-wget \ install-x \ + install-xsession \ install-yt-dlp \ install-zsh \ check \ @@ -69,6 +70,7 @@ check-sh \ check-urxvt \ check-x \ + check-xsession \ check-zsh \ lint \ lint-bash \ @@ -79,7 +81,8 @@ lint-sh \ lint-urxvt \ lint-vim \ - lint-x + lint-x \ + lint-xsession .SUFFIXES: .SUFFIXES: .awk .bash .m4 .mi5 .pl .sed .sh @@ -416,7 +419,7 @@ install-cpanm: install-curl: cp -p -- curl/curlrc $(HOME)/.curlrc -install-dillo: dillo/dillorc install-x +install-dillo: dillo/dillorc mkdir -p -- $(HOME)/.dillo cp -p -- dillo/dillorc $(HOME)/.dillo/dillorc @@ -457,7 +460,8 @@ install-gnupg: gnupg/profile.d/gnupg.sh install-sh install-i3: install-x mkdir -p -- $(XDG_CONFIG_HOME)/i3 - cp -p -- i3/* $(XDG_CONFIG_HOME)/i3 + cp -p -- i3/config $(XDG_CONFIG_HOME)/i3 + cp -p -- i3/status $(XDG_CONFIG_HOME)/i3 install-init: if test -d /run/systemd/system ; then make install-systemd ; fi @@ -531,7 +535,7 @@ install-login-shell: check-login-shell install-parcellite: install-x cp -p -- parcellite/parcelliterc $(XDG_CONFIG_HOME) - cp -p -- redshift/xsession.d/* $(HOME)/.xsession.d + cp -p -- redshift/xsession.d/redshift.sh $(HOME)/.xsession.d install-perlcritic: install-sh cp -p -- perlcritic/profile.d/*.sh $(HOME)/.profile.d @@ -563,7 +567,7 @@ install-readline: install-redshift: install-x cp -p -- redshift/redshift.conf $(XDG_CONFIG_HOME) - cp -p -- redshift/xsession.d/* $(HOME)/.xsession.d + cp -p -- redshift/xsession.d/redshift.sh $(HOME)/.xsession.d install-scrot: mkdir -p -- $(XDG_DATA_HOME)/scrot/screenshots @@ -583,7 +587,7 @@ install-subversion: install-sxhkd: install-scrot install-x mkdir -p -- $(XDG_CONFIG_HOME)/sxhkd cp -p -- sxhkd/sxhkdrc $(XDG_CONFIG_HOME)/sxhkd - cp -p -- sxhkd/xsession.d/* $(HOME)/.xsession.d + cp -p -- sxhkd/xsession.d/sxhkd.sh $(HOME)/.xsession.d install-systemd: install-sh cp -p -- systemd/profile.d/*.sh $(HOME)/.profile.d @@ -627,8 +631,7 @@ install-tmux: tmux/bin/tmux tmux/tmux.conf install-systemd install-terminfo install-urxvt: urxvt/ext/select install-x mkdir -p -- $(HOME)/.urxvt/ext cp -p -- urxvt/ext/select $(HOME)/.urxvt/ext - cp -p -- urxvt/Xresources.d/* $(HOME)/.Xresources.d - cp -p -- urxvt/xsession.d/* $(HOME)/.xsession.d + cp -p -- urxvt/xsession.d/urxvt.sh $(HOME)/.xsession.d VIM = vim VIMDIR = $(HOME)/.vim @@ -667,18 +670,15 @@ install-wget: install-sh mkdir -p -- $(XDG_CACHE_HOME)/wget $(XDG_CONFIG_HOME)/wget cp -p -- wget/wgetrc $(XDG_CONFIG_HOME)/wget/wgetrc -install-x: x/xsession check-x install-logrotate install-sh - mkdir -p -- \ - $(HOME)/.xsession.d \ - $(HOME)/.Xresources.d \ - $(XDG_CONFIG_HOME)/log/xsession - cp -p -- x/xprofile $(HOME)/.xprofile - cp -p -- x/xsession $(HOME)/.xsession - cp -p -- x/xsessionrc $(HOME)/.xsessionrc +install-x: check-x install-logrotate install-sh cp -p -- x/Xresources $(HOME)/.Xresources - cp -p -- x/Xresources.d/* $(HOME)/.Xresources.d - cp -p -- x/logrotate/config.d/* $(XDG_CONFIG_HOME)/logrotate/config.d - cp -p -- x/shrc.d/*.sh $(HOME)/.shrc.d + mkdir -p -- $(HOME)/.xsession.d + cp -p -- x/shrc.d/x.sh $(HOME)/.shrc.d + mkdir -p -- $(XDG_CONFIG_HOME)/log/xsession + cp -p -- x/logrotate/config.d/xsession $(XDG_CONFIG_HOME)/logrotate/config.d + +install-xsession: x/xsession check-xsession install-x + cp -p -- x/xsession $(HOME)/.xsession install-yt-dlp install-youtube-dl: mkdir -p -- $(XDG_CONFIG_HOME)/yt-dlp @@ -724,9 +724,12 @@ check-sh: check-urxvt: urxvt/ext/select sh check/urxvt.sh -check-x: x/xsession +check-x: sh check/x.sh +check-xsession: x/xsession + sh check/xsession.sh + check-zsh: sh check/zsh.sh @@ -766,3 +769,6 @@ lint-vim: lint-x: check-x sh lint/x.sh + +lint-xsession: x/xsession check-xsession + sh lint/xsession.sh |