Removed synapse from desktop.txt. Fixed <BS> in insert mode in vimrc. Fixed sync.sh flags for the last time! (hopefully)
This commit is contained in:
parent
b045f98e6a
commit
cdc43ca60f
@ -1,6 +1,7 @@
|
|||||||
#sudo apt-get update;sudo apt-get upgrade;sudo apt-get install $(grep -vE "^\s*#" apps.txt | tr "\n" " ")
|
#sudo apt-get update;sudo apt-get upgrade;sudo apt-get install $(grep -vE "^\s*#" apps.txt | tr "\n" " ")
|
||||||
#apt-get remove ubuntuone* python3-oneconf
|
#apt-get remove ubuntuone* python3-oneconf
|
||||||
synapse
|
#Synapse removed because deb is not present in current repos :(
|
||||||
|
#synapse
|
||||||
synaptic
|
synaptic
|
||||||
#python3.2
|
#python3.2
|
||||||
python-pip
|
python-pip
|
||||||
|
99
sync.sh
99
sync.sh
@ -1,87 +1,50 @@
|
|||||||
#Install server applications
|
|
||||||
while getopts :s option
|
|
||||||
do
|
|
||||||
case "$option" in
|
|
||||||
s)
|
|
||||||
echo "Preparing server installation"
|
|
||||||
sudo apt-get update;sudo apt-get upgrade;sudo apt-get install $(grep -vE "^\s*#" server.txt | tr "\n" " ")
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
#Install desktop applications
|
|
||||||
while getopts :d option
|
|
||||||
do
|
|
||||||
case "$option" in
|
|
||||||
d)
|
|
||||||
echo "Installing desktop applications"
|
|
||||||
sudo apt-get update;sudo apt-get upgrade;sudo apt-get install $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
#Tmux sync
|
|
||||||
while getopts :t option
|
|
||||||
do
|
|
||||||
case "$option" in
|
|
||||||
t)
|
|
||||||
echo "Syncing tmux"
|
|
||||||
trash ~/.tmux.conf
|
|
||||||
ln -s ${PWD}/tmux.conf ~/.tmux.conf
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
#Quit if -o is called
|
|
||||||
while getopts :o option
|
|
||||||
do
|
|
||||||
case "$option" in
|
|
||||||
o)
|
|
||||||
echo "Exiting"
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.gitignore_global ~/.bashrc
|
rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.gitignore_global ~/.bashrc
|
||||||
ln -s ${PWD}/gitignore_global ~/.gitignore_global
|
ln -s ${PWD}/gitignore_global ~/.gitignore_global
|
||||||
ln -s ${PWD}/vimrc ~/.vimrc
|
ln -s ${PWD}/vimrc ~/.vimrc
|
||||||
ln -s ${PWD}/vimperatorrc ~/.vimperatorrc
|
ln -s ${PWD}/vimperatorrc ~/.vimperatorrc
|
||||||
ln -s ${PWD}/gitconfig ~/.gitconfig
|
ln -s ${PWD}/gitconfig ~/.gitconfig
|
||||||
ln -s ${PWD}/bashrc ~/.bashrc
|
ln -s ${PWD}/bashrc ~/.bashrc
|
||||||
if [ -f ~/.vim/plugin/ ]
|
while getopts ":bsdto" VALUE "$@"; do
|
||||||
then
|
echo "Processing flag: $VALUE"
|
||||||
echo "Installing plugin folder in ~/.vim/"
|
if [ "$VALUE" = "b" ] ; then
|
||||||
|
#Install vim bundles
|
||||||
mkdir -p ~/.vim/plugin/
|
mkdir -p ~/.vim/plugin/
|
||||||
fi
|
|
||||||
if [ -f ~/.vim/plugin/backup/ ]
|
|
||||||
then
|
|
||||||
echo "Installing backup folder in ~/.vim/"
|
|
||||||
mkdir -p ~/.vim/backup/
|
mkdir -p ~/.vim/backup/
|
||||||
fi
|
|
||||||
if [ -f ~/.vim/plugin/undo/ ]
|
|
||||||
then
|
|
||||||
echo "Installing undo folder in ~/.vim/"
|
|
||||||
mkdir -p ~/.vim/undo/
|
mkdir -p ~/.vim/undo/
|
||||||
fi
|
|
||||||
if [ -f ~/.vim/tmp/ ]
|
|
||||||
then
|
|
||||||
echo "Installing tmp folder in ~/.vim/"
|
|
||||||
mkdir -p ~/.vim/tmp/
|
mkdir -p ~/.vim/tmp/
|
||||||
fi
|
mkdir -p ~/.vim/bundle/
|
||||||
if [ ! -f ~/.vim/plugin/sessionman.vim ]
|
mkdir -p ~/.vim/bundle/
|
||||||
then
|
echo "Installing vim bundles"
|
||||||
|
if [ ! -f ~/.vim/plugin/sessionman.vim ]
|
||||||
|
then
|
||||||
echo "Installing sessionman in ~/.vim/plugin/"
|
echo "Installing sessionman in ~/.vim/plugin/"
|
||||||
wget -O ~/.vim/plugin/sessionman.vim http://www.vim.org/scripts/download_script.php?src_id=15599
|
wget -O ~/.vim/plugin/sessionman.vim http://www.vim.org/scripts/download_script.php?src_id=15599
|
||||||
fi
|
fi
|
||||||
#Install vim bundles
|
if [ ! -d ~/.vim/bundle/vundle/ ]
|
||||||
while getopts :b option
|
|
||||||
do
|
|
||||||
case "$option" in
|
|
||||||
b)
|
|
||||||
if [ -f ~/.vim/bundle/vundle/ ]
|
|
||||||
then
|
then
|
||||||
echo "Installing vundle"
|
echo "Installing vundle"
|
||||||
git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
|
git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
|
||||||
fi
|
fi
|
||||||
vim +BundleInstall +qa
|
vim +BundleInstall +qa
|
||||||
;;
|
fi
|
||||||
esac
|
if [ "$VALUE" = "s" ] ; then
|
||||||
|
echo "Installing server applications:"
|
||||||
|
echo $(grep -vE "^\s*#" server.txt | tr "\n" " ")
|
||||||
|
sudo apt-get update;sudo apt-get upgrade;sudo apt-get install $(grep -vE "^\s*#" server.txt | tr "\n" " ")
|
||||||
|
fi
|
||||||
|
if [ "$VALUE" = "d" ] ; then
|
||||||
|
echo "Installing desktop applications"
|
||||||
|
echo $(grep -vE "^\s*#" desktop | tr "\n" " ")
|
||||||
|
sudo apt-get update;sudo apt-get upgrade;sudo apt-get install $(grep -vE "^\s*#" desktop.txt | tr "\n" " ")
|
||||||
|
fi
|
||||||
|
if [ "$VALUE" = "t" ] ; then
|
||||||
|
echo "Syncing tmux"
|
||||||
|
trash ~/.tmux.conf
|
||||||
|
ln -s ${PWD}/tmux.conf ~/.tmux.conf
|
||||||
|
fi
|
||||||
|
if [ "$VALUE" = "o" ] ; then
|
||||||
|
echo "Exiting because of -o flag"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
echo "Done syncing"
|
echo "Done syncing"
|
||||||
|
2
vimrc
2
vimrc
@ -151,7 +151,7 @@ let g:neocomplcache_force_overwrite_completefunc=1
|
|||||||
let g:neocomplcache_min_syntax_length = 2
|
let g:neocomplcache_min_syntax_length = 2
|
||||||
|
|
||||||
let g:php_refactor_command='php /usr/local/bin/refactor.phar'
|
let g:php_refactor_command='php /usr/local/bin/refactor.phar'
|
||||||
inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
|
"inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
|
||||||
"let g:neocomplcache_enable_auto_select = 1
|
"let g:neocomplcache_enable_auto_select = 1
|
||||||
let loaded_matchit = 1
|
let loaded_matchit = 1
|
||||||
set nocompatible " be iMproved
|
set nocompatible " be iMproved
|
||||||
|
Loading…
Reference in New Issue
Block a user