mirror of
				https://github.com/mitchell/dotfiles.git
				synced 2025-11-03 21:25:26 +00:00 
			
		
		
		
	Set iterm to default terminal; Add ps1 support to vim;
Set tabstop, shiftwidth, and expandtab in vim; Add search currently selected shortcut
This commit is contained in:
		
							parent
							
								
									b19ef12408
								
							
						
					
					
						commit
						29fa831fe2
					
				
							
								
								
									
										2
									
								
								.skhdrc
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								.skhdrc
									
									
									
									
									
								
							| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
# open terminal
 | 
					# open terminal
 | 
				
			||||||
cmd - return : /Applications/kitty.app/Contents/MacOS/kitty --single-instance -d ~
 | 
					cmd - return : /usr/bin/open -n -a iterm
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# focus window
 | 
					# focus window
 | 
				
			||||||
alt - h : yabai -m window --focus west
 | 
					alt - h : yabai -m window --focus west
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										11
									
								
								.vimrc
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								.vimrc
									
									
									
									
									
								
							| 
						 | 
					@ -37,6 +37,7 @@ Plug 'HerringtonDarkholme/yats.vim'
 | 
				
			||||||
Plug 'MaxMEllon/vim-jsx-pretty'
 | 
					Plug 'MaxMEllon/vim-jsx-pretty'
 | 
				
			||||||
Plug 'fsharp/vim-fsharp', { 'do': './make' }
 | 
					Plug 'fsharp/vim-fsharp', { 'do': './make' }
 | 
				
			||||||
Plug 'hashivim/vim-terraform'
 | 
					Plug 'hashivim/vim-terraform'
 | 
				
			||||||
 | 
					Plug 'PProvost/vim-ps1'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
call plug#end()
 | 
					call plug#end()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,10 +48,13 @@ set lazyredraw
 | 
				
			||||||
set hlsearch
 | 
					set hlsearch
 | 
				
			||||||
set mouse=a
 | 
					set mouse=a
 | 
				
			||||||
set number
 | 
					set number
 | 
				
			||||||
set textwidth=100
 | 
					 | 
				
			||||||
set noshowmode
 | 
					set noshowmode
 | 
				
			||||||
set background=dark
 | 
					set background=dark
 | 
				
			||||||
set nowrap
 | 
					set nowrap
 | 
				
			||||||
 | 
					set tabstop=2
 | 
				
			||||||
 | 
					set shiftwidth=0
 | 
				
			||||||
 | 
					set expandtab
 | 
				
			||||||
 | 
					set textwidth=100
 | 
				
			||||||
 | 
					
 | 
				
			||||||
nnoremap <C-p> :FZF<cr>
 | 
					nnoremap <C-p> :FZF<cr>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -69,6 +73,9 @@ nnoremap <leader>we :VimwikiAll2HTML<cr>
 | 
				
			||||||
nnoremap <leader>z :Goyo<cr>
 | 
					nnoremap <leader>z :Goyo<cr>
 | 
				
			||||||
nnoremap <leader>Z :Goyo 110x100%<cr>
 | 
					nnoremap <leader>Z :Goyo 110x100%<cr>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					" Allows you to use // in order to search for the visually selected text
 | 
				
			||||||
 | 
					vnoremap // y/\V<C-R>=escape(@",'/\')<CR><CR>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" next line is necessary to prevent background rendering bug with kitty term
 | 
					" next line is necessary to prevent background rendering bug with kitty term
 | 
				
			||||||
let &t_ut=''
 | 
					let &t_ut=''
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -132,7 +139,7 @@ augroup END
 | 
				
			||||||
 | 
					
 | 
				
			||||||
augroup wiki_ft
 | 
					augroup wiki_ft
 | 
				
			||||||
  au!
 | 
					  au!
 | 
				
			||||||
  autocmd BufNewFile,BufRead *.wiki	set tabstop=20 shiftwidth=0 textwidth=79 expandtab
 | 
					  autocmd BufNewFile,BufRead *.wiki	set textwidth=79
 | 
				
			||||||
  autocmd BufNewFile,BufRead *.wiki	HardPencil
 | 
					  autocmd BufNewFile,BufRead *.wiki	HardPencil
 | 
				
			||||||
augroup END
 | 
					augroup END
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue