diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| l--------- | Reaktor/commands/visit-page | 1 | ||||
| m--------- | Reaktor/repos/view-website | 0 | ||||
| m--------- | Reaktor/repos/whatweb | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py | 4 | ||||
| -rw-r--r-- | ship/lib/_punani_db | 1 | ||||
| -rw-r--r-- | ship/lib/vim | 1 | ||||
| -rwxr-xr-x | ship/src/bootstrap_env_makefu | 27 |
8 files changed, 31 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index 336b225d..23652084 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,6 +25,9 @@ [submodule "Reaktor/repos/whatweb"] path = Reaktor/repos/whatweb url = https://github.com/urbanadventurer/WhatWeb.git +[submodule "Reaktor/repos/view-website"] + path = Reaktor/repos/view-website + url = https://github.com/makefu/view-website.git [submodule "minikrebs"] path = Cancer/minikrebs url = https://github.com/krebscode/minikrebs.git diff --git a/Reaktor/commands/visit-page b/Reaktor/commands/visit-page new file mode 120000 index 00000000..8723336b --- /dev/null +++ b/Reaktor/commands/visit-page @@ -0,0 +1 @@ +../repos/view-website/runner.sh
\ No newline at end of file diff --git a/Reaktor/repos/view-website b/Reaktor/repos/view-website new file mode 160000 +Subproject 5b9a22cf872a9855b7cb5eddd7bf962dfbff50d diff --git a/Reaktor/repos/whatweb b/Reaktor/repos/whatweb -Subproject 0918a0d9b75df77f9c3e9eb360b6b22824582a2 +Subproject f35d0265c04605dbddec5ea9af418ebd796eef6 diff --git a/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py b/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py index 7bb79708..7e1f4dae 100755 --- a/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py +++ b/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 def find_potential_super(path="/etc/tinc/retiolum/hosts"): import os @@ -56,4 +56,4 @@ if __name__ == "__main__": usage """ for host,addrs in check_all_the_super(): - print(host,addrs) + print("%s %s" %(host,str(addrs))) diff --git a/ship/lib/_punani_db b/ship/lib/_punani_db index 609baf07..e5bf15b1 100644 --- a/ship/lib/_punani_db +++ b/ship/lib/_punani_db @@ -54,3 +54,4 @@ _punanidb_aptget_nano=nano _punanidb_pacman_vim=vim _punanidb_yum_vim=vim-enhanced _punanidb_aptget_vim=vim + diff --git a/ship/lib/vim b/ship/lib/vim index 43173585..f75f3d0e 100644 --- a/ship/lib/vim +++ b/ship/lib/vim @@ -22,6 +22,7 @@ inoremap <F1> <ESC> nnoremap <F1> <ESC> vnoremap <F1> <ESC> set wildignore=*.o,*.obj,*.bak,*.exe,*.os +cmap w!! w !sudo tee > /dev/null % colorscheme darkblue set background=dark set number diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu index 44148665..6c75cd57 100755 --- a/ship/src/bootstrap_env_makefu +++ b/ship/src/bootstrap_env_makefu @@ -5,12 +5,23 @@ #@include core #@include punani #@include vim + +# vim +python +_punanidb_pacman_vim_python=gvim +_punanidb_yum_vim_python=vim-enhanced +_punanidb_aptget_vim_python=vim + +# TODO pull out youcompleteme into a vim function +# cmake ,make,g++,python-dev for youcompleteme +_punanidb_pacman_cmake=cmake +_punanidb_yum_cmake=cmake +_punanidb_aptget_cmake=cmake #@mainifyme info "Configuring environment for $(id -un)" cd $(readlink -f $(dirname $0)) info "Using punani to install git vim and zsh" -punani install git vim zsh || error "cannot install some shit" +punani install git vim_python zsh gpp cmake make python2_dev || die "cannot install some shit" info "writing dotfiles" # deploying zshrc @@ -100,19 +111,27 @@ set spelllang=en set textwidth=9001 autocmd BufRead *.json set filetype=json EOF - +if [ -e $HOME/.vimrc ] ; then + oldvim=$HOME/.vimrc.`date +%Y%M%d` + info "Backing up old vimrc file to $oldvim" + mv -v $HOME/.vimrc $oldvim +fi +info "Symlinking .vimrc to .vim/vimrc" ln -vs $HOME/.vim/vimrc $HOME/.vimrc vim_conf_sane_defaults #install all the vim stuff with the help of vundle cd $HOME/.vim -mkdir bundle -mkdir backup +mkdir -p bundle info "Fetching vim-vundle" git clone https://github.com/gmarik/vundle.git bundle/vundle > /dev/null && \ info "Vim Vundle deployed" info "Installing Vundle Bundles" vim "+:BundleInstall" "+:qall" + +info "building youcompleteme libs" +cd $HOME/.vim/bundle/YouCompleteMe +./install.sh cd - info "configuring zsh" |