diff options
| -rw-r--r-- | alacritty.yml | 4 | ||||
| -rwxr-xr-x | lynx/lynx | 2 | ||||
| -rw-r--r-- | vim/vimrc | 156 |
3 files changed, 82 insertions, 80 deletions
diff --git a/alacritty.yml b/alacritty.yml index 468feb0..313be4b 100644 --- a/alacritty.yml +++ b/alacritty.yml @@ -8,8 +8,8 @@ # # All imports must either be absolute paths starting with `/`, or paths relative # to the user's home directory starting with `~/`. -#import: -# - /path/to/alacritty.yml +# import: +# - ~/.config/alacritty/themes/themes/afterglow.yaml # Any items in the `env` entry below will be added as # environment variables. Some entries may override variables @@ -2,7 +2,7 @@ # see ../lynx/README.md for configs -lynxpath=/usr/local/bin/lynx +lynxpath=/usr/bin/lynx if [ -e "$HOME/.config/lynx/lynx.cfg" ];then export LYNX_CFG="$HOME/.config/lynx/lynx.cfg" @@ -46,10 +46,10 @@ set colorcolumn=0 set equalalways set showmode set list -set listchars=tab:»-,trail:␣,leadmultispace:---+,eol:\\U000021b5 +" set listchars=tab:»-,trail:␣,leadmultispace:---+,eol:\\U000021b5 +set listchars=tab:»-,trail:␣ set shortmess+=c set tags+=./tags -set background=dark set completeopt=menuone,longest " Function to allow adding a line of text to taskwarrior @@ -104,14 +104,14 @@ call plug#begin() "Plug 'vim-scripts/AutoComplPop' Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' +Plug 'rose-pine/vim' Plug 'szw/vim-maximizer' -Plug 'ycm-core/YouCompleteMe' +"Plug 'ycm-core/YouCompleteMe' Plug 'airblade/vim-tailwind' Plug 'morhetz/gruvbox' Plug 'lambdalisue/fern.vim' Plug 'junegunn/goyo.vim' Plug 'sheerun/vim-polyglot' -Plug 'preservim/vim-markdown' Plug 'mhinz/vim-signify' Plug 'vim-test/vim-test' Plug 'ledger/vim-ledger' @@ -143,80 +143,80 @@ autocmd BufEnter *.html,*.slim if s:is_tailwind() | \ endif " YCM -" *** STARTING AND ENABLING *** -" Don't start on start - or use show_diagnostics below -"let g:loaded_youcompleteme = 1 -" -" with this set to 0, YCM doesn't load/start -let g:ycm_show_diagnostics_ui = 1 -" ****************************** - -let g:ycm_enable_inlay_hints = 1 -nnoremap <silent> <localleader>h <Plug>(YCMToggleInlayHints) -nnoremap gd :YcmCompleter GoToDefinition<CR> -nnoremap <leader>gr :YcmCompleter GoToReferences<CR> -nnoremap K :YcmCompleter GetDoc<CR> -" this will disable tab, allowing it to be used for ultisnips -" let g:ycm_key_list_select_completion=[] -" let g:ycm_key_list_previous_completion=[] -let g:ycm_key_list_select_completion = ['<C-n>', '<Down>'] -let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>'] -let g:ycm_python_interpreter_path = '.venv/bin/python3' -let g:ycm_auto_trigger = 1 -let g:ycm_python_sys_path = [] -let g:ycm_extra_conf_vim_data = [ - \ 'g:ycm_python_interpreter_path', - \ 'g:ycm_python_sys_path' - \] -"let g:ycm_global_ycm_extra_conf = '~/.global_extra_conf.py' -nnoremap <leader>jd :YcmCompleter GoTo<CR> -imap <silent> <C-l> <Plug>(YCMToggleSignatureHelp)'. - - -let g:ycm_enable_inlay_hints = 0 +"" *** STARTING AND ENABLING *** +"" Don't start on start - or use show_diagnostics below +""let g:loaded_youcompleteme = 1 +"" +"" with this set to 0, YCM doesn't load/start +"let g:ycm_show_diagnostics_ui = 0 +"" ****************************** + +"let g:ycm_enable_inlay_hints = 1 +"nnoremap <silent> <localleader>h <Plug>(YCMToggleInlayHints) +"nnoremap gd :YcmCompleter GoToDefinition<CR> +"nnoremap <leader>gr :YcmCompleter GoToReferences<CR> +"nnoremap K :YcmCompleter GetDoc<CR> +"" this will disable tab, allowing it to be used for ultisnips +"" let g:ycm_key_list_select_completion=[] +"" let g:ycm_key_list_previous_completion=[] +"let g:ycm_key_list_select_completion = ['<C-n>', '<Down>'] +"let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>'] +"let g:ycm_python_interpreter_path = '.venv/bin/python3' +"let g:ycm_auto_trigger = 1 +"let g:ycm_python_sys_path = [] +"let g:ycm_extra_conf_vim_data = [ +" \ 'g:ycm_python_interpreter_path', +" \ 'g:ycm_python_sys_path' +" \] +""let g:ycm_global_ycm_extra_conf = '~/.global_extra_conf.py' +"nnoremap <leader>jd :YcmCompleter GoTo<CR> +"imap <silent> <C-l> <Plug>(YCMToggleSignatureHelp)'. + + +"let g:ycm_enable_inlay_hints = 0 " ALE ale config -let g:ale_enabled = 1 -let g:ale_echo_msg_format = '[%linter%] %s [%severity%]' -let g:ale_sign_error = '✘' -let g:ale_sign_warning = '⚠' -let g:ale_lint_on_text_changed = 0 -let g:ale_hover_cursor = 0 -let g:ale_virtualtext_cursor = 'disabled' -let g:ale_sign_column_always = 1 -let g:ale_open_list = 0 -let g:ale_set_highlights = 1 -let g:ale_set_signs = 1 -let g:ale_set_loclist = 1 -let g:ale_set_quickfix = 1 -let g:ale_echo_cursor = 1 -let g:ale_echo_msg_error_str = 'Error' -let g:ale_echo_msg_format = '%linter% - %code: %%s' -let g:ale_loclist_msg_format = '%linter% - %code: %%s' -let g:ale_echo_msg_warning_str = 'Warning' -let g:ale_linters = {'python': ['pyright', 'flake8', 'mypy'], -\ 'ocaml': ['merlin'], -\ 'javascript': ['eslint'], -\ 'cpp': ['clangd'], -\ 'yaml': ['yamllint'], -\ 'c': ['clangd'], -\ 'go': ['gopls', 'golint', 'gofmt'], - \} -let g:ale_fixers = { -\ 'python': ['autoimport', 'isort', 'yapf', 'black'], -\ 'javascript': ['eslint'], -\ 'go': ['gofmt'], -\ 'cpp': ['clang-format'], -\ 'c': ['clang-format'], -\ 'rust': ['rustfmt'] -\ } -let g:ale_python_mypy_ignore_invalid_syntax = 1 -let g:ale_python_mypy_executable = 'mypy' -let g:ale_python_mypy_options = '--config-file mypy.ini' -" let g:ale_sign_error = '>>' -let g:ale_fix_on_save = 1 -let g:ale_linters_explicit = 0 -set omnifunc=ale#completion#OmniFunc +" let g:ale_enabled = 1 +" let g:ale_echo_msg_format = '[%linter%] %s [%severity%]' +" let g:ale_sign_error = '✘' +" let g:ale_sign_warning = '⚠' +" let g:ale_lint_on_text_changed = 0 +" let g:ale_hover_cursor = 0 +" let g:ale_virtualtext_cursor = 'disabled' +" let g:ale_sign_column_always = 1 +" let g:ale_open_list = 0 +" let g:ale_set_highlights = 1 +" let g:ale_set_signs = 1 +" let g:ale_set_loclist = 1 +" let g:ale_set_quickfix = 1 +" let g:ale_echo_cursor = 1 +" let g:ale_echo_msg_error_str = 'Error' +" let g:ale_echo_msg_format = '%linter% - %code: %%s' +" let g:ale_loclist_msg_format = '%linter% - %code: %%s' +" let g:ale_echo_msg_warning_str = 'Warning' +" let g:ale_linters = {'python': ['pyright', 'flake8', 'mypy'], +" \ 'ocaml': ['merlin'], +" \ 'javascript': ['eslint'], +" \ 'cpp': ['clangd'], +" \ 'yaml': ['yamllint'], +" \ 'c': ['clangd'], +" \ 'go': ['gopls', 'golint', 'gofmt'], +" \} +" let g:ale_fixers = { +" \ 'python': ['autoimport', 'isort', 'yapf', 'black'], +" \ 'javascript': ['eslint'], +" \ 'go': ['gofmt'], +" \ 'cpp': ['clang-format'], +" \ 'c': ['clang-format'], +" \ 'rust': ['rustfmt'] +" \ } +" let g:ale_python_mypy_ignore_invalid_syntax = 1 +" let g:ale_python_mypy_executable = 'mypy' +" let g:ale_python_mypy_options = '--config-file mypy.ini' +" " let g:ale_sign_error = '>>' +" let g:ale_fix_on_save = 1 +" let g:ale_linters_explicit = 0 +" set omnifunc=ale#completion#OmniFunc " Make :grep use ripgrep if executable('rg') @@ -316,6 +316,7 @@ let g:fzf_colors = imap <C-x><C-f> <plug>(fzf-complete-file-ag) imap <C-x><C-l> <plug>(fzf-complete-line) + " COLORSCHEME BITS - " This is imported from the old ephemera.vim file which has now been removed " @@ -341,5 +342,6 @@ let g:gruvbox_improved_strings = 1 let g:gruvbox_improved_warnings = 1 let g:gruvbox_invert_indent_guides = 1 let g:gruvbox_invert_signs = 0 -colorscheme gruvbox +set background=dark +colorscheme rosepine " END OF COLORSCHEME BITS - |