dotfiles update

This commit is contained in:
2016-09-09 14:25:37 +02:00
parent f5962020c6
commit 85169f79bc
20 changed files with 37 additions and 226 deletions

View File

@@ -3,9 +3,11 @@
email = zlorfi@gmail.com
[push]
default = simple
[pull]
rebase = true
[core]
excludesfile = /Users/michi/.gitignore
editor = macvim
editor = atom
[branch]
autosetuprebase = always
[color]

10
irbrc
View File

@@ -29,15 +29,6 @@ begin
rescue LoadError => err
warn "Couldn't load awesome_print: #{err}"
end
## Enable wirble
#require 'wirble'
#Wirble.init
#
## Enable colored output
#Wirble.colorize
# load rails stuff?
# load (File.dirname(__FILE__) + '/.railsrc') if $0 == 'irb' && ENV['RAILS_ENV']
script_console_running = ENV.include?('RAILS_ENV') && IRB.conf[:LOAD_MODULES] && IRB.conf[:LOAD_MODULES].include?('console_with_helpers')
rails_running = ENV.include?('RAILS_ENV') && !(IRB.conf[:LOAD_MODULES] && IRB.conf[:LOAD_MODULES].include?('console_with_helpers'))
@@ -47,4 +38,3 @@ if script_console_running
require 'logger'
Object.const_set(:RAILS_DEFAULT_LOGGER, Logger.new(STDOUT))
end

6
jumprc
View File

@@ -1,6 +0,0 @@
---
dl: /Users/michi/Downloads
ruby: /Users/michi/Documents/workspace_ruby
misc: /Users/michi/Documents/workspace_misc
node: /Users/michi/Documents/workspace_nodejs
root: /Users/michi

View File

@@ -6,7 +6,7 @@ _homebrew=`which brew`
_to_install="imagemagick mongodb postgresql rbenv redis ruby-build tmux unrar yasm youtube-dl zsh elixir git"
# Generate symlinks for files
for i in gemrc gvimrc irbrc jumprc NERDTreeBookmarks screenrc vimrc zshrc tmux.conf rspec gitconfig gitignore
for i in gemrc gitconfig gitignore gvimrc irbrc mongorc.js NERDTreeBookmarks rspec screenrc tmux.conf vimrc zshrc
do
if [ ! -f $HOME/.$i ]
then

17
mongorc.js Normal file
View File

@@ -0,0 +1,17 @@
replicaset_conf = {
_id: 'demo-dev',
members: [
{
_id: 0,
host: '127.0.0.1:27001'
},
{
_id: 1,
host: '127.0.0.1:27002'
},
{
_id: 2,
host: '127.0.0.1:27003'
}
]
}

View File

@@ -9,6 +9,5 @@ This is my private wiki because my brain has a limited stack size.
* [[generate bootable USB stick]]
* [[hdiutil]]
* [[pdf_decrypt]]
* [[rbenv]]
* [[ssh-copy-id]]
* [[vim]]

View File

@@ -1,9 +0,0 @@
=rbenv=
Ruby 1.9.3 mit einem andren Compiler installieren
{{{class="brush: bash; ; toolbar: false;"
$ env CC=/usr/local/Cellar/gcc46/4.6.4/bin/gcc-4.6 rbenv install 1.9.3-p547
}}}
[ [[index|Go home]] ]

View File

@@ -1,4 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html>
<head>
<link rel="Stylesheet" type="text/css" href="style.css">
@@ -7,13 +7,13 @@
</head>
<body>
<h1 id="toc_1">Michis Onlinebrain</h1>
<div id="Michis Onlinebrain"><h1 id="Michis Onlinebrain">Michis Onlinebrain</h1></div>
<p>
This is my private wiki because my brain has a limited stack size.
</p>
<h2 id="toc_1.1">Linkliste</h2>
<div id="Michis Onlinebrain-Linkliste"><h2 id="Linkliste">Linkliste</h2></div>
<ul>
<li>
<a href="diskutil.html">diskutil</a>
@@ -33,9 +33,6 @@ This is my private wiki because my brain has a limited stack size.
<li>
<a href="pdf_decrypt.html">pdf_decrypt</a>
<li>
<a href="rbenv.html">rbenv</a>
<li>
<a href="ssh-copy-id.html">ssh-copy-id</a>

View File

@@ -1,25 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<link rel="Stylesheet" type="text/css" href="style.css">
<title>rbenv</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
<h1 id="toc_1">rbenv</h1>
<p>
Ruby 1.9.3 mit einem andren Compiler installieren
</p>
<pre class="brush: bash; ; toolbar: false;">
$ env CC=/usr/local/Cellar/gcc46/4.6.4/bin/gcc-4.6 rbenv install 1.9.3-p547
</pre>
<p>
[ <a href="index.html">Go home</a> ]
</p>
</body>
</html>

9
vimrc
View File

@@ -16,6 +16,7 @@ call vundle#begin()
Plugin 'gmarik/Vundle.vim'
" my plugins
Plugin 'ctrlpvim/ctrlp.vim'
Plugin 'danro/rename.vim'
Plugin 'elixir-lang/vim-elixir'
Plugin 'ervandew/supertab'
@@ -23,10 +24,12 @@ Plugin 'garbas/vim-snipmate'
Plugin 'ingydotnet/yaml-vim'
Plugin 'jiangmiao/auto-pairs'
Plugin 'kchmck/vim-coffee-script'
Plugin 'kien/ctrlp.vim'
Plugin 'leafgarland/typescript-vim'
Plugin 'magarcia/vim-angular2-snippets'
Plugin 'MarcWeber/vim-addon-mw-utils'
Plugin 'mileszs/ack.vim'
Plugin 'mustache/vim-mustache-handlebars'
Plugin 'mxw/vim-jsx'
Plugin 'pangloss/vim-javascript'
Plugin 'Raimondi/delimitMate'
Plugin 'scrooloose/nerdcommenter'
@@ -198,10 +201,6 @@ map <leader>_ :GundoToggle<cr>
" Marked.app is an Markdown interpreter on MacOS
map <leader>m :silent !open -a Marked.app '%:p'<cr>
map <leader>f :FufFileWithFullCwd<cr>
map <leader>d :FufFileWithCurrentBufferDir<cr>
map <leader>b :FufBuffer<cr>
" NerdComment
map <leader>cc :NERDComInvertComment

View File

@@ -1,12 +1,6 @@
# Basic directory operations
alias ...='cd ../..'
alias -- -='cd -'
# Super user
alias _='sudo'
#alias g='grep -in'
# Show history
alias history='fc -l 1'
@@ -14,20 +8,11 @@ alias history='fc -l 1'
alias l='ls -la'
alias ll='ls -l'
alias x=extract
alias m=macvim
alias bb='brew update && brew outdated'
alias yy='youtube-dl -f22 -t'
alias j='jump'
# Rails
alias rs='rails server'
alias rc='rails console'
alias bx='bundle exec'
alias p='peco'

View File

@@ -4,22 +4,3 @@ setopt auto_pushd
setopt pushd_ignore_dups
alias ..='cd ..'
alias cd..='cd ..'
alias cd...='cd ../..'
alias cd....='cd ../../..'
alias cd.....='cd ../../../..'
alias cd/='cd /'
cd () {
if [[ "x$*" == "x..." ]]; then
cd ../..
elif [[ "x$*" == "x...." ]]; then
cd ../../..
elif [[ "x$*" == "x....." ]]; then
cd ../../..
elif [[ "x$*" == "x......" ]]; then
cd ../../../..
else
builtin cd "$@"
fi
}

View File

@@ -21,46 +21,6 @@ function preexec {
title $cmd[1]:t "$cmd[2,-1]"
}
function zsh_stats() {
history | awk '{print $2}' | sort | uniq -c | sort -rn | head
}
function extract() {
unset REMOVE_ARCHIVE
if test "$1" = "-r"; then
REMOVE=1
shift
fi
if [[ -f $1 ]]; then
case $1 in
*.tar.bz2) tar xvjf $1;;
*.tar.gz) tar xvzf $1;;
*.tar.xz) tar xvJf $1;;
*.tar.lzma) tar --lzma -xvf $1;;
*.bz2) bunzip $1;;
*.rar) unrar x $1;;
*.gz) gunzip $1;;
*.tar) tar xvf $1;;
*.tbz2) tar xvjf $1;;
*.tgz) tar xvzf $1;;
*.zip) unzip $1;;
*.Z) uncompress $1;;
*.7z) 7z x $1;;
*) echo "'$1' cannot be extracted via >extract<";;
esac
if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
echo removing "$1";
/bin/rm "$1";
fi
else
echo "'$1' is not a valid file"
fi
}
function ruby_version()
{
if which rvm-prompt &> /dev/null; then

View File

@@ -30,16 +30,3 @@ alias gba='git branch -a'
alias gcount='git shortlog -sn'
alias gcp='git cherry-pick'
alias glg='git log --stat --max-count=5'
# Will return the current branch name
# Usage example: git pull origin $(current_branch)
#
function current_branch() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
echo ${ref#refs/heads/}
}
# these aliases take advantage of the previous function
alias ggpull='git pull origin $(current_branch)'
alias ggpush='git push origin $(current_branch)'
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'

View File

@@ -1,7 +1,7 @@
## Command history configuration
HISTFILE=$HOME/.zsh_history
HISTSIZE=10000
SAVEHIST=10000
HISTSIZE=5000
SAVEHIST=5000
setopt append_history
setopt extended_history
@@ -10,4 +10,4 @@ setopt hist_ignore_dups # ignore duplication command history list
setopt hist_ignore_space
setopt hist_verify
setopt inc_append_history
setopt share_history # share command history data
setopt share_history # share command history data

View File

@@ -1,59 +0,0 @@
# This file is part of the jump project
#
# Copyright (C) 2010 Flavio Castelli <flavio@castelli.name>
#
# jump is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# jump is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Keep; if not, write to the
# Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
_jump()
{
local user_input
read -cA user_input
local cur prev
reply=()
cur="${user_input[$#user_input]}"
if [[ $#user_input -gt 2 ]]; then
prev="${user_input[$#user_input-1]}"
fi
if [[ ${prev} = "-d" || ${prev} = "--del" ]] ; then
# complete the del command with a list of the available bookmarks
reply=( $(jump-bin --bc) )
return 0
fi
if [[ ${cur[0,1]} = "-" ]]; then
reply=( --help -h --add -a --del -d --list -l )
return 0
else
reply=( $(jump-bin --bc ${cur}) )
return 0
fi
}
function jump {
args=$*
#echo "jump called with |$args|"
if [[ $#args -lt 1 ]]; then
jump-bin --help
elif [[ ${args[0,1]} = "-" ]]; then
jump-bin $*
else
cd "$(jump-bin $*)"
fi
}
compctl -K _jump -S '' jump

View File

@@ -4,7 +4,6 @@ function prompt_char {
echo '»'
}
function virtualenv_info {
[ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
}

2
zsh/lib/rails.zsh Normal file
View File

@@ -0,0 +1,2 @@
# disable 'spring' for Rails development
DISABLE_SPRING=1

2
zsh/lib/ulimits.zsh Normal file
View File

@@ -0,0 +1,2 @@
ulimit -Hn 2048
ulimit -Sn 2048

14
zshrc
View File

@@ -15,21 +15,11 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
autoload -U compinit
compinit -i
#ulimit -Hn 2048
#ulimit -Sn 2048
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
PATH=/usr/local/bin:$PATH
PATH=/usr/local/bin:/usr/local/sbin:$PATH # Added for more brew executables
PATH=/opt/chefdk/bin:/opt/chef/bin:$PATH # Added for more brew executables
source `jump-bin --zsh-integration`
# PATH=/opt/chefdk/bin:/opt/chef/bin:$PATH # Added for more brew executables
PATH=/opt/chef/bin:/opt/chefdk/bin:$PATH # Added for more brew executables
# Editor
export EDITOR=vim
# SSL Certificate needed, install first with
# brew install curl-ca-bundle
if [ -f /usr/local/opt/curl-ca-bundle/share/ca-bundle.crt ]; then
export SSL_CERT_FILE=/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt
fi