From ed55e0bc475e77c20eb25f09df8c1b13c415d69f Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 29 Nov 2011 16:58:30 +0100 Subject: //infest: add makefu profile --- infest/profiles/makefu/bootstrap.sh | 31 ++++++++++++++++++++ infest/profiles/makefu/vim | 1 + infest/profiles/makefu/vimrc | 1 + infest/profiles/makefu/zshrc | 58 +++++++++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+) create mode 100755 infest/profiles/makefu/bootstrap.sh create mode 160000 infest/profiles/makefu/vim create mode 120000 infest/profiles/makefu/vimrc create mode 100644 infest/profiles/makefu/zshrc (limited to 'infest') diff --git a/infest/profiles/makefu/bootstrap.sh b/infest/profiles/makefu/bootstrap.sh new file mode 100755 index 00000000..e4bad93e --- /dev/null +++ b/infest/profiles/makefu/bootstrap.sh @@ -0,0 +1,31 @@ +#!/bin/sh +set -xeuf + +cd $(readlink -f $(dirname $0)) + +# Backing up false positives +if [ -e $HOME/.vim ] ; then + echo "Backing up old vim folder" + mv $HOME/.vim $HOME/.vim.`date +%Y%M%d` +fi + +# write dotfiles +for dotfile in $(ls .);do + [ "./$dotfile" == "$0" ] && continue + cp -fr --remove-destination $dotfile $HOME/.$dotfile +done + +#vim vundle +cd $HOME/.vim +mkdir bundle +mkdir backup +[ -d bundle/vundle ] || \ + git clone https://github.com/gmarik/vundle.git bundle/vundle +cd - + +vim "+:BundleInstall" "+:qall" + +#oh-my-zsh +chsh -s `which zsh` +[ -d ~/.oh-my-zsh ] || \ + git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh diff --git a/infest/profiles/makefu/vim b/infest/profiles/makefu/vim new file mode 160000 index 00000000..6880b76d --- /dev/null +++ b/infest/profiles/makefu/vim @@ -0,0 +1 @@ +Subproject commit 6880b76d9f79c57648df32b5cb3ce7d8e966d2b4 diff --git a/infest/profiles/makefu/vimrc b/infest/profiles/makefu/vimrc new file mode 120000 index 00000000..3f2626c5 --- /dev/null +++ b/infest/profiles/makefu/vimrc @@ -0,0 +1 @@ +.vim/vimrc \ No newline at end of file diff --git a/infest/profiles/makefu/zshrc b/infest/profiles/makefu/zshrc new file mode 100644 index 00000000..46a02e47 --- /dev/null +++ b/infest/profiles/makefu/zshrc @@ -0,0 +1,58 @@ +#custom stuff +export PATH=$PATH:/krebs/bin:$HOME/bin + +# Path to your oh-my-zsh configuration. +export ZSH=$HOME/.oh-my-zsh + +# Set to the name theme to load. +# Look in ~/.oh-my-zsh/themes/ +export ZSH_THEME="gallifrey" +#export ZSH_THEME="fishy" + +# Set to this to use case-sensitive completion +# export CASE_SENSITIVE="true" + +# Comment this out to disable weekly auto-update checks +# export DISABLE_AUTO_UPDATE="true" + +# Uncomment following line if you want to disable colors in ls +# export DISABLE_LS_COLORS="true" + +# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) +# Example format: plugins=(rails git textmate ruby lighthouse) +plugins=(git ssh-agent) +source $ZSH/oh-my-zsh.sh +source ~/.bash_alias +# Customize to your needs... +HISTFILE=~/.histfile +HISTSIZE=900000 +SAVEHIST=900000 +#PS1='[%n@%m %~]$ ' +export EDITOR=vim +#export JAVA_HOME=/usr/lib/jvm/java-6-openjdk +export JAVA_HOME=/opt/java/jre +GREP_COLOR="1;33" +alias ls='ls --color=auto' +alias grep='grep --color=auto' + +export MANPATH=$MANPATH:/home/makefu/man + +if [ -f "$HOME/.dircolors" ] ; then + eval `dircolors -b "$HOME/.dircolors"` + export LS_COLORS +fi + +# node.js +export PATH=$HOME/local/node/bin:$PATH + +fortune -a +echo "--" +#test -r ~/EVENTS && cat ~/EVENTS +task +echo "--" +#test -r ~/TODO && cat ~/TODO + +test -r ~/Dropbox/shared_shell && source ~/Dropbox/shared_shell +setopt menu_complete +unsetopt correct_all +export PATH=$PATH:/home/makefu/CodeSourcery/Sourcery_G++_Lite/bin -- cgit v1.2.3 From c8307de7fc0565022a0a58ea417bb79ee3993b11 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 29 Nov 2011 17:35:29 +0100 Subject: //infest/profile: add punani installer --- infest/profiles/README | 5 ++--- infest/profiles/makefu/bootstrap.sh | 37 +++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 15 deletions(-) (limited to 'infest') diff --git a/infest/profiles/README b/infest/profiles/README index cab5fd93..79dde1a4 100644 --- a/infest/profiles/README +++ b/infest/profiles/README @@ -1,9 +1,8 @@ Install different profiles for a user on the system UseCase: -./load-profile bob - [if necessary, check out the bob submodule] +./deploy-profile bob [write dotfiles of profile bob for logged-in users ~] -./load-profile system +./deploy-profile system [write krebs additions to /etc and /root] diff --git a/infest/profiles/makefu/bootstrap.sh b/infest/profiles/makefu/bootstrap.sh index e4bad93e..1c4f6506 100755 --- a/infest/profiles/makefu/bootstrap.sh +++ b/infest/profiles/makefu/bootstrap.sh @@ -1,12 +1,13 @@ #!/bin/sh -set -xeuf - +set -euf cd $(readlink -f $(dirname $0)) +echo "* Using punani to install git vim and zsh" +../../../punani/bin/punani install git vim zsh # Backing up false positives if [ -e $HOME/.vim ] ; then - echo "Backing up old vim folder" - mv $HOME/.vim $HOME/.vim.`date +%Y%M%d` + echo "* Backing up old vim folder" + mv -v $HOME/.vim $HOME/.vim.`date +%Y%M%d` fi # write dotfiles @@ -15,17 +16,29 @@ for dotfile in $(ls .);do cp -fr --remove-destination $dotfile $HOME/.$dotfile done -#vim vundle +#install all the vim stuff with the help of vundle cd $HOME/.vim mkdir bundle mkdir backup -[ -d bundle/vundle ] || \ - git clone https://github.com/gmarik/vundle.git bundle/vundle +echo "* Fetching vim-vundle" +git clone https://github.com/gmarik/vundle.git bundle/vundle &>/dev/null && echo "Vim Vundle deployed" +echo "* Installing Vundle Bundles" +vim "+:BundleInstall" "+:qall" cd - -vim "+:BundleInstall" "+:qall" -#oh-my-zsh -chsh -s `which zsh` -[ -d ~/.oh-my-zsh ] || \ - git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh +if which zsh &>/dev/null ; then + if [ "x$SHELL" != "x`which zsh`" ] ;then + echo "* setting zsh as new shell,please enter your user password" + chsh -s `which zsh` + else + echo "* zsh already set as default shell" + fi + if [ -d ~/.oh-my-zsh ] ; then + git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh &> /dev/null && echo "oh-my-zsh deployed" + else + echo "* oh-my-zsh already installed" + fi +else + echo "* cannot find zsh :(" +fi -- cgit v1.2.3 From a9842e8442ac8a1a011620d9dd914ce2c25d4346 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 29 Nov 2011 17:54:41 +0100 Subject: //infest/profiles: add vim folder --- infest/profiles/makefu/vim | 1 - infest/profiles/makefu/vim/vimrc | 105 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 1 deletion(-) delete mode 160000 infest/profiles/makefu/vim create mode 100755 infest/profiles/makefu/vim/vimrc (limited to 'infest') diff --git a/infest/profiles/makefu/vim b/infest/profiles/makefu/vim deleted file mode 160000 index 6880b76d..00000000 --- a/infest/profiles/makefu/vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6880b76d9f79c57648df32b5cb3ce7d8e966d2b4 diff --git a/infest/profiles/makefu/vim/vimrc b/infest/profiles/makefu/vim/vimrc new file mode 100755 index 00000000..69ff3f58 --- /dev/null +++ b/infest/profiles/makefu/vim/vimrc @@ -0,0 +1,105 @@ +" not so original .vimrc +" 2011-11-29 +" +" Vundle +set nocompatible +filetype off +set rtp+=~/.vim/bundle/vundle +call vundle#rc() + +Bundle 'gmarik/vundle' +Bundle 'SudoEdit.vim' +Bundle 'snipMate' +Bundle 'tpope/vim-fugitive' +Bundle 'pyflakes' + +filetype plugin indent on + +" +set vb +let g:snips_author = 'Bob Ross ' +let g:makefu_author = 'makefu' + +""" just for tex + +let g:compiler_gcc_ignore_unmatched_lines=1 " ignore for gcc and SCONS +" compiler gcc +set foldenable +set foldmethod=syntax +" shows matching braches etc +set showmatch +set matchtime=3 +" highlight search +set hlsearch + +let g:load_doxygen_syntax=1 + +" we do not want any filename~ files +" set noswapfile +" set nobackup +set backupdir=~/.vim/backup +set directory=~/.vim/backup + +" turn off F1 +" +inoremap +nnoremap +vnoremap + +" save on focus lost +au FocusLost * :wa + +"let TlistAddFilesRecursive = /home/makefu/repos/P2P_MDS " *.cpp *.hpp +let Tlist_Exit_OnlyWindow =1 " exit if other window is closed +nnoremap :TlistToggle +set spelllang=en +" use set spell to enable spelling + +" press ttt to rot16 the whole file +nmap ttt ggg?G + +colorscheme darkblue +set background=dark + +set number +set mouse= +set textwidth=9001 +set ignorecase +set incsearch +set wildignore=*.o,*.obj,*.bak,*.exe,*.os +set shiftwidth=2 + +syntax on +"For tabstop = 2 spaces + +set tabstop=2 +set et +set sw=2 +set smarttab +set autoindent +" end tabstop + + +set backspace=indent,eol,start +set nocp + + +" python stuff +" run python code with f5 +"autocmd FileType python map :w:!python "%" +" pydiction +"let g:pydiction_location = '~/.vim/plugin/pydiction/complete-dict' + +" automatically open and close the popup menu / preview window +au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif +set completeopt=menuone,menu,longest,preview + +" somewhere before nowrap is set +set wrap + +autocmd BufRead *.json set filetype=json +autocmd FileType json set equalprg=json_reformat +autocmd FileType json set makeprg=jsonval\ % +autocmd FileType json set errorformat=%E%f:\ %m\ at\ line\ %l,%-G%.%# + +au BufNewFile,BufRead *.mustache set syntax=mustache -- cgit v1.2.3 From e4b856a32c4df2ab205491b2d3a4b0810631d181 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 29 Nov 2011 18:11:15 +0100 Subject: //infest/profile: add dircolors --- infest/profiles/makefu/dircolors | 194 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 infest/profiles/makefu/dircolors (limited to 'infest') diff --git a/infest/profiles/makefu/dircolors b/infest/profiles/makefu/dircolors new file mode 100644 index 00000000..1de435ac --- /dev/null +++ b/infest/profiles/makefu/dircolors @@ -0,0 +1,194 @@ +# Configuration file for dircolors, a utility to help you set the +# LS_COLORS environment variable used by GNU ls with the --color option. +# Copyright (C) 1996, 1999-2010 Free Software Foundation, Inc. +# Copying and distribution of this file, with or without modification, +# are permitted provided the copyright notice and this notice are preserved. +# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the +# slackware version of dircolors) are recognized but ignored. +# Below, there should be one TERM entry for each termtype that is colorizable +TERM Eterm +TERM ansi +TERM color-xterm +TERM con132x25 +TERM con132x30 +TERM con132x43 +TERM con132x60 +TERM con80x25 +TERM con80x28 +TERM con80x30 +TERM con80x43 +TERM con80x50 +TERM con80x60 +TERM cons25 +TERM console +TERM cygwin +TERM dtterm +TERM eterm-color +TERM gnome +TERM gnome-256color +TERM jfbterm +TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mach-color +TERM mlterm +TERM putty +TERM rxvt +TERM rxvt-256color +TERM rxvt-cygwin +TERM rxvt-cygwin-native +TERM rxvt-unicode +TERM rxvt-unicode256 +TERM screen +TERM screen-256color +TERM screen-256color-bce +TERM screen-bce +TERM screen-w +TERM screen.linux +TERM vt100 +TERM xterm +TERM xterm-16color +TERM xterm-256color +TERM xterm-88color +TERM xterm-color +TERM xterm-debian +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +#NORMAL 00 # no color code at all +#FILE 00 # regular file: use no color at all +RESET 0 # reset to "normal" color +DIR 01;36 # directory +LINK 01;36 # symbolic link. (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +MULTIHARDLINK 00 # regular file with more than one link +FIFO 40;33 # pipe +SOCK 01;35 # socket +DOOR 01;35 # door +BLK 40;33;01 # block device driver +CHR 40;33;01 # character device driver +ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file +SETUID 37;41 # file that is setuid (u+s) +SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability +STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky +STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable +# This is for files with execute permission: +EXEC 01;32 +# List any file extensions like '.gz' or '.tar' that you would like ls +# to colorize below. Put the extension, a space, and the color init string. +# (and any comments you want to add after a '#') +# If you use DOS-style suffixes, you may want to uncomment the following: +#.cmd 01;32 # executables (bright green) +#.exe 01;32 +#.com 01;32 +#.btm 01;32 +#.bat 01;32 +# Or if you want to colorize scripts even if they do not have the +# executable bit actually set. +#.sh 01;32 +#.csh 01;32 + # archives or compressed (bright red) +.tar 01;31 +.tgz 01;31 +.arj 01;31 +.taz 01;31 +.lzh 01;31 +.lzma 01;31 +.tlz 01;31 +.txz 01;31 +.zip 01;31 +.z 01;31 +.Z 01;31 +.dz 01;31 +.gz 01;31 +.lz 01;31 +.xz 01;31 +.bz2 01;31 +.bz 01;31 +.tbz 01;31 +.tbz2 01;31 +.tz 01;31 +.deb 01;31 +.rpm 01;31 +.jar 01;31 +.rar 01;31 +.ace 01;31 +.zoo 01;31 +.cpio 01;31 +.7z 01;31 +.rz 01;31 +# image formats +.jpg 01;35 +.jpeg 01;35 +.gif 01;35 +.bmp 01;35 +.pbm 01;35 +.pgm 01;35 +.ppm 01;35 +.tga 01;35 +.xbm 01;35 +.xpm 01;35 +.tif 01;35 +.tiff 01;35 +.png 01;35 +.svg 01;35 +.svgz 01;35 +.mng 01;35 +.pcx 01;35 +.mov 01;35 +.mpg 01;35 +.mpeg 01;35 +.m2v 01;35 +.mkv 01;35 +.ogm 01;35 +.mp4 01;35 +.m4v 01;35 +.mp4v 01;35 +.vob 01;35 +.qt 01;35 +.nuv 01;35 +.wmv 01;35 +.asf 01;35 +.rm 01;35 +.rmvb 01;35 +.flc 01;35 +.avi 01;35 +.fli 01;35 +.flv 01;35 +.gl 01;35 +.dl 01;35 +.xcf 01;35 +.xwd 01;35 +.yuv 01;35 +.cgm 01;35 +.emf 01;35 +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axv 01;35 +.anx 01;35 +.ogv 01;35 +.ogx 01;35 +# audio formats +.aac 00;36 +.au 00;36 +.flac 00;36 +.mid 00;36 +.midi 00;36 +.mka 00;36 +.mp3 00;36 +.mpc 00;36 +.ogg 00;36 +.ra 00;36 +.wav 00;36 +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axa 00;36 +.oga 00;36 +.spx 00;36 +.xspf 00;36 -- cgit v1.2.3 From 6f03367789a96473558fd7dc943907a9ab3aae08 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Tue, 29 Nov 2011 18:24:58 +0100 Subject: //infest: clean up zshrc --- infest/profiles/makefu/bootstrap.sh | 8 ++++---- infest/profiles/makefu/zshrc | 40 ++++++++++++------------------------- 2 files changed, 17 insertions(+), 31 deletions(-) (limited to 'infest') diff --git a/infest/profiles/makefu/bootstrap.sh b/infest/profiles/makefu/bootstrap.sh index 1c4f6506..67122d0d 100755 --- a/infest/profiles/makefu/bootstrap.sh +++ b/infest/profiles/makefu/bootstrap.sh @@ -12,7 +12,7 @@ fi # write dotfiles for dotfile in $(ls .);do - [ "./$dotfile" == "$0" ] && continue + [ "x./${dotfile}" = "x$0" ] && continue cp -fr --remove-destination $dotfile $HOME/.$dotfile done @@ -21,7 +21,7 @@ cd $HOME/.vim mkdir bundle mkdir backup echo "* Fetching vim-vundle" -git clone https://github.com/gmarik/vundle.git bundle/vundle &>/dev/null && echo "Vim Vundle deployed" +git clone https://github.com/gmarik/vundle.git bundle/vundle > /dev/null && echo "Vim Vundle deployed" echo "* Installing Vundle Bundles" vim "+:BundleInstall" "+:qall" cd - @@ -34,8 +34,8 @@ if which zsh &>/dev/null ; then else echo "* zsh already set as default shell" fi - if [ -d ~/.oh-my-zsh ] ; then - git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh &> /dev/null && echo "oh-my-zsh deployed" + if [ ! -d ~/.oh-my-zsh ] ; then + git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh > /dev/null && echo "oh-my-zsh deployed" else echo "* oh-my-zsh already installed" fi diff --git a/infest/profiles/makefu/zshrc b/infest/profiles/makefu/zshrc index 46a02e47..a60313e5 100644 --- a/infest/profiles/makefu/zshrc +++ b/infest/profiles/makefu/zshrc @@ -1,58 +1,44 @@ -#custom stuff -export PATH=$PATH:/krebs/bin:$HOME/bin # Path to your oh-my-zsh configuration. export ZSH=$HOME/.oh-my-zsh -# Set to the name theme to load. # Look in ~/.oh-my-zsh/themes/ export ZSH_THEME="gallifrey" -#export ZSH_THEME="fishy" - -# Set to this to use case-sensitive completion -# export CASE_SENSITIVE="true" # Comment this out to disable weekly auto-update checks -# export DISABLE_AUTO_UPDATE="true" +export DISABLE_AUTO_UPDATE="true" -# Uncomment following line if you want to disable colors in ls # export DISABLE_LS_COLORS="true" -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Example format: plugins=(rails git textmate ruby lighthouse) plugins=(git ssh-agent) source $ZSH/oh-my-zsh.sh -source ~/.bash_alias +test -e $HOME/.bash_alias && source $HOME/.bash_alias + # Customize to your needs... +export PATH=$PATH:/krebs/bin:$HOME/bin HISTFILE=~/.histfile -HISTSIZE=900000 -SAVEHIST=900000 -#PS1='[%n@%m %~]$ ' +HISTSIZE=900001 +SAVEHIST=900001 + export EDITOR=vim -#export JAVA_HOME=/usr/lib/jvm/java-6-openjdk + export JAVA_HOME=/opt/java/jre + GREP_COLOR="1;33" -alias ls='ls --color=auto' alias grep='grep --color=auto' -export MANPATH=$MANPATH:/home/makefu/man +export MANPATH=$MANPATH:$HOME/man if [ -f "$HOME/.dircolors" ] ; then eval `dircolors -b "$HOME/.dircolors"` export LS_COLORS fi -# node.js -export PATH=$HOME/local/node/bin:$PATH - -fortune -a -echo "--" -#test -r ~/EVENTS && cat ~/EVENTS -task +which fortune >/dev/null && fortune -a +which task >/dev/null && task echo "--" -#test -r ~/TODO && cat ~/TODO +test -r ~/TODO && cat ~/TODO test -r ~/Dropbox/shared_shell && source ~/Dropbox/shared_shell setopt menu_complete unsetopt correct_all -export PATH=$PATH:/home/makefu/CodeSourcery/Sourcery_G++_Lite/bin -- cgit v1.2.3