Mercurial > repos > other > linux
changeset 55:231b9b290bfb
Merge accidental heads
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Sat, 25 Mar 2017 11:15:14 +0000 |
parents | 39bdd245431b (current diff) 6b500877a2fc (diff) |
children | 3c48c5671f1a |
files | |
diffstat | 5 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/bashrc Sat Mar 25 11:14:52 2017 +0000 +++ b/bashrc Sat Mar 25 11:15:14 2017 +0000 @@ -11,7 +11,7 @@ export EDITOR=/usr/bin/nano # Set 256-colour terminal support -export TERM="xterm-256color" +export TERM="screen-256color" #Import aliases test -s ~/.alias && . ~/.alias || true @@ -35,4 +35,5 @@ echo "tmux failed to start" fi -export GTK_IM_MODULE=ibus \ No newline at end of file +export GTK_IM_MODULE=ibus +export LS_OPTIONS="$LS_OPTIONS -p" \ No newline at end of file
--- a/dircolors Sat Mar 25 11:14:52 2017 +0000 +++ b/dircolors Sat Mar 25 11:15:14 2017 +0000 @@ -184,13 +184,14 @@ .docx 00;38;5;69 .ppt 00;38;5;69 .pptx 00;38;5;69 -.xsl 00;38;5;69 -.xslx 00;38;5;69 +.xls 00;38;5;69 +.xlsx 00;38;5;69 .txt 00;38;5;69 .epub 00;38;5;69 .mobi 00;38;5;69 .odt 00;38;5;69 .ods 00;38;5;69 +.odp 00;38;5;69 .csv 00;38;5;69 .sxw 00;38;5;69 .md 00;38;5;69 @@ -221,6 +222,7 @@ .rb 00;38;5;28 .scala 00;38;5;28 .py 00;38;5;28 +.json 00;38;5;28 # Code changes (different green) .patch 00;38;5;65
--- a/hgrc Sat Mar 25 11:14:52 2017 +0000 +++ b/hgrc Sat Mar 25 11:15:14 2017 +0000 @@ -1,7 +1,6 @@ [ui] username = IBBoard <dev@ibboard.co.uk> merge = meld -logtemplate='{rev}:{node|short} - {age(date)} ({phase}){ifeq(p2rev, '-1', '', '\n Merge: {p1rev}:{p1node|short} && {p2rev}:{p2node|short}')}\n {tabindent(desc)}\n\n' [trusted] #Trust root (mainly for VPS running, where some repos are owned by root and we want to do "hg status" without sudo-ing) @@ -10,11 +9,9 @@ [alias] copush = !$HG commit $@ && $HG push -view = hgview [extensions] extdiff = -hgext.hgview = ~/.hgview.py bookmarks = hgext.convert= color =
--- a/profile Sat Mar 25 11:14:52 2017 +0000 +++ b/profile Sat Mar 25 11:15:14 2017 +0000 @@ -12,4 +12,4 @@ #Set us up for XCompose support of custom characters export GTK_IM_MODULE="ibus" export LS_OPTIONS="$LS_OPTIONS -p" -export TERM="xterm-256color" \ No newline at end of file +export TERM="screen-256color" \ No newline at end of file
--- a/tmux.conf Sat Mar 25 11:14:52 2017 +0000 +++ b/tmux.conf Sat Mar 25 11:15:14 2017 +0000 @@ -4,4 +4,5 @@ set -g status-fg white #set -g terminal-overrides 'xterm*:smcup@:rmcup@' #setw -g mode-mouse on -set-window-option -g xterm-keys on +setw -g xterm-keys on +setw -g allow-rename off \ No newline at end of file