Moved all non-terminal content of main_rc to xprofile.
Pierre Neidhardt
parent
5dfb61deb2
commit
49fcdbae07
|
|
@ -38,7 +38,7 @@ auto-shrink-images=true
|
|||
print-backgrounds=false
|
||||
enable-caret-browsing=false
|
||||
enable-scripts=true
|
||||
adblocker-filterlist=/home/morpheo/neidhard/.config/dwb/adblock_lists
|
||||
adblocker-filterlist=/home/peter/.config/dwb/adblock_lists
|
||||
proxy=false
|
||||
user-agent=
|
||||
full-content-zoom=true
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ dina-font
|
|||
djvulibre
|
||||
elfutils
|
||||
emacs-lua-mode
|
||||
emacs-nox
|
||||
emacs
|
||||
feh
|
||||
ffmpeg
|
||||
file
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ ati-dri
|
|||
atk
|
||||
atkmm
|
||||
atool
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
attr
|
||||
autoconf
|
||||
automake
|
||||
|
|
@ -72,8 +74,8 @@ dosfstools
|
|||
dotconf
|
||||
e2fsprogs
|
||||
elfutils
|
||||
emacs
|
||||
emacs-lua-mode
|
||||
emacs-nox
|
||||
emelfm2
|
||||
enca
|
||||
enchant
|
||||
|
|
@ -104,6 +106,7 @@ gc
|
|||
gcc-libs-multilib
|
||||
gcc-multilib
|
||||
gcolor2
|
||||
gconf
|
||||
gd
|
||||
gdb
|
||||
gdbm
|
||||
|
|
@ -151,6 +154,7 @@ gstreamer0.10-python
|
|||
gstreamer0.10-ugly
|
||||
gstreamer0.10-ugly-plugins
|
||||
gtk2
|
||||
gtk3
|
||||
gtkmm
|
||||
gtkspell
|
||||
gtk-update-icon-cache
|
||||
|
|
@ -319,6 +323,7 @@ libnl
|
|||
libnotify
|
||||
libofa
|
||||
libogg
|
||||
libotf
|
||||
libpcap
|
||||
libpciaccess
|
||||
libpipeline
|
||||
|
|
@ -373,6 +378,7 @@ libxfont
|
|||
libxft
|
||||
libxi
|
||||
libxinerama
|
||||
libxkbcommon
|
||||
libxkbfile
|
||||
libxml2
|
||||
libxmu
|
||||
|
|
@ -408,6 +414,8 @@ lua51
|
|||
lua-lgi
|
||||
lvm2
|
||||
lzo2
|
||||
m17n-db
|
||||
m17n-lib
|
||||
m4
|
||||
make
|
||||
man-db
|
||||
|
|
|
|||
|
|
@ -24,20 +24,19 @@ if [ -n "$(command -v emacs)" ] && [ ! -f "$EMFILE" ]; then
|
|||
if [ -z "$(command -v base64)" ]; then
|
||||
echo ":: base64 not found."
|
||||
else
|
||||
sudo sh -c "echo 'IyEvYmluL3NoCmlmIFsgLXogIiRESVNQTEFZIiBdOyB0aGVuCiAgICBJU19HUkFQSElDQUw9MApl
|
||||
sudo sh -c "umask 022 && echo 'IyEvYmluL3NoCmlmIFsgLXogIiRESVNQTEFZIiBdOyB0aGVuCiAgICBJU19HUkFQSElDQUw9MApl
|
||||
bHNlCiAgICBJU19HUkFQSElDQUw9JChlbWFjcyAtYmF0Y2ggLVEgLS1ldmFsPScoaWYgKGZib3Vu
|
||||
ZHAgJyInIid0b29sLWJhci1tb2RlKSAobWVzc2FnZSAiMSIpIChtZXNzYWdlICIwIikpJyAyPiYx
|
||||
KQpmaQoKaWYgWyAkSVNfR1JBUEhJQ0FMIC1lcSAxIF07IHRoZW4KICAgIGVtYWNzY2xpZW50IC1h
|
||||
ICIiIC1jICIkQCIKZWxzZQogICAgZW1hY3NjbGllbnQgLWEgIiIgLXQgIiRAIgpmaQo=
|
||||
' | base64 -d > "'"'"$EMFILE"'"'"
|
||||
chmod 755 "'"'"$EMFILE"'"'""
|
||||
ICIiIC1uYyAiJEAiCmVsc2UKICAgIGVtYWNzY2xpZW50IC1hICIiIC10ICIkQCIKZmkK
|
||||
' | base64 -d > "'"'"$EMFILE"'"'""
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -f "$HOME/.xkb/symbols/frex" ] && [ ! -f "/usr/local/share/X11/xkb/symbols/frex" ]; then
|
||||
if [ -f "$HOME/.xkb/symbols/frex" ] && [ ! -f "/usr/share/X11/xkb/symbols/frex" ]; then
|
||||
echo "==> frex font (press Ctrl-D to skip)"
|
||||
sudo sh -c 'umask 022 && mkdir -p /usr/local/share/X11/xkb/symbols && cp "$HOME/.xkb/symbols/frex" /usr/local/share/X11/xkb/symbols/'
|
||||
echo
|
||||
sudo sh -c 'umask 022 && mkdir -p /usr/share/X11/xkb/symbols && cp "$HOME/.xkb/symbols/frex" /usr/share/X11/xkb/symbols/ && chmod 644 /usr/share/X11/xkb/symbols/frex'
|
||||
echo
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
106
.shell.d/main_rc
106
.shell.d/main_rc
|
|
@ -1,41 +1,9 @@
|
|||
## -*- mode:sh -*- #
|
||||
################################################################################
|
||||
## Shell Config -- Main
|
||||
## Date 2012-07-27
|
||||
## Shell configuration
|
||||
## Date 2013-05-24
|
||||
################################################################################
|
||||
|
||||
## Mask
|
||||
## Result for 027 is: rwxr-x---
|
||||
umask 027
|
||||
|
||||
## Path
|
||||
## WARNING: putting current dir '.' in PATH is mostly a bad idea!
|
||||
# export PATH=.:$PATH
|
||||
export PATH=$PATH:${HOME}/.launchers/
|
||||
export PATH=$PATH:${HOME}/.scripts/
|
||||
|
||||
|
||||
## TeXlive
|
||||
TEXDIR="${TEXDIR:-/usr/local/texlive}"
|
||||
if [ -d "${TEXDIR}" ]; then
|
||||
TEXYEAR=$(/bin/ls -1r "${TEXDIR}" | grep -m1 "[0-9]\{4\}")
|
||||
TEXDISTRO=$(uname -m)-$(uname | tr "[[:upper:]]" "[[:lower:]]")
|
||||
TEXFOLDER="${TEXDIR}/${TEXYEAR}/bin/${TEXDISTRO}/"
|
||||
if [ -d "${TEXFOLDER}" ]; then
|
||||
export PATH=${TEXFOLDER}:$PATH
|
||||
export INFOPATH=${TEXDIR}/${TEXYEAR}/texmf/doc/info:$INFOPATH
|
||||
|
||||
## BSD uses 'manpath' utility, so MANPATH variable may be empty.
|
||||
if [ "$OSTYPE" = "linux-gnu" ]; then
|
||||
export MANPATH=${TEXDIR}/${TEXYEAR}/texmf/doc/man:$MANPATH
|
||||
fi
|
||||
fi
|
||||
unset TEXYEAR
|
||||
unset TEXDISTRO
|
||||
unset TEXFOLDER
|
||||
fi
|
||||
unset TEXDIR
|
||||
|
||||
## Enable color support of ls.
|
||||
if [ "$TERM" != "dumb" ] && [ "$OSTYPE" = "linux-gnu" ]; then
|
||||
eval "`dircolors $HOME/.shell.d/dircolorsdb`"
|
||||
|
|
@ -48,59 +16,6 @@ fi
|
|||
## executable name.
|
||||
export TERMCMD="urxvt"
|
||||
|
||||
## Terminal
|
||||
## WARNING: this is always a bad idea!
|
||||
## FreeBSD urxvt $TERM variable is not set properly for some reasons.
|
||||
## TODO: check how to do this properly.
|
||||
if [ ! "$OSTYPE" = "linux-gnu" ] && [[ "$TERM" = *rxvt* ]]; then
|
||||
export TERM="rxvt-unicode-256color"
|
||||
fi
|
||||
## Most xterm-based terminals support 256 colors, so let's turn this on.
|
||||
if [ "$TERM" = "xterm" ]; then
|
||||
export TERM="xterm-256color"
|
||||
fi
|
||||
|
||||
## Make 'less' more friendly for non-text input files, see lesspipe(1).
|
||||
[ -x /usr/bin/lesspipe ] && eval "$(lesspipe)"
|
||||
|
||||
## Manpage.
|
||||
export MANPAGER="less -s"
|
||||
## The following options are useful for FreeBSD default 'less' command which has
|
||||
## an empty prompt. Sadly this gets messy with 'apropos'.
|
||||
# export MANPAGER="less -sP '?f%f .?m(file %i of %m) .?ltlines %lt-%lb?L/%L. .byte %bB?s/%s. ?e(END) :?pB%pB\%..%t'"
|
||||
export MANWIDTH=80
|
||||
|
||||
## Less config. -R is needed for lesspipe.
|
||||
export LESS=' -R '
|
||||
|
||||
## Time display (with ls command for example)
|
||||
## TODO: BSD version?
|
||||
export TIME_STYLE=+"|%Y-%m-%d %H:%M:%S|"
|
||||
|
||||
## System locale
|
||||
# export LC_MESSAGES=fr_FR.utf8
|
||||
|
||||
## Default text editor
|
||||
EDITOR=nano
|
||||
if [ -n "$(command -v vim)" ]; then
|
||||
EDITOR=vim
|
||||
fi
|
||||
if [ -n "$(command -v emacs)" ]; then
|
||||
EDITOR='emacs'
|
||||
fi
|
||||
GIT_EDITOR="$EDITOR"
|
||||
## 'em' is a script for emacsclient. See 'homeinit'.
|
||||
if [ -n "$(command -v em)" ]; then
|
||||
EDITOR='em'
|
||||
GIT_EDITOR='emacsclient -a "" -t'
|
||||
fi
|
||||
export EDITOR
|
||||
export GIT_EDITOR
|
||||
|
||||
## Internet Browser
|
||||
[ -n "$(command -v luakit)" ] && export BROWSER="luakit"
|
||||
[ -n "$(command -v dwb)" ] && export BROWSER="dwb"
|
||||
|
||||
## Title
|
||||
## If this is an xterm set the title to user@host:dir
|
||||
#case "$TERM" in
|
||||
|
|
@ -110,20 +25,3 @@ export GIT_EDITOR
|
|||
#*)
|
||||
# ;;
|
||||
#esac
|
||||
|
||||
## SSH-Agent
|
||||
## WARNING: this is somewhat insecure. Avoid using it on a mutli-user machine.
|
||||
if [ -n "$(command -v ssh-agent)" ]; then
|
||||
SSH_ENV_FILE="/tmp/ssh-agent-env"
|
||||
if [ $(ps ax -o command="" | grep -c "ssh-agent") -eq 1 ]; then
|
||||
SSH_AGENT_VARS=$(ssh-agent)
|
||||
eval $(echo "${SSH_AGENT_VARS}")
|
||||
echo "${SSH_AGENT_VARS}" | sed '2q' | cut -d'=' -f2 | cut -d';' -f1 > "$SSH_ENV_FILE"
|
||||
chmod 444 "$SSH_ENV_FILE"
|
||||
unset $SSH_AGENT_VARS
|
||||
elif [ -f "$SSH_ENV_FILE" ]; then
|
||||
SSH_AUTH_SOCK=$(sed -n '1{p;q}' "$SSH_ENV_FILE") ; export SSH_AUTH_SOCK
|
||||
SSH_AGENT_PID=$(sed -n '2{p;q}' "$SSH_ENV_FILE") 2>/dev/null ; export SSH_AGENT_PID
|
||||
fi
|
||||
unset SSH_ENV_FILE
|
||||
fi
|
||||
|
|
|
|||
108
.xprofile
108
.xprofile
|
|
@ -3,10 +3,111 @@
|
|||
## XPROFILE
|
||||
## 2013-05-23
|
||||
################################################################################
|
||||
|
||||
## This file is sourced by some DM and should not contain any desktop execution.
|
||||
|
||||
## Config (for URxvt)
|
||||
## Mask
|
||||
## Result for 027 is: rwxr-x---
|
||||
umask 027
|
||||
|
||||
## Path
|
||||
## WARNING: putting current dir '.' in PATH is mostly a bad idea!
|
||||
# export PATH=.:$PATH
|
||||
export PATH=$PATH:${HOME}/.launchers/
|
||||
export PATH=$PATH:${HOME}/.scripts/
|
||||
|
||||
|
||||
## TeXlive
|
||||
TEXDIR="${TEXDIR:-/usr/local/texlive}"
|
||||
if [ -d "${TEXDIR}" ]; then
|
||||
TEXYEAR=$(/bin/ls -1r "${TEXDIR}" | grep -m1 "[0-9]\{4\}")
|
||||
TEXDISTRO=$(uname -m)-$(uname | tr "[[:upper:]]" "[[:lower:]]")
|
||||
TEXFOLDER="${TEXDIR}/${TEXYEAR}/bin/${TEXDISTRO}/"
|
||||
if [ -d "${TEXFOLDER}" ]; then
|
||||
export PATH=${TEXFOLDER}:$PATH
|
||||
export INFOPATH=${TEXDIR}/${TEXYEAR}/texmf/doc/info:$INFOPATH
|
||||
|
||||
## BSD uses 'manpath' utility, so MANPATH variable may be empty.
|
||||
if [ "$OSTYPE" = "linux-gnu" ]; then
|
||||
export MANPATH=${TEXDIR}/${TEXYEAR}/texmf/doc/man:$MANPATH
|
||||
fi
|
||||
fi
|
||||
unset TEXYEAR
|
||||
unset TEXDISTRO
|
||||
unset TEXFOLDER
|
||||
fi
|
||||
unset TEXDIR
|
||||
|
||||
## Terminal
|
||||
## WARNING: this is always a bad idea!
|
||||
## FreeBSD urxvt $TERM variable is not set properly for some reasons.
|
||||
## TODO: check how to do this properly.
|
||||
if [ ! "$OSTYPE" = "linux-gnu" ] && [[ "$TERM" = *rxvt* ]]; then
|
||||
export TERM="rxvt-unicode-256color"
|
||||
fi
|
||||
## Most xterm-based terminals support 256 colors, so let's turn this on.
|
||||
if [ "$TERM" = "xterm" ]; then
|
||||
export TERM="xterm-256color"
|
||||
fi
|
||||
|
||||
## Make 'less' more friendly for non-text input files, see lesspipe(1).
|
||||
[ -x /usr/bin/lesspipe ] && eval "$(lesspipe)"
|
||||
|
||||
## Manpage.
|
||||
export MANPAGER="less -s"
|
||||
export MANWIDTH=80
|
||||
## The following options are useful for FreeBSD default 'less' command which has
|
||||
## an empty prompt. Sadly this gets messy with 'apropos'.
|
||||
# export MANPAGER="less -sP '?f%f .?m(file %i of %m) .?ltlines %lt-%lb?L/%L. .byte %bB?s/%s. ?e(END) :?pB%pB\%..%t'"
|
||||
|
||||
## Less config. -R is needed for lesspipe.
|
||||
export LESS=' -R '
|
||||
|
||||
## Time display (with ls command for example)
|
||||
## TODO: BSD version?
|
||||
export TIME_STYLE=+"|%Y-%m-%d %H:%M:%S|"
|
||||
|
||||
## System locale
|
||||
# export LC_MESSAGES=fr_FR.utf8
|
||||
|
||||
## Default text editor
|
||||
EDITOR=nano
|
||||
if [ -n "$(command -v vim)" ]; then
|
||||
EDITOR=vim
|
||||
fi
|
||||
if [ -n "$(command -v emacs)" ]; then
|
||||
EDITOR='emacs'
|
||||
fi
|
||||
GIT_EDITOR="$EDITOR"
|
||||
## 'em' is a script for emacsclient. See 'homeinit'.
|
||||
if [ -n "$(command -v em)" ]; then
|
||||
EDITOR='em'
|
||||
GIT_EDITOR='emacsclient -a "" -t'
|
||||
fi
|
||||
export EDITOR
|
||||
export GIT_EDITOR
|
||||
|
||||
## Internet Browser
|
||||
[ -n "$(command -v luakit)" ] && export BROWSER="luakit"
|
||||
[ -n "$(command -v dwb)" ] && export BROWSER="dwb"
|
||||
|
||||
## SSH-Agent
|
||||
## WARNING: this is somewhat insecure. Avoid using it on a mutli-user machine.
|
||||
if [ -n "$(command -v ssh-agent)" ]; then
|
||||
SSH_ENV_FILE="/tmp/ssh-agent-env"
|
||||
if [ $(ps ax -o command="" | grep -c "ssh-agent") -eq 1 ]; then
|
||||
SSH_AGENT_VARS=$(ssh-agent)
|
||||
eval $(echo "${SSH_AGENT_VARS}")
|
||||
echo "${SSH_AGENT_VARS}" | sed '2q' | cut -d'=' -f2 | cut -d';' -f1 > "$SSH_ENV_FILE"
|
||||
chmod 444 "$SSH_ENV_FILE"
|
||||
unset $SSH_AGENT_VARS
|
||||
elif [ -f "$SSH_ENV_FILE" ]; then
|
||||
SSH_AUTH_SOCK=$(sed -n '1{p;q}' "$SSH_ENV_FILE") ; export SSH_AUTH_SOCK
|
||||
SSH_AGENT_PID=$(sed -n '2{p;q}' "$SSH_ENV_FILE") 2>/dev/null ; export SSH_AGENT_PID
|
||||
fi
|
||||
unset SSH_ENV_FILE
|
||||
fi
|
||||
|
||||
## X config (for URxvt, etc.)
|
||||
[ -f "${HOME}/.Xresources" ] && xrdb -merge "${HOME}/.Xresources"
|
||||
|
||||
## Numlock
|
||||
|
|
@ -19,6 +120,3 @@ if [ "$OSTYPE" = "linux-gnu" ] ; then
|
|||
## External device auto-mounting.
|
||||
[ -n "$(comand -v udiskie)" ] && udiskie &
|
||||
fi
|
||||
|
||||
## Environment
|
||||
[ -f ~/.shell.d/main_rc ] && . ~/.shell.d/main_rc
|
||||
|
|
|
|||
Loading…
Reference in New Issue