Bladeren bron

Merge branch 'master' of github.com:10sr/dotfiles

pull/1/head
10sr 11 jaren geleden
bovenliggende
commit
61fd49a37b
4 gewijzigde bestanden met toevoegingen van 42 en 68 verwijderingen
  1. +1
    -1
      _keysnail.js
  2. +27
    -62
      bashrc
  3. +12
    -3
      emacs.el
  4. +2
    -2
      tmux.conf.pl

+ 1
- 1
_keysnail.js Bestand weergeven

@@ -39,7 +39,7 @@ style.register( //not work
plugins.options["search-url-list"] = [
["bing","http://bing.com/search?q=%q"],
["yatwitter search","http://yats-data.com/yats/search?query=%q"],
["twitter search","http://search.twitter.com/search?q=%q&lang=all"],
["twitter search","http://twitter.com/search?q=%q&lang=all"],
["tospy", "http://topsy.com/s?allow_lang=ja&q=%q"],
["2ch","http://2ch-ranking.net/search.php?q=%q&imp=and&order=time"],
["I\'m feelig lucky!","http://www.google.co.jp/search?q=%q&btnI=kudos"],


+ 27
- 62
bashrc Bestand weergeven

@@ -256,7 +256,7 @@ if null type _git
then
# enable programmable completion for g
complete -o bashdefault -o default -o nospace -F _git g 2>/dev/null \
|| complete -o default -o nospace -F _git g
|| complete -o default -o nospace -F _git g
fi

alias setup.py="sudo python3 setup.py install --record files.txt"
@@ -277,15 +277,15 @@ clk(){
}

man(){
env \
LESS_TERMCAP_mb=$(printf "\e[1;35m") \
LESS_TERMCAP_md=$(printf "\e[1;31m") \
LESS_TERMCAP_me=$(printf "\e[0m") \
LESS_TERMCAP_se=$(printf "\e[0m") \
LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
LESS_TERMCAP_ue=$(printf "\e[0m") \
LESS_TERMCAP_us=$(printf "\e[1;32m") \
man "$@"
env \
LESS_TERMCAP_mb=$(printf "\e[1;35m") \
LESS_TERMCAP_md=$(printf "\e[1;31m") \
LESS_TERMCAP_me=$(printf "\e[0m") \
LESS_TERMCAP_se=$(printf "\e[0m") \
LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
LESS_TERMCAP_ue=$(printf "\e[0m") \
LESS_TERMCAP_us=$(printf "\e[1;32m") \
man "$@"
}

scr(){
@@ -491,8 +491,14 @@ tb(){
}

mkcd(){
mkdir -p $1
cd $1
if test -d "$1"
then
echo "Dir \"$1\" already exists."
else
mkdir -p "$1"
echo "Dir \"$1\" created."
fi
cd "$1"
}

if test -n "$TMUX" && null type reattach-to-user-namespace
@@ -709,7 +715,7 @@ __my_ps1_moc(){
}

for f in /usr/share/git/git-prompt.sh \
/opt/local/share/doc/git-core/contrib/completion/git-prompt.sh
/opt/local/share/doc/git-core/contrib/completion/git-prompt.sh
do
test -r $f && . $f && break
done
@@ -786,55 +792,14 @@ __my_set_screen_title(){
__my_set_title(){
case $TERM in
(rxvt*|xterm*|aterm|screen*)
title="$(echo $@)"
test -t 1 &&
test -n "$DISPLAY" &&
test -z "$EMACS" &&
echo -n -e "\033]0;${title}\007"
;;
title="$(echo $@)"
test -t 1 &&
test -n "$DISPLAY" &&
test -z "$EMACS" &&
echo -n -e "\033]0;${title}\007"
;;
esac
}
PROMPT_COMMAND="__my_set_title \${USER}@\${HOSTNAME}\:\${PWD};
}
PROMPT_COMMAND="__my_set_title \${USER}@\${HOSTNAME}\:\${PWD};
__my_set_screen_title \$(basename \"\$PWD\")/"

# copied from https://wiki.archlinux.org/index.php/X_resources
invader(){
# ANSI color scheme script featuring Space Invaders
#
# Original: http://crunchbanglinux.org/forums/post/126921/#p126921
# Modified by lolilolicon
#

f=3 b=4
for j in f b; do
for i in {0..7}; do
printf -v $j$i %b "\e[${!j}${i}m"
done
done
bld=$'\e[1m'
rst=$'\e[0m'

cat << EOF

$f1 ▀▄ ▄▀ $f2 ▄▄▄████▄▄▄ $f3 ▄██▄ $f4 ▀▄ ▄▀ $f5 ▄▄▄████▄▄▄ $f6 ▄██▄ $rst
$f1 ▄█▀███▀█▄ $f2███▀▀██▀▀███ $f3▄█▀██▀█▄ $f4 ▄█▀███▀█▄ $f5███▀▀██▀▀███ $f6▄█▀██▀█▄$rst
$f1█▀███████▀█ $f2▀▀███▀▀███▀▀ $f3▀█▀██▀█▀ $f4█▀███████▀█ $f5▀▀███▀▀███▀▀ $f6▀█▀██▀█▀$rst
$f1▀ ▀▄▄ ▄▄▀ ▀ $f2 ▀█▄ ▀▀ ▄█▀ $f3▀▄ ▄▀ $f4▀ ▀▄▄ ▄▄▀ ▀ $f5 ▀█▄ ▀▀ ▄█▀ $f6▀▄ ▄▀$rst

$bld$f1▄ ▀▄ ▄▀ ▄ $f2 ▄▄▄████▄▄▄ $f3 ▄██▄ $f4▄ ▀▄ ▄▀ ▄ $f5 ▄▄▄████▄▄▄ $f6 ▄██▄ $rst
$bld$f1█▄█▀███▀█▄█ $f2███▀▀██▀▀███ $f3▄█▀██▀█▄ $f4█▄█▀███▀█▄█ $f5███▀▀██▀▀███ $f6▄█▀██▀█▄$rst
$bld$f1▀█████████▀ $f2▀▀▀██▀▀██▀▀▀ $f3▀▀█▀▀█▀▀ $f4▀█████████▀ $f5▀▀▀██▀▀██▀▀▀ $f6▀▀█▀▀█▀▀$rst
$bld$f1 ▄▀ ▀▄ $f2▄▄▀▀ ▀▀ ▀▀▄▄ $f3▄▀▄▀▀▄▀▄ $f4 ▄▀ ▀▄ $f5▄▄▀▀ ▀▀ ▀▀▄▄ $f6▄▀▄▀▀▄▀▄$rst


$f7▌$rst

$f7▌$rst

$f7 ▄█▄ $rst
$f7▄█████████▄$rst
$f7▀▀▀▀▀▀▀▀▀▀▀$rst

EOF
}
#/etc/lsb-release

+ 12
- 3
emacs.el Bestand weergeven

@@ -452,6 +452,13 @@ found, otherwise returns nil."
(set-face-underline-p 'vertical-border
nil)

(and (fetch-library
"https://raw.github.com/tarao/elisp/master/end-mark.el"
t)
(require 'end-mark nil t)
(global-end-mark-mode))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; file handling

@@ -668,9 +675,6 @@ found, otherwise returns nil."
(add-to-list 'interpreter-mode-alist
'("python2" . python-mode))

;; (add-hook default-majorg-mode
;; 'my-detect-major-mode-from-shebang)

;; http://fukuyama.co/foreign-regexp
'(and (fetch-library
"https://raw.github.com/k-talo/foreign-regexp.el/master/foreign-regexp.el"
@@ -776,6 +780,11 @@ found, otherwise returns nil."
(setq auto-mode-alist (append '(("PKGBUILD\\'" . pkgbuild-mode))
auto-mode-alist)))

(add-hook 'html-mode-hook
(lambda ()
(define-key html-mode-map (kbd "C-m")
'reindent-then-newline-and-indent)))

(add-hook 'text-mode-hook
(lambda ()
(define-key text-mode-map (kbd "C-m") 'newline)))


+ 2
- 2
tmux.conf.pl Bestand weergeven

@@ -12,7 +12,7 @@ my %color_prefs = (
"darwin-mba.local" => "red,white",
"newkiwi" => "magenta,white"
);
my $color_def = "green,white";
my $color_def = "green,black";

sub tmux {
my @command = ($tmux_command, );
@@ -57,7 +57,7 @@ sub get_hostname {
my $hostname = $ENV{"HOSTNAME"};
if (! $hostname) {
$hostname = `hostname`;
$hostname =~ s/\n//;
chomp($hostname)
}
return $hostname;
}


Laden…
Annuleren
Opslaan