diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/dotfiles/screenrc b/dotfiles/screenrc deleted file mode 100644 index 44ccc86..0000000 --- a/dotfiles/screenrc +++ /dev/null @@ -1,20 +0,0 @@ -startup_message off -#defflow on # will force screen to process ^S/^Q -defflow off -autodetach on -defscrollback 50000 -vbell off -nethack on -#vbell_msg " Wuff ---- Wuff!! " -#hardstatus alwayslastline "\033[1m\033[43;30m[%c:%s %a] %w \033[m" -hardstatus alwayslastline "%{rk}%H %{gk}%c:%s %{yk}%M%d %{wk}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%?" -shell -$SHELL - -shelltitle '$ |bash' -msgwait 1 -#bindkey -k k1 prev -#bindkey -k k2 next -#bindkey -k k4 command -#escape "^Qq" - -screen diff --git a/dotfiles/sneak-bashrc b/dotfiles/sneak-bashrc deleted file mode 100644 index a34d20b..0000000 --- a/dotfiles/sneak-bashrc +++ /dev/null @@ -1,77 +0,0 @@ -export PATH="${HOME}/Documents/HomeBrew/bin/:${PATH}" -export PATH="${HOME}/Documents/HomeBrew/sbin/:${PATH}" -export PATH+=":${HOME}/.local/bin" -export PATH+=":${HOME}/.local/sbin" -export PATH+=":." - -#export MACOSX_DEPLOYMENT_TARGET=10.5 -export TZ="Europe/Berlin" -export EDITOR="mvim" -export VISUAL="${EDITOR}" -export HISTSIZE=10000000 -export HISTCONTROL=ignoredups:erasedups -export ARCHFLAGS="-arch x86_64" -export PERL5LIB="${HOME}/Library/Perl/site_perl" -#export TMOUT=300 -export CLICOLOR=1 -export PAGER="vimpager" -alias less="$PAGER" - -export BACKUPDEST=sneak@txl1.local:backup/ - -#export ZMQD_DEBUG=1 - -ulimit -n 9999 - -alias mysql="mysql -u root" -alias bc="bc -l" -alias dv="ssh -t sneak@datavibe.net 'screen -UDR'" -alias jfk1="ssh -t -D 9999 -L 8112:127.0.0.1:8112 jfk1.datavibe.net 'screen -UDR'" -alias sat1="ssh -t -L 1111:127.0.0.1:8333 sat1.datavibe.net 'screen -UDR'" -alias txl1="ssh -t txl1 'screen -UDR'" -alias altivex="ssh -t altivex.net 'screen -UDR'" -alias openwrt="ssh -4 root@10.112.128.254" -alias puppet="v v11pm001" -alias 313n='ssh -t ec2-user@50.16.242.103 "sudo screen -DR"' -alias randbytes="dd if=/dev/urandom bs=1k count=1 | hexdump -C" -alias backup="cd ${HOME} && make backup" -alias mysql.start="${HOME}/local/mysql-5.5.12-osx10.6-x86_64/support-files/mysql.server start" -alias mysql.stop="${HOME}/local/mysql-5.5.12-osx10.6-x86_64/support-files/mysql.server stop" -alias tidy="tidy -config \"${HOME}/.tidyrc\"" -alias showflactags="metaflac --export-tags-to=-" -alias enflac="flac -V --delete-input-file -8" -alias flacify="flac --best --delete-input-file" -alias asnfor="whois -h whois.cymru.com" -alias traceroute="traceroute -q 1" -alias vi="${EDITOR}" -alias vim="${EDITOR}" - -function v() { - H="$1" - shift - ssh -A root@${H}.xvcom.net -t 'screen -UDR' -} - -function vns() { - H="$1" - shift - ssh -A root@${H}.xvcom.net -t "$@" -} - - -# superceded by /System/Library/LaunchAgents/org.openbsd.ssh-agent.plist -# removed 20111025 sneak -#test -e ~/.ssh-agent && . ~/.ssh-agent -#AGENTRUNNING=`ps $SSH_AGENT_PID | grep ssh-agent | wc -l` -#if [ -z "$SSH_AGENT_PID" ]; then -# AGENTRUNNING=0 -#fi -#if [ $AGENTRUNNING -eq 0 ]; then -# ssh-agent | egrep -v ^echo > ~/.ssh-agent -# . ~/.ssh-agent -# ssh-add -#fi -ADDED="`ssh-add -L | grep pOICM74LrrR9v7DZrRDXFSTql4oWJvPwm2p | wc -l`" -if [ "$ADDED" -ne 1 ]; then - ssh-add -fi diff --git a/dotfiles/vimrc b/dotfiles/vimrc deleted file mode 100644 index fe88378..0000000 --- a/dotfiles/vimrc +++ /dev/null @@ -1,106 +0,0 @@ -syntax on -noremap "" -noremap! -noremap "" -noremap! -noremap "" -noremap! -noremap "" -noremap! - -" then define two autocommands -"au InsertEnter * hi StatusLine term=reverse guibg=#005000 -"au InsertLeave * hi StatusLine term=reverse guibg=#444444 -set number -set tw=79 -set encoding=utf-8 -setglobal fileencoding=utf-8 -set nobomb -set termencoding=utf-8 -set fileencodings=utf-8,iso-8859-15 -set backspace=indent,eol,start -set guifont=Monaco:h16 -set modeline -"set statusline=%F%m%r%h%w\ [\%03.3b]\ [\%02.2B]\ [l%l,c%v][%p%%]\ [%L] - -set laststatus=2 - -set tabstop=4 -set shiftwidth=4 -set softtabstop=4 -set autoindent -set smarttab -set expandtab -autocmd FileType make setlocal noexpandtab - -let Tlist_Inc_Winwidth = 0 - -if has("autocmd") - au BufReadPost * if &modifiable | retab | endif -endif - -set showcmd -set nocompatible - -" Enable mouse support in console -set mouse=a - -set ignorecase -set smartcase -inoremap jj -"set incsearch -"set hlsearch - -map N Nzz -map n nzz - -" map _t :TlistToggle - -colorscheme koehler -"set cul -"hi CursorLine term=none cterm=none ctermbg=none -"set t_Co=256 - - -" folding setup -set foldmethod=indent -"set foldnestmax=10 "deepest fold is 10 levels -set foldminlines=3 -"set nofoldenable "dont fold by default -"set foldlevel=1 "this is just what i use -nnoremap @=(foldlevel('.')?'za':'l') -vnoremap zf -"au BufWinLeave * mkview -"au BufWinEnter * silent loadview - - -if has('statusline') - " Status line detail: - " %f file path - " %y file type between braces (if defined) - " %([%R%M]%) read-only, modified and modifiable flags between braces - " %{'!'[&ff=='default_file_format']} - " shows a '!' if the file format is not the platform - " default - " %{'$'[!&list]} shows a '*' if in list mode - " %{'~'[&pm=='']} shows a '~' if in patchmode - " (%{synIDattr(synID(line('.'),col('.'),0),'name')}) - " only for debug : display the current syntax item name - " %= right-align following items - " #%n buffer number - " %l/%L,%c%V line number, total number of lines, and column number - function SetStatusLineStyle() - if &stl == '' || &stl =~ 'synID' - let &stl="%f %y%([%R%M]%)%{'!'[&ff=='".&ff."']}%{'$'[!&list]}%{'~'[&pm=='']}%=#%n %l/%L,%c%V " - else - let &stl="%f %y%([%R%M]%)%{'!'[&ff=='".&ff."']}%{'$'[!&list]} (%{synIDattr(synID(line('.'),col('.'),0),'name')})%=#%n %l/%L,%c%V " - endif - endfunc - " Switch between the normal and vim-debug modes in the status line - nmap _ds :call SetStatusLineStyle() - call SetStatusLineStyle() - " Window title - if has('title') - set titlestring=%t%(\ [%R%M]%) - endif -endif diff --git a/homedir.makefile/Makefile b/homedir.makefile/Makefile new file mode 100644 index 0000000..4f719e2 --- /dev/null +++ b/homedir.makefile/Makefile @@ -0,0 +1,21 @@ +JUNKFILES = .bash_history .irb_history .pip .ScanSnap .nbems .fldigi .cpan +JUNKFILES += .gdb_history .mysql_history .sqlite_history + +default: backup + +backup: clean + @mbsync -X eeqjgmail + @mbsync -X acidhousegmail + -rsync -avPhz --delete sneak@datavibe.net:.maildir/ \ + $(HOME)/Documents/Secure/datavibe.maildir/ + @internalbackup.command # to 1tb + @externalbackup.command # to fw800 + +clean: + -rm -rfv ~/tmp/* + -rm -rfv ~/Library/Caches/* + -rm -rfv ~/.Trash/* + -rm -rfv $(JUNKFILES) + +size: + du -sh $(HOME) diff --git a/osxbackup/backup.command b/osxbackup/backup.command index 2f06052..1a4bd49 100755 --- a/osxbackup/backup.command +++ b/osxbackup/backup.command @@ -10,11 +10,11 @@ NOW="`date +%Y%m%d.%H%M%S`" BACKUPDEST=${BACKUPDEST:-"${USER}@jfk1.datavibe.net:backup/"} RSYNC="/usr/bin/rsync" -OPTS="-rlptDPSyz --no-owner --no-group --delete-excluded --delete" +OPTS="-rlptDPSyzh --no-owner --no-group --delete-excluded --delete" RE="" # Dropbox syncs itself just fine: -RE+=" --exclude=/Dropbox/" +RE+=" --exclude=/Documents/Dropbox/" RE+=" --exclude=/Desktop/" # desktop is like a visible tempdir. RE+=" --exclude=/Library/Safari/" RE+=" --exclude=/Downloads/" @@ -24,6 +24,7 @@ RE+=" --exclude=/Library/Application?Support/Evernote/" RE+=" --exclude=/Library/Application?Support/InsomniaX/" RE+=" --exclude=/Music/iTunes/Album?Artwork/" RE+=" --exclude=/Documents/Steam?Content/" +RE+=" --exclude=/.dropbox/" RE+=" --exclude=/.cpan/build/" RE+=" --exclude=/.cpan/sources/" RE+=" --exclude=/Library/Logs/" @@ -43,13 +44,11 @@ RE+=" --exclude=/Library/Safari/HistoryIndex.sk" RE+=" --exclude=/Library/Application?Support/CrossOver?Games/" RE+=" --exclude=/Library/Preferences/Macromedia/Flash?Player/" RE+=" --exclude=/Library/PubSub/" -# just say no to skynet -RE+=" --exclude=/Library/Google/" RE+=" --exclude=/Library/Cookies/" RE+=" --exclude=/Library/Preferences/SDMHelpData/" RE+=" --exclude=/Receivd/" RE+=" --exclude=/Library/Application?Support/Steam/SteamApps/" - +RE+=" --exclude=/VirtualBox?VMs/" MINRE="" MINRE+=" --exclude=/.fseventsd/" MINRE+=" --exclude=/.Spotlight-V100/" @@ -58,20 +57,10 @@ MINRE+=" --exclude=/.Trashes/" MINRE+=" --exclude=/tmp/" MINRE+=" --exclude=/.TemporaryItems/" MINRE+=" --exclude=/.rnd/" +MINRE+=" --exclude=.DS_Store" RE+=" ${MINRE}" -# before anything else, backup gpg keys if any: -if [ -d ${HOME}/.gnupg ]; then - $RSYNC $OPTS -c ${HOME}/.gnupg/ ${BACKUPDEST}/Home/.gnupg/ -fi - -# high priority stuff first: -if [ -d ${HOME}/Development ]; then - $RSYNC $OPTS -c ${HOME}/Development/ \ - ${BACKUPDEST}/Home/Development/ -fi - RETVAL=255 while [ $RETVAL -ne 0 ]; do $RSYNC $OPTS $RE ${HOME}/ ${BACKUPDEST}/Home/ @@ -92,7 +81,7 @@ if [ "${BACKUPDEST::16}" = "/Volumes/imac1tb" ]; then fi BASE="/Volumes/imac1tb/sneak.data" -for DIR in Movies Music Pictures ; do +for DIR in Movies Pictures ; do if [ -d "${BASE}/${DIR}/" ]; then RETVAL=255 while [ $RETVAL -ne 0 ]; do