diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | config/readline/inputrc | 2 | ||||
| -rw-r--r-- | config/vim/pluggins.vim | 2 | ||||
| -rw-r--r-- | config/vim/vimrc | 2 | ||||
| -rwxr-xr-x | config/x11/xinitrc (renamed from config/x11/.xinitrc) | 0 | ||||
| -rw-r--r-- | config/zsh/.zshrc | 3 | ||||
| -rwxr-xr-x | config/zsh/zprofile | 9 | ||||
| -rw-r--r-- | requirements-dev.txt | 2 | ||||
| -rwxr-xr-x | test | 2 |
9 files changed, 16 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 50fcd8c..690cd55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: shell os: linux -dist: focal +dist: focal # for python3.8 (https://packages.ubuntu.com/en/focal/python3) addons: apt: @@ -12,8 +12,7 @@ addons: install: - pip3 install -U pip - pip3 install setuptools - - pip3 install vim-vint - - pip3 install flake8 + - pip3 install -r requirements-dev.txt script: - ./test diff --git a/config/readline/inputrc b/config/readline/inputrc new file mode 100644 index 0000000..db8c777 --- /dev/null +++ b/config/readline/inputrc @@ -0,0 +1,2 @@ +set -o vi +set editing-mode vi diff --git a/config/vim/pluggins.vim b/config/vim/pluggins.vim index b7436f2..0915f42 100644 --- a/config/vim/pluggins.vim +++ b/config/vim/pluggins.vim @@ -41,6 +41,6 @@ call plug#begin($XDG_DATA_HOME . '/vim/plugged') " Plug 'jez/vim-superman' " man pages in vim (too slow) Plug 'vim-scripts/rfc-syntax' " rfc " Plug 'tacahiroy/ctrlp-funky' " extension to search function - Plug '/home/charles/git/c_formatter_42.vim' + Plug 'cacharle/c_formatter_42.vim' Plug 'cacharle/doxy42.vim' call plug#end() diff --git a/config/vim/vimrc b/config/vim/vimrc index 8082ea6..b308900 100644 --- a/config/vim/vimrc +++ b/config/vim/vimrc @@ -308,7 +308,7 @@ nnoremap <leader>v :call setreg("\"", system("xclip -selection clipboard -o"))<C let g:c_formatter_42_format_on_save = 0 -let g:gutentags_ctags_exclude = ['doc/*', 'Makefile'] +let g:gutentags_ctags_exclude = ['doc/*', 'Makefile', '.mypy_cache', '.tox'] " let g:gutentags_ctags_exclude_wildignore = 1 let g:goyo_height = 90 diff --git a/config/x11/.xinitrc b/config/x11/xinitrc index e50cfa6..e50cfa6 100755 --- a/config/x11/.xinitrc +++ b/config/x11/xinitrc diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 0c69f31..c1e33ce 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -10,7 +10,8 @@ case $(tty) in # %~ path ('~' if $HOME) # %B/%b start/stop bold # %B/%b start/stop color - NEWLINE=$(printf '\n') + # shellcheck disable=SC2039 + NEWLINE=$'\n' export PROMPT="${NEWLINE}%B%F{blue}%~%f${NEWLINE}%F{red}> %f%b" ;; *) diff --git a/config/zsh/zprofile b/config/zsh/zprofile index 68a9b48..9b4e44d 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -15,11 +15,12 @@ export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" export XDG_CACHE_HOME="$HOME/.cache" # config -export XMONAD_CONFIG_HOME="$XDG_CONFIG_HOME" -export XMONAD_DATA_HOME="$XDG_DATA_HOME" -export XMONAD_CACHE_HOME="$XDG_CACHE_HOME" +export XMONAD_CONFIG_HOME="$XDG_CONFIG_HOME/xmonad" +export XMONAD_DATA_HOME="$XDG_DATA_HOME/xmonad" +export XMONAD_CACHE_HOME="$XDG_CACHE_HOME/xmonad" export ZDOTDIR="$XDG_CONFIG_HOME/zsh" export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" +export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc" # shellcheck disable=SC2016 export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC' export IPYTHONDIR="$XDG_CONFIG_HOME/ipython" @@ -58,4 +59,4 @@ export MINISHELL_TEST_PAGER=vim export MINISHELL_TEST_FLAGS=-DMINISHELL_TEST export WEBSERV_FLAGS=-DWEBSERV_CACHARLE -[ "$(tty)" = '/dev/tty1' ] && HOME="$XDG_CONFIG_HOME/x11" exec startx +[ "$(tty)" = '/dev/tty1' ] && exec startx diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..e60c0e2 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,2 @@ +vim-vint +flake8 @@ -9,7 +9,7 @@ shellcheck local/bin/* || ret=$? shellcheck -s sh config/zsh/.zshrc || ret=$? shellcheck -s sh config/zsh/aliases.zsh || ret=$? shellcheck -s sh -e SC2155 config/zsh/zprofile || ret=$? -shellcheck -s sh config/x11/.xinitrc || ret=$? +shellcheck -s sh config/x11/xinitrc || ret=$? echo '-------------------- VINT' vint -s config/vim/vimrc config/vim/pluggins.vim || ret=$? |