From 6274148530f55728519b3a254af541d6bdbb2860 Mon Sep 17 00:00:00 2001 From: Dihak M N A Date: Mon, 2 Jul 2018 06:56:20 +0700 Subject: [PATCH 1/7] Fix Tab move and tab next --- vimrcs/basic.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index 11d1ed81..d8fd6ad8 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -229,8 +229,8 @@ map h :bprevious map tn :tabnew map to :tabonly map tc :tabclose -map tm :tabmove -map t :tabnext +map tm :tabmove +map t :tabnext " Let 'tl' toggle between this and the last accessed tab let g:lasttab = 1 From c456aadb240731619e69f2c1b8d0cfdb12380597 Mon Sep 17 00:00:00 2001 From: Dihak M N A Date: Mon, 2 Jul 2018 07:47:42 +0700 Subject: [PATCH 2/7] Change default color scheme --- vimrcs/extended.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim index a4f0c9b9..85a87dc3 100644 --- a/vimrcs/extended.vim +++ b/vimrcs/extended.vim @@ -29,7 +29,7 @@ set guioptions-=L " Colorscheme set background=dark -colorscheme peaksea +colorscheme solarized """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" From f2c382d80ed53b27b4d8aa7bcfab174d4d291566 Mon Sep 17 00:00:00 2001 From: Dihak M N A Date: Mon, 2 Jul 2018 07:51:17 +0700 Subject: [PATCH 3/7] Move nerdtree to left --- vimrcs/plugins_config.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim index b50f9824..b2e07390 100644 --- a/vimrcs/plugins_config.vim +++ b/vimrcs/plugins_config.vim @@ -77,7 +77,7 @@ set grepprg=/bin/grep\ -nH """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Nerd Tree """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:NERDTreeWinPos = "right" +let g:NERDTreeWinPos = "left" let NERDTreeShowHidden=0 let NERDTreeIgnore = ['\.pyc$', '__pycache__'] let g:NERDTreeWinSize=35 From e25674d6e190f5f64b7b1925e7e9175667b31997 Mon Sep 17 00:00:00 2001 From: Dihak M N A Date: Mon, 2 Jul 2018 07:57:22 +0700 Subject: [PATCH 4/7] Change color scheme lightline --- vimrcs/plugins_config.vim | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim index b2e07390..fc9a289a 100644 --- a/vimrcs/plugins_config.vim +++ b/vimrcs/plugins_config.vim @@ -104,11 +104,7 @@ au FileType mako vmap Si S"i${ _(2f"a) } " => lightline """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" let g:lightline = { - \ 'colorscheme': 'wombat', - \ } - -let g:lightline = { - \ 'colorscheme': 'wombat', + \ 'colorscheme': 'solarized', \ 'active': { \ 'left': [ ['mode', 'paste'], \ ['fugitive', 'readonly', 'filename', 'modified'] ], From 7700d51182067a3b994fa666fc9314a9f90299cb Mon Sep 17 00:00:00 2001 From: Dihak M N A Date: Mon, 2 Jul 2018 08:03:31 +0700 Subject: [PATCH 5/7] Add My Remap --- vimrcs/basic.vim | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index d8fd6ad8..987b3b69 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -51,6 +51,19 @@ nmap w :w! " (useful for handling the permission-denied error) command W w !sudo tee % > /dev/null +" Show number and set to relative number +set number +set relativenumber + +" Toggle relative number +nnoremap nb :set relativenumber! + +" Make j and k move to the next row, not the file line +nnoremap j gj +nnoremap k gk + +" Remap esc key to jk +inoremap jk """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => VIM user interface From 97bfd3bacd55d31a5c50d6bd274b357493c5c4df Mon Sep 17 00:00:00 2001 From: Dihak M N A Date: Mon, 2 Jul 2018 08:11:11 +0700 Subject: [PATCH 6/7] Edit Readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index adc63d24..a98d683a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Over the last 10 years, I have used and tweaked Vim. This configuration is the u There are two versions: -* **The Basic**: If you want something small just copy [basic.vim](https://github.com/amix/vimrc/blob/master/vimrcs/basic.vim) into your ~/.vimrc and you will have a good basic setup +* **The Basic**: If you want something small just copy [basic.vim](https://github.com/dihak/vimrc/blob/master/vimrcs/basic.vim) into your ~/.vimrc and you will have a good basic setup * **The Awesome**: Includes a ton of useful plugins, color schemes, and configurations I would, of course, recommend using the awesome version. @@ -16,13 +16,13 @@ I would, of course, recommend using the awesome version. ### Install for your own user only The awesome version includes a lot of great plugins, configurations and color schemes that make Vim a lot better. To install it simply do following from your terminal: - git clone --depth=1 https://github.com/amix/vimrc.git ~/.vim_runtime + git clone --depth=1 https://github.com/dihak/vimrc.git ~/.vim_runtime sh ~/.vim_runtime/install_awesome_vimrc.sh ### Install for multiple users To install for multiple users, the repository needs to be cloned to a location accessible for all the intended users. - git clone --depth=1 https://github.com/amix/vimrc.git /opt/vim_runtime + git clone --depth=1 https://github.com/dihak/vimrc.git /opt/vim_runtime sh ~/.vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime user0 user1 user2 # to install for all users with home directories sh ~/.vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime --all @@ -40,11 +40,11 @@ Some other fonts that Awesome will try to use: ## How to install the Basic version? -The basic version is just one file and no plugins. Just copy [basic.vim](https://github.com/amix/vimrc/blob/master/vimrcs/basic.vim) and paste it into your vimrc. +The basic version is just one file and no plugins. Just copy [basic.vim](https://github.com/dihak/vimrc/blob/master/vimrcs/basic.vim) and paste it into your vimrc. The basic version is useful to install on remote servers where you don't need many plugins, and you don't do many edits. - git clone --depth=1 https://github.com/amix/vimrc.git ~/.vim_runtime + git clone --depth=1 https://github.com/dihak/vimrc.git ~/.vim_runtime sh ~/.vim_runtime/install_basic_vimrc.sh From 4757c959d68e436e5cadb8c245925723d84647f9 Mon Sep 17 00:00:00 2001 From: Dihak M N A Date: Mon, 2 Jul 2018 08:18:06 +0700 Subject: [PATCH 7/7] Change default colorscheme in ReadMe --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a98d683a..6f6be7f2 100644 --- a/README.md +++ b/README.md @@ -109,8 +109,8 @@ I recommend reading the docs of these plugins to understand them better. Each pl ## Included color schemes -* [peaksea](https://github.com/vim-scripts/peaksea): The default -* [vim-colors-solarized](https://github.com/altercation/vim-colors-solarized) +* [peaksea](https://github.com/vim-scripts/peaksea) +* [vim-colors-solarized](https://github.com/altercation/vim-colors-solarized): The default * [vim-irblack](https://github.com/wgibbs/vim-irblack) * [mayansmoke](https://github.com/vim-scripts/mayansmoke) * [vim-pyte](https://github.com/therubymug/vim-pyte)