From aae9e2acad4f3b9c0bea593984408193c135dce7 Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Sat, 10 Apr 2021 16:59:36 +0930 Subject: [PATCH] Update dotfiles --- .config/aliasrc | 2 +- .config/nvim/init.vim | 141 ++++-------------------------------------- .zshrc | 1 - 3 files changed, 13 insertions(+), 131 deletions(-) diff --git a/.config/aliasrc b/.config/aliasrc index 0eb2a46..6b16f92 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -1,6 +1,6 @@ #!/bin/sh alias q='exit' \ - ls="ls -G" \ + ls="ls --color=auto" \ ll="ls -G -alh" \ dd='sudo dd status=progress' \ h="history 1 | grep" \ diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 7cba456..c165128 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -12,23 +12,13 @@ Plug 'morhetz/gruvbox' Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' -"Plug 'vim-scripts/jcommenter.vim' -"Plug 'SirVer/ultisnips' -"Plug 'phux/vim-snippets' -"Plug 'tobyS/vmustache' -"Plug 'tobyS/pdv' -Plug 'Rican7/php-doc-modded' -Plug 'jreybert/vimagit' -Plug 'bling/vim-airline' -Plug 'tpope/vim-commentary' -Plug 'tpope/vim-fugitive' -Plug 'rbong/vim-flog' Plug 'ap/vim-css-color' -Plug 'justinmk/vim-sneak' Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } Plug 'darrikonn/vim-gofmt', { 'do': ':GoUpdateBinaries' } call plug#end() +let g:airline_powerline_fonts=1 + " Some basics: set go=a set mouse=a @@ -44,14 +34,14 @@ call plug#end() set undodir=~/.config/nvim/undodir set undofile - let g:gruvbox_contrast_dark = 'hard' - if exists('+termguicolors') - let &t_8f = "\[38;2;%lu;%lu;%lum" - let &t_8b = "\[38;2;%lu;%lu;%lum" - endif - let g:gruvbox_invert_selection = '0' - colorscheme gruvbox - set background=dark + "let g:gruvbox_contrast_dark = 'hard' + "if exists('+termguicolors') + " let &t_8f = "\[38;2;%lu;%lu;%lum" + " let &t_8b = "\[38;2;%lu;%lu;%lum" + "endif + "let g:gruvbox_invert_selection = '0' + "colorscheme gruvbox + "set background=dark nnoremap c "_c set nocompatible @@ -98,28 +88,6 @@ call plug#end() let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.5, 'highlight': 'Comment' } } -" php-doc-modded - nnoremap :call PhpDocSingle()i - "nnoremap :call PhpDocSingle() - "vnoremap :call PhpDocRange() - let g:pdv_cfg_autoEndClass = 0 - let g:pdv_cfg_autoEndFunction = 0 - -" Sneak config - let g:sneak#label = 1 - " case insensitive sneak - let g:sneak#use_ic_scs = 1 - " immediately move to the next instance of search, if you move the cursor sneak is back to default behavior - let g:sneak#s_next = 1 - " remap so I can use , and ; with f and t - map gS Sneak_, - map gs Sneak_; - " Change the colors - "highlight Sneak guifg=black guibg=#00C7DF ctermfg=black ctermbg=cyan - "highlight SneakScope guifg=red guibg=yellow ctermfg=red ctermbg=yellow - " Cool prompts - let g:sneak#prompt = 'S> ' - " Spell-check set to o, 'o' for 'orthography': map o :setlocal spell! spelllang=en_au @@ -139,19 +107,7 @@ call plug#end() nnoremap :%s//g " For chrome extension development - nnoremap :set syntax= - -" Ensure files are read as what I want: - let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'} - let g:vimwiki_list = [{'path': '~/vimwiki', 'syntax': 'markdown', 'ext': '.md'}] - autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff - autocmd BufRead,BufNewFile *.tex set filetype=tex - -" Automatically deletes all trailing whitespace on save. - autocmd BufWritePre * %s/\s\+$//e - -" Rebind $ to d - nnoremap d $ + " nnoremap :set syntax= " Navigating with guides inoremap /<++>"_c4l @@ -161,82 +117,9 @@ call plug#end() " Remember last cursor position autocmd BufReadPost * if @% !~# '\.git[\/\\]COMMIT_EDITMSG$' && line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif -" Update CHANGELOG message - inoremap C Update CHANGELOG:wq - inoremap 7 Refactor for php7bbhi - " Copy entire document noremap y ggyG map y ggyG -"""HTML - autocmd FileType html inoremap b <++>FbT>i - autocmd FileType html inoremap it <++>FeT>i - autocmd FileType html inoremap 1

<++>2kf2

<++>2kf3

<++>2kfp

<++>02kf>a - autocmd FileType html inoremap a href=""><++><++>14hi - autocmd FileType html inoremap e target="_blank"href=""><++><++>14hi - autocmd FileType html inoremap ul
<++>03kfli o
  • F>a - autocmd FileType html inoremap ol
    <++>03kfim <++><++>Fcf"a - autocmd FileType html inoremap td <++>Fdcit - autocmd FileType html inoremap tr <++>kfth <++>Fhcit - autocmd FileType html inoremap tab
    O - autocmd FileType html inoremap gr F>a - autocmd FileType html inoremap rd F>a - autocmd FileType html inoremap yl F>a - autocmd FileType html inoremap dt
    <++>
    <++>2kcit - autocmd FileType html inoremap dl
    <++>3kcc - autocmd FileType html inoremap & & - autocmd FileType html inoremap á á - autocmd FileType html inoremap é é - autocmd FileType html inoremap í í - autocmd FileType html inoremap ó ó - autocmd FileType html inoremap ú ú - autocmd FileType html inoremap ä ä - autocmd FileType html inoremap ë ë - autocmd FileType html inoremap ï ï - autocmd FileType html inoremap ö ö - autocmd FileType html inoremap ü ü - autocmd FileType html inoremap ã ã - autocmd FileType html inoremap ẽ &etilde; - autocmd FileType html inoremap ĩ ĩ - autocmd FileType html inoremap õ õ - autocmd FileType html inoremap ũ ũ - autocmd FileType html inoremap ñ ñ - autocmd FileType html inoremap à à - autocmd FileType html inoremap è è - autocmd FileType html inoremap ì ì - autocmd FileType html inoremap ò ò - autocmd FileType html inoremap ù ù - - - -""MARKDOWN -" autocmd Filetype markdown,rmd map w yiWi[Ea](pa) -" autocmd Filetype markdown,rmd inoremap n --- -" autocmd Filetype markdown,rmd inoremap b ****<++>F*hi -" autocmd Filetype markdown,rmd inoremap s ~~~~<++>F~hi -" autocmd Filetype markdown,rmd inoremap e **<++>F*i -" autocmd Filetype markdown,rmd inoremap h ====<++>F=hi -" autocmd Filetype markdown,rmd inoremap i ![](<++>)<++>F[a -" autocmd Filetype markdown,rmd inoremap a [](<++>)<++>F[a -" autocmd Filetype markdown,rmd inoremap 1 #<++>kA -" autocmd Filetype markdown,rmd inoremap 2 ##<++>kA -" autocmd Filetype markdown,rmd inoremap 3 ###<++>kA -" autocmd Filetype markdown,rmd inoremap l -------- -" autocmd Filetype rmd inoremap r ```{r}```2kO -" autocmd Filetype rmd inoremap p ```{python}```2kO -" autocmd Filetype rmd inoremap c ``````2kO - -""".php - autocmd FileType php inoremap f public function {<++>}kkk$i - autocmd FileType php inoremap t $this - autocmd FileType php inoremap u use Thirty4\Theme\Form\\<++>;5hi - autocmd FileType php inoremap s 'url' => [ 'select', [ 'name' => '' ]],4hi - autocmd FileType php inoremap v var_dump();die();k$hi + autocmd BufNewFile,BufRead *.gohtml set syntax=html diff --git a/.zshrc b/.zshrc index 0df810b..c59e9b2 100644 --- a/.zshrc +++ b/.zshrc @@ -168,6 +168,5 @@ git-prune() { fi } - export PATH="/usr/local/opt/php@7.4/bin:$PATH" export PATH="/usr/local/opt/php@7.4/sbin:$PATH"