diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2014-11-03 01:12:55 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2014-11-03 01:12:55 +1300 |
| commit | 65005df019ece6357cacd58977de702246b22bc1 (patch) | |
| tree | adcbb5fe6218f01a52ddd82f3aadbd119187dc60 | |
| parent | Make function of whitespace stripper (diff) | |
| download | dotfiles-65005df019ece6357cacd58977de702246b22bc1.tar.gz dotfiles-65005df019ece6357cacd58977de702246b22bc1.zip | |
Hose xsession, use xinitrc
Probably not going to be using a DE again anytime soon
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | X/xinitrc | 15 | ||||
| -rw-r--r-- | X/xsession | 2 | ||||
| -rw-r--r-- | X/xsessionrc | 4 |
4 files changed, 19 insertions, 11 deletions
@@ -26,9 +26,9 @@ install-vim-plugins \ install-wyrd \ install-x \ + install-xinitrc \ install-xmodmap \ install-xresources \ - install-xsession \ test \ test-bash \ test-bin \ @@ -187,7 +187,7 @@ install-wyrd : install-x : install-xmodmap \ install-xresources \ - install-xsession + install-xinitrc install-xmodmap : install -m 0644 -- X/Xresources "$(HOME)"/.Xresources @@ -195,9 +195,8 @@ install-xmodmap : install-xresources : install -m 0644 -- X/Xmodmap "$(HOME)"/.Xmodmap -install-xsession : - install -m 0644 -- X/xsession "$(HOME)"/.xsession - install -m 0644 -- X/xsessionrc "$(HOME)"/.xsessionrc +install-xinitrc : + install -m 0644 -- X/xinitrc "$(HOME)"/.xinitrc test : test-sh test-bash test-bin test-urxvt diff --git a/X/xinitrc b/X/xinitrc new file mode 100644 index 00000000..1038ce17 --- /dev/null +++ b/X/xinitrc @@ -0,0 +1,15 @@ +# Read X resources +xrdb "$HOME"/.Xresources + +# Apply xmodmap definitions +xmodmap "$HOME"/.Xmodmap + +# Apply background image +feh --bg-scale -- "$HOME"/.i3/draugen.jpg + +# Start xscreensaver(1) +xscreensaver & + +# Start window manager +exec i3 + diff --git a/X/xsession b/X/xsession deleted file mode 100644 index add82880..00000000 --- a/X/xsession +++ /dev/null @@ -1,2 +0,0 @@ -exec i3 - diff --git a/X/xsessionrc b/X/xsessionrc deleted file mode 100644 index 00f120e3..00000000 --- a/X/xsessionrc +++ /dev/null @@ -1,4 +0,0 @@ -feh --bg-scale "$HOME"/.i3/draugen.jpg -xmodmap ~/.Xmodmap -xscreensaver & - |