mirror of
				https://github.com/mitchell/dotfiles.git
				synced 2025-11-03 21:25:26 +00:00 
			
		
		
		
	Modify fish, kitty, git, vim, and yabai configs:
- fish: changed the way branches are displayed - kitty: specify fonts - git: add puff and merff aliases - vim: - add goyo - add limelight - add yats - add vim-jsx-pretty - modify csharp ale linter - yabai: modify yabai dimensions to mimic bspwm defaults
This commit is contained in:
		
							parent
							
								
									e0dea79605
								
							
						
					
					
						commit
						b6f39e91af
					
				| 
						 | 
					@ -82,8 +82,8 @@ function fish_prompt --description 'Write out the prompt'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        set -l cur_branch_len (string length $cur_branch)
 | 
					        set -l cur_branch_len (string length $cur_branch)
 | 
				
			||||||
        if test $cur_branch_len -gt 21
 | 
					        if test $cur_branch_len -gt 21
 | 
				
			||||||
            set -l sub_str (string sub -s (math $cur_branch_len - 17) -l 18 $cur_branch)
 | 
					            set -l sub_str (string sub -l 18 $cur_branch)
 | 
				
			||||||
            set cur_branch "...$sub_str"
 | 
					            set cur_branch "$sub_str..."
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if string match 'Your branch is ahead of*' $git_status > /dev/null
 | 
					        if string match 'Your branch is ahead of*' $git_status > /dev/null
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,9 +7,9 @@
 | 
				
			||||||
#: characters.
 | 
					#: characters.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
font_family        Ligalex Mono
 | 
					font_family        Ligalex Mono
 | 
				
			||||||
# bold_font        auto
 | 
					bold_font          Ligalex Mono Bold
 | 
				
			||||||
# italic_font      auto
 | 
					italic_font        Ligalex Mono Italic
 | 
				
			||||||
# bold_italic_font auto
 | 
					bold_italic_font   Ligalex Mono Bold Italic
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: You can specify different fonts for the bold/italic/bold-italic
 | 
					#: You can specify different fonts for the bold/italic/bold-italic
 | 
				
			||||||
#: variants. To get a full list of supported fonts use the `kitty
 | 
					#: variants. To get a full list of supported fonts use the `kitty
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,6 +15,8 @@
 | 
				
			||||||
  squash = commit --squash
 | 
					  squash = commit --squash
 | 
				
			||||||
  unstage = reset HEAD
 | 
					  unstage = reset HEAD
 | 
				
			||||||
  rum = rebase master@{u}
 | 
					  rum = rebase master@{u}
 | 
				
			||||||
 | 
					  puff = pull --ff-only
 | 
				
			||||||
 | 
					  merff = merge --ff-only
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[core]
 | 
					[core]
 | 
				
			||||||
  editor = vim
 | 
					  editor = vim
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										12
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							| 
						 | 
					@ -58,3 +58,15 @@
 | 
				
			||||||
[submodule ".vim/bundle/omnisharp-vim"]
 | 
					[submodule ".vim/bundle/omnisharp-vim"]
 | 
				
			||||||
	path = .vim/bundle/omnisharp-vim
 | 
						path = .vim/bundle/omnisharp-vim
 | 
				
			||||||
	url = https://github.com/OmniSharp/omnisharp-vim.git
 | 
						url = https://github.com/OmniSharp/omnisharp-vim.git
 | 
				
			||||||
 | 
					[submodule ".vim/bundle/yats.vim"]
 | 
				
			||||||
 | 
						path = .vim/bundle/yats.vim
 | 
				
			||||||
 | 
						url = https://github.com/HerringtonDarkholme/yats.vim.git
 | 
				
			||||||
 | 
					[submodule ".vim/bundle/vim-jsx-pretty"]
 | 
				
			||||||
 | 
						path = .vim/bundle/vim-jsx-pretty
 | 
				
			||||||
 | 
						url = https://github.com/MaxMEllon/vim-jsx-pretty.git
 | 
				
			||||||
 | 
					[submodule ".vim/bundle/goyo.vim"]
 | 
				
			||||||
 | 
						path = .vim/bundle/goyo.vim
 | 
				
			||||||
 | 
						url = https://github.com/junegunn/goyo.vim.git
 | 
				
			||||||
 | 
					[submodule ".vim/bundle/limelight.vim"]
 | 
				
			||||||
 | 
						path = .vim/bundle/limelight.vim
 | 
				
			||||||
 | 
						url = https://github.com/junegunn/limelight.vim.git
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
Subproject commit 6e18c03d80c323e740f87103fc05955b5c61b54e
 | 
					Subproject commit 67d0ccc398ca7650bb2c774a94d098bee3049169
 | 
				
			||||||
| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
Subproject commit 8ffc3e208c282f19afa237d343fa1533146bd2b4
 | 
					Subproject commit f8486e58fb02351689ae247cebf28b5fee326c33
 | 
				
			||||||
							
								
								
									
										1
									
								
								.vim/bundle/goyo.vim
									
									
									
									
									
										Submodule
									
								
							
							
								
								
								
								
								
								
							
						
						
									
										1
									
								
								.vim/bundle/goyo.vim
									
									
									
									
									
										Submodule
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					Subproject commit 6b6ed2734084fdbb6315357ddcaecf9c8e6f143d
 | 
				
			||||||
| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
Subproject commit d437b6fe92e73c80978c2c4942aa51bc7d835a2e
 | 
					Subproject commit d7fd8d7a7465194e8eb67ce759c9fe392035f939
 | 
				
			||||||
							
								
								
									
										1
									
								
								.vim/bundle/limelight.vim
									
									
									
									
									
										Submodule
									
								
							
							
								
								
								
								
								
								
							
						
						
									
										1
									
								
								.vim/bundle/limelight.vim
									
									
									
									
									
										Submodule
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					Subproject commit 26e913a2e061195245bc62d24009ab67143a3c32
 | 
				
			||||||
| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
Subproject commit 3d508aedce35e1d952d3ce92378ad27ea5960fa6
 | 
					Subproject commit fec3e57ad23e4c268d07181d6afb858925b647a1
 | 
				
			||||||
| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
Subproject commit 763f4f29294ff7c781eb995a51dd7f061a9b775b
 | 
					Subproject commit bc8ce839cb8365df852aad1682f254adf25d6846
 | 
				
			||||||
| 
						 | 
					@ -1 +0,0 @@
 | 
				
			||||||
Subproject commit 5a319ea5504e18215d155576c78d1b7fb8e22c8f
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
Subproject commit f67d022169bd04d3c000f47b1c03bfcbc4209470
 | 
					Subproject commit 9b04cdca8c1ae4ac5a0874b934af94d033102247
 | 
				
			||||||
| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
Subproject commit b71ab64dc16a4665c3214f109000a11d30708079
 | 
					Subproject commit 5c73edb3c2fd8794661d7c7ac72eed1fc9d36761
 | 
				
			||||||
| 
						 | 
					@ -1 +1 @@
 | 
				
			||||||
Subproject commit 925d29a73db14133d11361792a2e0393e1e2b457
 | 
					Subproject commit 2aa7c9d00af14ae71fdfe46f6a52b0a4f0fac774
 | 
				
			||||||
							
								
								
									
										1
									
								
								.vim/bundle/vim-jsx-pretty
									
									
									
									
									
										Submodule
									
								
							
							
								
								
								
								
								
								
							
						
						
									
										1
									
								
								.vim/bundle/vim-jsx-pretty
									
									
									
									
									
										Submodule
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					Subproject commit 8f8c9edba37310d17e59a625b177ec6a37c07035
 | 
				
			||||||
							
								
								
									
										1
									
								
								.vim/bundle/yats.vim
									
									
									
									
									
										Submodule
									
								
							
							
								
								
								
								
								
								
							
						
						
									
										1
									
								
								.vim/bundle/yats.vim
									
									
									
									
									
										Submodule
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					Subproject commit 7ea1a4da5ab0d3ae73ea6af80b7252ae960e126f
 | 
				
			||||||
							
								
								
									
										3
									
								
								.vimrc
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								.vimrc
									
									
									
									
									
								
							| 
						 | 
					@ -67,7 +67,7 @@ let g:ale_linters = {
 | 
				
			||||||
\   'fish': ['fish'],
 | 
					\   'fish': ['fish'],
 | 
				
			||||||
\   'vim': ['vint'],
 | 
					\   'vim': ['vint'],
 | 
				
			||||||
\   'elixir': ['credo', 'elixir-ls'],
 | 
					\   'elixir': ['credo', 'elixir-ls'],
 | 
				
			||||||
\   'cs': ['csc'],
 | 
					\   'cs': ['OmniSharp'],
 | 
				
			||||||
\}
 | 
					\}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -91,3 +91,4 @@ let g:ale_completion_enabled = 1
 | 
				
			||||||
let g:ale_completion_delay = 500
 | 
					let g:ale_completion_delay = 500
 | 
				
			||||||
let g:ale_elixir_elixir_ls_release = expand('~/Documents/elixir-ls/bin')
 | 
					let g:ale_elixir_elixir_ls_release = expand('~/Documents/elixir-ls/bin')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					let g:OmniSharp_server_stdio = 1
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										12
									
								
								.yabairc
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								.yabairc
									
									
									
									
									
								
							| 
						 | 
					@ -26,7 +26,7 @@ yabai -m config normal_window_border_color   0xff505050
 | 
				
			||||||
yabai -m config insert_window_border_color   0xffd75f5f
 | 
					yabai -m config insert_window_border_color   0xffd75f5f
 | 
				
			||||||
yabai -m config active_window_opacity        1.0
 | 
					yabai -m config active_window_opacity        1.0
 | 
				
			||||||
yabai -m config normal_window_opacity        0.90
 | 
					yabai -m config normal_window_opacity        0.90
 | 
				
			||||||
yabai -m config split_ratio                  0.50
 | 
					yabai -m config split_ratio                  0.52
 | 
				
			||||||
yabai -m config auto_balance                 off
 | 
					yabai -m config auto_balance                 off
 | 
				
			||||||
yabai -m config mouse_modifier               fn
 | 
					yabai -m config mouse_modifier               fn
 | 
				
			||||||
yabai -m config mouse_action1                move
 | 
					yabai -m config mouse_action1                move
 | 
				
			||||||
| 
						 | 
					@ -34,10 +34,10 @@ yabai -m config mouse_action2                resize
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# general space settings
 | 
					# general space settings
 | 
				
			||||||
yabai -m config layout                       bsp
 | 
					yabai -m config layout                       bsp
 | 
				
			||||||
yabai -m config top_padding                  7
 | 
					yabai -m config top_padding                  12
 | 
				
			||||||
yabai -m config bottom_padding               7
 | 
					yabai -m config bottom_padding               12
 | 
				
			||||||
yabai -m config left_padding                 7
 | 
					yabai -m config left_padding                 12
 | 
				
			||||||
yabai -m config right_padding                7
 | 
					yabai -m config right_padding                12
 | 
				
			||||||
yabai -m config window_gap                   7
 | 
					yabai -m config window_gap                   12
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "yabai configuration loaded.."
 | 
					echo "yabai configuration loaded.."
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue