Skip to content

Commit 78a681f

Browse files
committed
Merge branch 'develop'
2 parents a8fe699 + 1e1f98b commit 78a681f

File tree

4 files changed

+43
-4
lines changed

4 files changed

+43
-4
lines changed

.vimrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ filetype plugin indent on " required
4040
syntax on " enable syntax highlighting
4141
colorscheme desert " set `desert` as default colour scheme
4242
set autoindent " indent when moving to the next while writing code
43+
set colorcolumn=80 " show 80 line indicator
4344
set encoding=utf-8 " show output in UTF-8 as YouCompleteMe requires
4445
set expandtab " expand tabs into spaces
4546
set fileencoding=utf-8 " save file with UTF-8 encoding
@@ -50,6 +51,7 @@ set shiftwidth=4 " shift lines by 4 spaces for indent
5051
set showmatch " show the matching part of the pair for [] {} & ()
5152
set softtabstop=4 " for easier backspacing the soft tabs
5253
set tabstop=4 " set tabs to have 4 spaces
54+
set tws=20x0 " set terminal windows size
5355

5456
highlight cursorcolumn cterm=NONE ctermbg=darkgrey ctermfg=white
5557
\ guibg=darkgrey guifg=white
@@ -72,6 +74,14 @@ nnoremap <space> za
7274
7375
" plugin settings - NERDTree
7476
map <C-\> :NERDTreeToggle<CR>
77+
" open NERDTree automatically when vim starts up with no file specified
78+
autocmd StdinReadPre * let s:std_in=1
79+
autocmd VimEnter * if argc() == 0 && ! exists("s:std_in") | NERDTree | endif
80+
" close vim if the only window left open is NERDTree
81+
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree")
82+
\ && b:NERDTree.isTabTree()) | q | endif
83+
let NERDTreeShowHidden=1 " show hidden file by default
84+
let NERDTreeIgnore=['.git$[[dir]]', '.swp', '.DS_Store']
7585

7686
" plugin settings - NERD Commenter
7787
map <C-_> <leader>ci

CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
5+
6+
## [Unreleased]
7+
8+
## [2020.06.18]
9+
### Added
10+
- `iputils-ping` package in dockerfiles to allow ping.
11+
- Vim terminal windows size setting - set to `20x0`.
12+
- NERDTree settings for following features:
13+
- Open automatically when vim starts up with no file specified.
14+
- Close vim if the only window left open is NERDTree.
15+
- Show hidden files by default but hide folder `.git`, `.DS_Store` and
16+
`.swp` files.
17+
18+
### Fixed
19+
- Issue of `pipenv` returns `Failed to load paths: /bin/sh: 1: .../python: not
20+
found` by pinning the `pipenv` version to `2018.11.26`.
21+
22+
## [2020.06.17]
23+
### Added
24+
- `.vimrc` configured for Python developemnt.
25+
- Ubuntu 20.04 based dockerfiles to build images for Python 3.7 & 3.8 variants.
26+
27+
[Unreleased]: https://github.com/devtography/pyvim/compare/2020.06.18...HEAD
28+
[2020.06.18]: https://github.com/devtography/pyvim/compare/2020.06.17...2020.06.18
29+
[2020.06.17]: https://github.com/devtography/pyvim/releases/tag/2020.06.17

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ RUN apt-get update \
2121
&& apt-get clean \
2222
&& ln -s /usr/bin/python3 /usr/bin/python \
2323
&& pip install setuptools \
24-
&& pip install pipenv pylint yapf
24+
&& pip install pipenv==2018.11.26 pylint yapf
2525

2626
# Install & setup development tools
2727
COPY .vimrc /root/.vimrc
28-
RUN apt-get install -y build-essential cmake curl git git-flow vim \
28+
RUN apt-get install -y build-essential cmake curl git git-flow iputils-ping vim \
2929
&& git clone https://github.com/VundleVim/Vundle.vim.git \
3030
/root/.vim/bundle/Vundle.vim \
3131
&& vim +PluginInstall +qall \

docker/Dockerfile_py3.7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ RUN apt-get update \
2525
&& ln -s /usr/bin/python3 /usr/bin/python \
2626
&& python3.7 -m ensurepip --default-pip \
2727
&& pip install --upgrade pip \
28-
&& pip install pipenv pylint yapf
28+
&& pip install pipenv==2018.11.26 pylint yapf
2929

3030
# Install & setup development tools
3131
COPY .vimrc /root/.vimrc
32-
RUN apt-get install -y build-essential cmake curl git git-flow vim \
32+
RUN apt-get install -y build-essential cmake curl git git-flow iputils-ping vim \
3333
&& git clone https://github.com/VundleVim/Vundle.vim.git \
3434
/root/.vim/bundle/Vundle.vim \
3535
&& vim +PluginInstall +qall \

0 commit comments

Comments
 (0)