From e41495d8d57dfc5260dbc0da56289d9967d068f9 Mon Sep 17 00:00:00 2001 From: Smirnov Sasha Date: Wed, 20 May 2020 00:47:31 +0300 Subject: [PATCH] Updata file Git: add gitignore_global on gitconfig Full update install.sh Updata READEME.md Updata vimrc --- README.md | 16 +++++++------ gitconfig | 1 + install.sh | 69 ++++++++++++++++++++++++++++++------------------------ vimrc | 8 ++++++- 4 files changed, 56 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index a0d311d..70fc3ff 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,19 @@ Config for - GIT - VIM -- NANO - BASH - TMUX - ZSH +## Install my config +Script +~~~bash +chmod +x install.sh +./install.sh +~~~ + +### Or + #### Git Move settings git ~~~bash @@ -29,12 +37,6 @@ Open vim and enter :PlugInstall ~~~ -#### Nano -Move settings nano -~~~bash -sudo mv nanorc /etc/nanorc -~~~ - #### BASH Move setting bash ~~~bash diff --git a/gitconfig b/gitconfig index bbe51bd..87d0d28 100644 --- a/gitconfig +++ b/gitconfig @@ -7,6 +7,7 @@ [core] editor = vim + excludesfile = ~/.gitignore_global [alias] ada = add -A diff --git a/install.sh b/install.sh index a3c348f..c816765 100644 --- a/install.sh +++ b/install.sh @@ -1,38 +1,47 @@ -#!/bin/bash -read -p "Enter user path: " PATH_HOME +#/bin/bash +read -p "Enter home paht: " $HOME_PAHT -echo "Install program" -sudo apt-get install vim git bash tmux zsh curl +function install_program { + sudo apt-get install git python3 python3-pip curl vim tmux +} -echo "Move settings git" -mv gitconfig PATH_HOME/.gitconfig -echo "Vim configuration" -mv vimrc PATH_HOME/.vimrc -curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -vim +PATH_HOME/.vimrc +PlugInstall +function LN { + ln bashrc $HOME_PAHT + ln gitconfig $HOME_PAHT + ln gitignore_global $HOME_PAHT +} -echo "Move settings bash" -mv bashrc PATH_HOME/.bashrc +function ZSH { + sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" -echo "TMUX" -git clone https://github.com/gpakosz/.tmux.git -mv ~/.tmux/.tmux.conf ~ -mv ~/.tmux/.tmux.conf.local ~ -rm -rf ~/.tmux + echo "alias cls='clear'" >> .zshrc + echo "alias sl='ls'" >> .zshrc + echo "alias cd..='cd ..'" >> .zshrc + echo "alias py='python3'" >> .zshrc + echo "alias py3='python3'" >> .zshrc + echo "alias ipy='ipython3'" >> .zshrc + echo "alias ipy3='ipython3'" >> .zshrc -echo "ZSH" -sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" + sed -i "s/plugins=(git)/plugins=(autopep8 djando pip systemd debian git tmux docker ansible)" + sed -i "s/ZSH_THEME=\"robbyrussell\"/ZSH_THEME=\"bureau\"" $HOME_PAHT/.zshrc +} -echo "alias cls='clear'" >> PATH_HOME/.zshrc -echo "alias sl='ls'" >> PATH_HOME/.zshrc -echo "alias cd..='cd ..'" >> PATH_HOME/.zshrc -echo "alias cd..='cd ..'" >> PATH_HOME/.zshrc -echo "alias py='python3'" >> PATH_HOME/.zshrc -echo "alias py3='python3'" >> PATH_HOME/.zshrc -echo "alias ipy='ipython3'" >> PATH_HOME/.zshrc -echo "alias ipy='python3'" >> PATH_HOME/.zshrc +function TMUX { + git clone https://github.com/gpakosz/.tmux.git + mv ~/.tmux/.tmux.conf ~ + mv ~/.tmux/.tmux.conf.local ~ + rm -rf ~/.tmux +} -set -i "s~ZSH_THEME="robbyrussell"~ZSH_THEME="bureau"~g" PATH_HOME/.zshrc -set -i "s~plugins=(git)~plugins=(autopep8 djando pip systemd debian git tmux docker ansible)~g" PATH_HOME/.zshrc +function VIM { + curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + ln vimrc $HOME_PAHT + vim +source$HOME_PAHT/.vimrc +PlugInstall +} + +install_program +LN +ZSH +TMUX +VIM \ No newline at end of file diff --git a/vimrc b/vimrc index 9f996be..913ed3f 100644 --- a/vimrc +++ b/vimrc @@ -81,8 +81,14 @@ map о j map л k map д l +" Unmap arrows +noremap +noremap +noremap +noremap + if has("gui_running") - colorscheme Monokai set guioptions -=m set guioptions -=T + map p "+gP endif