From 122c646906052e20f5e20d60688b5cbd145de134 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Thu, 30 Jan 2014 23:28:33 +0100 Subject: [PATCH] change to xresources, load in xinitr --- Xdefaults | 103 --------------------------------------- Xresources | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++++ xinitrc | 39 +++++++++++++++ 3 files changed, 179 insertions(+), 103 deletions(-) delete mode 100644 Xdefaults create mode 100644 Xresources create mode 100755 xinitrc diff --git a/Xdefaults b/Xdefaults deleted file mode 100644 index 88c7608..0000000 --- a/Xdefaults +++ /dev/null @@ -1,103 +0,0 @@ -!------------------------------------------------------------------------------- -! Xft settings -!------------------------------------------------------------------------------- - -Xft.dpi: 96 -Xft.antialias: true -Xft.rgba: rgb -Xft.hinting: true -Xft.hintstyle: hintslight - -!------------------------------------------------------------------------------- -! URxvt settings -! Colours lifted from Solarized (http://ethanschoonover.com/solarized) -! More info at: -! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod -!------------------------------------------------------------------------------- - -URxvt.depth: 32 -URxvt.geometry: 90x30 -URxvt.transparent: false -URxvt.fading: 0 -! URxvt.urgentOnBell: true -! URxvt.visualBell: true -URxvt.loginShell: true -URxvt.internalBorder: 3 -URxvt.lineSpace: 0 - -! Fonts -URxvt*font: xft:DejaVu Sans Mono for Powerline:pixelsize=13 -URxvt*boldFont: xft:DejaVu Sans Mono for Powerline:bold:pixelsize=13 - -! Scrollbar -URxvt.scrollStyle: rxvt -URxvt.scrollBar: true -URxvt.scrollBar_right: true - -! Perl extensions -URxvt.perl-ext-common: default,matcher -URxvt.url-launcher: xdg-open -URxvt.matcher.button: 1 - -! Cursor -URxvt.cursorBlink: true -URxvt.cursorColor: #657b83 -URxvt.cursorUnderline: false - -! Pointer -URxvt.pointerBlank: true - -! scrollback buffer lines - 65535 is max on most machines (64 is default) -URxvt.saveLines: 65536 - -! Create a dump of the content of the terminal in /tmp -! : current screen -! + : current screen and scrollbackbuffer -URxvt.print-pipe: cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S')) - -! Colors -URxvt.colorIT: #87af4f -URxvt.colorBD: #d7d7d7 -URxvt.colorUL: #2aa198 - -!!Source http://github.com/altercation/solarized - -*background: #002b36 -*foreground: #657b83 -!!*fading: 40 -*fadeColor: #002b36 -*cursorColor: #93a1a1 -*pointerColorBackground: #586e75 -*pointerColorForeground: #93a1a1 - -!! black dark/light -*color0: #073642 -*color8: #002b36 - -!! red dark/light -*color1: #dc322f -*color9: #cb4b16 - -!! green dark/light -*color2: #859900 -*color10: #586e75 - -!! yellow dark/light -*color3: #b58900 -*color11: #657b83 - -!! blue dark/light -*color4: #268bd2 -*color12: #839496 - -!! magenta dark/light -*color5: #d33682 -*color13: #6c71c4 - -!! cyan dark/light -*color6: #2aa198 -*color14: #93a1a1 - -!! white dark/light -*color7: #eee8d5 -*color15: #fdf6e3 diff --git a/Xresources b/Xresources new file mode 100644 index 0000000..75996ec --- /dev/null +++ b/Xresources @@ -0,0 +1,140 @@ +! +!------------------------------------------------------------------------------ +! Xft settings +!------------------------------------------------------------------------------- + +Xft.dpi: 96 +Xft.antialias: true +Xft.rgba: rgb +Xft.hinting: true +Xft.hintstyle: hintslight + +!------------------------------------------------------------------------------- +! URxvt settings +! Colours lifted from Solarized (http://ethanschoonover.com/solarized) +! More info at: +! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod +!------------------------------------------------------------------------------- + +URxvt.depth: 32 +URxvt.geometry: 90x30 +URxvt.transparent: false +URxvt.fading: 0 +! URxvt.urgentOnBell: true +! URxvt.visualBell: true +URxvt.loginShell: true +URxvt.internalBorder: 3 +URxvt.lineSpace: 0 + +! Fonts +URxvt*font: xft:DejaVu Sans Mono for Powerline:pixelsize=13 +URxvt*boldFont: xft:DejaVu Sans Mono for Powerline:bold:pixelsize=13 + +! Font size +URxvt.keysym.C-Up: perl:font-size:increase +URxvt.keysym.C-Down: perl:font-size:decrease +URxvt.keysym.C-S-Up: perl:font-size:incglobal +URxvt.keysym.C-S-Down: perl:font-size:decglobal + +! Scrollbar +URxvt.scrollStyle: rxvt +URxvt.scrollBar: true +URxvt.scrollBar_right: true + +! Perl extensions +URxvt.perl-ext-common: default,matcher,font-size +URxvt.url-launcher: xdg-open +URxvt.matcher.button: 1 + +! Cursor +URxvt.cursorBlink: true +URxvt.cursorColor: #657b83 +URxvt.cursorUnderline: false + +! Pointer +URxvt.pointerBlank: true + +! scrollback buffer lines - 65535 is max on most machines (64 is default) +URxvt.saveLines: 65536 + +! Create a dump of the content of the terminal in /tmp +! : current screen +! + : current screen and scrollbackbuffer +URxvt.print-pipe: cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S')) + +! Colors + +URxvt.intensityStyles: false + + +! Solarized color scheme for the X Window System +! +! http://ethanschoonover.com/solarized + + +! Common + +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 + + +! Dark + +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 + + +! Light + +! #define S_base03 #fdf6e3 +! #define S_base02 #eee8d5 +! #define S_base01 #93a1a1 +! #define S_base00 #839496 +! #define S_base0 #657b83 +! #define S_base1 #586e75 +! #define S_base2 #073642 +! #define S_base3 #002b36 + + +! To only apply colors to your terminal, for example, prefix +! the color assignment statement with its name. Example: +! +! URxvt*background: S_base03 + +*background: S_base03 +*foreground: S_base0 +*fading: 40 +*fadeColor: S_base03 +*cursorColor: S_base1 +*pointerColorBackground: S_base01 +*pointerColorForeground: S_base1 + +*color0: S_base02 +*color1: S_red +*color2: S_green +*color3: S_yellow +*color4: S_blue +*color5: S_magenta +*color6: S_cyan +*color7: S_base2 +*color8: S_base03 +*color9: S_orange +*color10: S_base01 +*color11: S_base00 +*color12: S_base0 +*color13: S_violet +*color14: S_base1 +*color15: S_base3 + diff --git a/xinitrc b/xinitrc new file mode 100755 index 0000000..d4cabab --- /dev/null +++ b/xinitrc @@ -0,0 +1,39 @@ +#!/bin/sh +# +# ~/.xinitrc +# +# Executed by startx (run your window manager from here) + +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for f in /etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +start-pulseaudio-x11 +eval $(gpg-agent --daemon) & + +xrdb $HOME/.Xresources + +# add additional fonts +xset +fp /usr/share/fonts/local +xset fp rehash + +case $1 in + enlightenment) + exec enlightenment_start + ;; + xterm) + exec xterm + ;; + bspwm) + sxhkd & + exec bspwm + ;; + hlwm|*) # default is herbstluftwm + /usr/bin/xscreensaver -no-splash & + xbindkeys & + exec herbstluftwm --locked + ;; +esac