Mercurial > repos > other > linux
changeset 26:deb089e237ac
Merge SSH assumption fix
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Sat, 24 Oct 2015 15:49:19 +0100 |
parents | acbc487533ab (diff) 59f5444ef031 (current diff) |
children | c67aa2af6ff2 |
files | setup.sh |
diffstat | 4 files changed, 24 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/XCompose Sat Jun 27 19:48:46 2015 +0100 +++ b/XCompose Sat Oct 24 15:49:19 2015 +0100 @@ -10,6 +10,11 @@ <Multi_key> <greater> <colon> <parenright> : "😈" <Multi_key> <colon> <o> : "😲" <Multi_key> <colon> <O> : "😲" +<Multi_key> <colon> <D> : "😄" +<Multi_key> <colon> <P> : "😛" +<Multi_key> <colon> <p> : "😛" +<Multi_key> <semicolon> <P> : "😜" +<Multi_key> <semicolon> <p> : "😜" @@ -553,3 +558,4 @@ <Multi_key> <Multi_key> <X> : "Χ" U03A7 # GREEK CAPITAL LETTER CHI <Multi_key> <Multi_key> <Y> : "Υ" U03A5 # GREEK CAPITAL LETTER UPSILON <Multi_key> <Multi_key> <Z> : "Ζ" U0396 # GREEK CAPITAL LETTER ZETA +
--- a/bashrc Sat Jun 27 19:48:46 2015 +0100 +++ b/bashrc Sat Oct 24 15:49:19 2015 +0100 @@ -9,6 +9,8 @@ # Use a sane editor export EDITOR=/usr/bin/nano + +#Import aliases test -s ~/.alias && . ~/.alias || true # Add sbins to path to make life easier (e.g. /sbin/ifconfig) @@ -17,12 +19,11 @@ #Disable man page number prompts - where there's more than one, we normally want the default (user command) version export MAN_POSIXLY_CORRECT=1 -#Make sure that Thunderbird et al show correct dates -export LC_TIME=en_GB.UTF-8 - #Disable less history, because do I really search the same things enough to use it across sessions? export LESSHISTFILE=- +export XDG_CACHE_HOME="$HOME/.cache" + if [ "$PS1" != "" -a "${STARTED_TMUX:-x}" = x -a "${SSH_TTY:-x}" != x ] then STARTED_TMUX=1; export STARTED_TMUX
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/profile Sat Oct 24 15:49:19 2015 +0100 @@ -0,0 +1,13 @@ +# This file is read each time a login shell is started. +# All other interactive shells will only read .bashrc; this is particularly +# important for language settings, see below. + +#SUSE-ism for importing common profile stuff +test -z "$PROFILEREAD" && . /etc/profile || true + +#Make sure that Thunderbird et al show correct dates and that all apps (not just Bash) get the right locale +export LC_TIME=en_GB.UTF-8 +export LC_ALL=en_GB.UTF-8 + +#Set us up for XCompose support of custom characters +export GTK_IM_MODULE="uim" \ No newline at end of file
--- a/setup.sh Sat Jun 27 19:48:46 2015 +0100 +++ b/setup.sh Sat Oct 24 15:49:19 2015 +0100 @@ -28,6 +28,7 @@ create_symlink tmux.conf ~/.tmux.conf create_symlink hgrc ~/.hgrc create_symlink bashrc ~/.bashrc +create_symlink profile ~/.profile create_symlink /usr/lib/python*/site-packages/hgext/hgview.py ~/.hgview.py create_symlink gitconfig ~/.gitconfig create_symlink dircolors ~/.dir_colors