diff --git a/home/.bashrc b/home/.bashrc index f061f7e..1be246f 100644 --- a/home/.bashrc +++ b/home/.bashrc @@ -31,3 +31,10 @@ then alias sudo='sudo -A' fi +# Fix the horrible shell that poetry gives you. +if [ -n "$POETRY_ACTIVE" ] +then + export VIRTUAL_ENV_DISABLE_PROMPT=1 + cwd=$(pwd) + export PS1="\[\033[48;5;27m\]${cwd##*/}\[$(tput sgr0)\] 🖋️📜 " +fi diff --git a/home/.config/black b/home/.config/black new file mode 100644 index 0000000..aa4949a --- /dev/null +++ b/home/.config/black @@ -0,0 +1,2 @@ +[tool.black] +line-length = 100 diff --git a/home/.config/flake8 b/home/.config/flake8 index aa37975..c1754a7 100644 --- a/home/.config/flake8 +++ b/home/.config/flake8 @@ -1,7 +1,8 @@ [flake8] -ignore = E203, E266, E501, W503, B950 +ignore = E203, E266, E501, W503, B950, D105, D106, D107 # line length is intentionally set to 80 here because black uses Bugbear # See https://github.com/psf/black/blob/master/README.md#line-length for more details -max-line-length = 80 +max-line-length = 100 max-complexity = 18 -select = B,C,E,F,W,T4,B9 +select = B,C,E,F,W,T4,B9,D +docstring-convention = pep257 diff --git a/home/.config/mypy/config b/home/.config/mypy/config index 98ef8d6..ac01c4f 100644 --- a/home/.config/mypy/config +++ b/home/.config/mypy/config @@ -1,3 +1,3 @@ [mypy] -strict = True ignore_missing_imports = True +install_types = True diff --git a/home/.config/pylintrc b/home/.config/pylintrc index 0b7a185..db4d3e6 100644 --- a/home/.config/pylintrc +++ b/home/.config/pylintrc @@ -140,7 +140,7 @@ confidence= # exception-escape, # comprehension-escape -disable=bad-continuation,unused-variable,line-too-long,missing-class-docstring +disable=bad-continuation,unused-variable,line-too-long,missing-class-docstring,missing-function-docstring # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option diff --git a/home/.gitconfig b/home/.gitconfig index ece139f..52e4b23 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -19,3 +19,6 @@ required = true clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f + +[core] + hooksPath = ~/.alex-environ/private/home/git_hooks diff --git a/home/.vimrc.d/dev-environ.vim b/home/.vimrc.d/dev-environ.vim index ffc015b..23ef2c5 100644 --- a/home/.vimrc.d/dev-environ.vim +++ b/home/.vimrc.d/dev-environ.vim @@ -8,7 +8,6 @@ let g:ale_linters = { \ 'python': [ \ 'pylint', \ 'flake8', - \ 'pydocstyle', \ 'mypy', \ 'bandit', \ ], @@ -49,3 +48,7 @@ let g:coc_global_extensions = ['coc-jedi', 'coc-rls', 'coc-tsserver', 'coc-json' """Language Specific Options. "Remeber that COC has it's own settings file too, so most of it's settings are "there. + +" VIMSPECTOR +let g:vimspector_enable_mappings = 'HUMAN' +let g:vimspector_install_gadgets = ['debugpy'] diff --git a/home/.vimrc.d/plugins.vim b/home/.vimrc.d/plugins.vim index d358a84..398a050 100644 --- a/home/.vimrc.d/plugins.vim +++ b/home/.vimrc.d/plugins.vim @@ -17,6 +17,9 @@ function! LoadPlugins() Plug 'neoclide/coc.nvim', {'branch': 'release'} "Autocompetion endif + Plug 'puremourning/vimspector' + Plug 'sagi-z/vimspectorpy', { 'do': { -> vimspectorpy#update() } } + " THEMES Plug 'altercation/vim-colors-solarized' " Solarized is a pretty colour scheme Plug 'morhetz/gruvbox' " gruvbox is a good colour scheme on 256 colours diff --git a/private b/private index 051de63..0e34233 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 051de63966223f86fb0859d28fbb3ef093bbb4c9 +Subproject commit 0e34233ad56224b2096022a2c8b0f4b4bd87d2d0