routinely update

.gitconfig

@@ -9,31 +9,25 @@
 	followRedirects = true
 [http]
 	followRedirects = true
+	version = HTTP/1.1
 [https]
 	followRedirects = true
 [commit]
 	gpgSign = true
 [gpg]
 	program = gpg
 [pager]
-	diff = diff-so-fancy | less -i --tabs=4 -RFX
-	show = diff-so-fancy | less -i --tabs=4 -RFX
 	branch = false
-[color "diff-highlight"]
-	oldNormal = red bold
-	oldHighlight = red bold 52
-	newNormal = green bold
-	newHighlight = green bold 22
-[color "diff"]
-	meta = yellow
-	frag = magenta bold
-	commit = yellow bold
-	old = red bold
-	new = green bold
-	whitespace = red reverse
 [color]
 	ui = true
 [hub]
 	protocol = https
 [url "https://github.com/"]
 	insteadOf = git@github.com:
+[credential "https://swca.aisino.com"]
+	username = ein-plus
+[core]
+    pager = delta --plus-color="#012800" --minus-color="#340001" --theme='Monokai Extended'
+
+[interactive]
+    diffFilter = delta --color-only

.nvimrc

@@ -349,7 +349,7 @@ nvim_lsp.pyls.setup{
       plugins = {
         pylint = {
           enabled = true,
-          args = {'--disable=wildcard-import,too-many-public-methods,redefined-outer-name,expression-not-assigned,redefined-builtin,subprocess-run-check,too-many-instance-attributes,import-outside-toplevel,broad-except,logging-not-lazy,too-many-return-statements,C0111,R0903,too-many-arguments,multiple-statements,too-many-statements,too-many-locals,invalid-name,fixme,logging-fstring-interpolation,line-too-long,no-member,inconsistent-return-statements,too-many-lines,unused-argument,no-self-use'},
+          args = {'--disable=bare-except,wildcard-import,too-many-public-methods,redefined-outer-name,expression-not-assigned,redefined-builtin,subprocess-run-check,too-many-instance-attributes,import-outside-toplevel,broad-except,logging-not-lazy,too-many-return-statements,C0111,R0903,too-many-arguments,multiple-statements,too-many-statements,too-many-locals,invalid-name,fixme,logging-fstring-interpolation,line-too-long,no-member,inconsistent-return-statements,too-many-lines,unused-argument,no-self-use'},
         },
         pycodestyle = {
           enabled = true,
@@ -371,9 +371,7 @@ EOF
 
 " deoplete {
 let g:deoplete#enable_at_startup = 1
-if !exists('g:deoplete#omni#input_patterns')
-    let g:deoplete#omni#input_patterns = {}
-endif
+call deoplete#custom#var('omni', 'input_patterns', {})
 inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
 function! s:my_cr_function() abort
     return deoplete#close_popup() . "\<CR>"

.zshrc

@@ -18,6 +18,7 @@ export ZSH=$HOME/.oh-my-zsh
 plugins=(
 git
 gitfast
+git-extras
 gpg-agent
 # vagrant
 # golang
@@ -79,9 +80,9 @@ export GOPATH=$HOME/gocode
 export PATH="$GOPATH/bin:$HOME/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin:$HOME/development/flutter/bin:$HOME/.pub-cache/bin"
 export EDITOR=nvim
 export MANPAGER="nvim -c 'set ft=man' -"
-alias d='gd'
 alias v='f -e nvim'
 alias la='exa -alHbg'
+alias l='exa -alHbg'
 # vagrant related
 # alias vst="vagrant global-status --prune"
 # alias vsh="vagrant ssh"
@@ -90,6 +91,9 @@ alias la='exa -alHbg'
 # alias vupp="SSH_AUTH_SOCK='' vagrant up --provision"
 # ansible related
 alias ave="ansible-vault edit"
+alias feature='git-feature'
+alias bug='git-feature -a bug'
+alias refactor='git-feature -a refactor'
 # remove some aliases
 unalias sd
 

com.googlecode.iterm2.plist

@@ -408,7 +408,7 @@
 	<key>NSWindow Frame Preferences</key>
 	<string>342 305 606 456 0 0 1280 777 </string>
 	<key>NSWindow Frame SUAutomaticUpdateAlert</key>
-	<string>412 544 616 174 0 0 1440 900 </string>
+	<string>412 544 616 174 0 0 1440 877 </string>
 	<key>NSWindow Frame SUStatusFrame</key>
 	<string>520 578 400 129 0 0 1440 900 </string>
 	<key>NSWindow Frame SUUpdateAlert</key>
@@ -1103,7 +1103,7 @@
 			<key>Name</key>
 			<string>mac</string>
 			<key>Non Ascii Font</key>
-			<string>FiraCode-Regular 14</string>
+			<string>PragmataProForPowerlinePlusNerdFileTypes 14</string>
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Non-ASCII Ligatures</key>
@@ -1311,7 +1311,7 @@
 			<key>Tags</key>
 			<array/>
 			<key>Terminal Type</key>
-			<string>xterm-256color-italic</string>
+			<string>xterm-256color</string>
 			<key>Thin Strokes</key>
 			<integer>4</integer>
 			<key>Transparency</key>
@@ -1333,7 +1333,7 @@
 			<key>Use Cursor Guide</key>
 			<false/>
 			<key>Use Italic Font</key>
-			<true/>
+			<false/>
 			<key>Use Non-ASCII Font</key>
 			<true/>
 			<key>Vertical Spacing</key>
@@ -1349,30 +1349,35 @@
 	<key>NoSyncAllAppVersions</key>
 	<array>
 		<string>3.3.8beta3</string>
-		<string>3.3.0beta10</string>
 		<string>3.3.7beta1</string>
-		<string>3.3.0beta11</string>
+		<string>3.3.10beta2</string>
 		<string>3.3.2beta1</string>
 		<string>3.3.7beta3</string>
 		<string>3.3.5beta2</string>
-		<string>3.3.0beta13</string>
 		<string>3.3.8beta5</string>
 		<string>3.3.5beta1</string>
 		<string>3.3.3beta2</string>
 		<string>3.3.8beta4</string>
 		<string>3.3.7beta2</string>
+		<string>3.3.0beta13</string>
+		<string>3.3.9beta1</string>
+		<string>3.3.0beta11</string>
+		<string>3.3.0beta10</string>
 		<string>3.3.4beta1</string>
 		<string>3.3.2beta2</string>
 		<string>3.3.7beta4</string>
 		<string>3.3.8beta1</string>
+		<string>3.3.10beta1</string>
+		<string>3.3.10beta4</string>
 	</array>
 	<key>NoSyncBFPFavorites</key>
 	<array>
 		<string>Fira Code</string>
 	</array>
 	<key>NoSyncBFPRecents</key>
 	<array>
-		<string>Fira Code</string>
+		<string>PragmataPro for Powerline Plus Nerd File Types</string>
+		<string>PragmataPro for Powerline</string>
 		<string>PragmataPro Mono Liga</string>
 	</array>
 	<key>NoSyncCommandHistoryHasEverBeenUsed</key>
@@ -1403,7 +1408,7 @@
 		<key>screenFrame</key>
 		<string>{{0, 0}, {1440, 900}}</string>
 		<key>topLeft</key>
-		<string>{243, 787}</string>
+		<string>{329, 785}</string>
 	</dict>
 	<key>NoSyncHaveRequestedFullDiskAccess</key>
 	<true/>
@@ -1418,7 +1423,7 @@
 	<key>NoSyncLastTipTime</key>
 	<real>478414592.03086901</real>
 	<key>NoSyncLaunchExperienceControllerRunCount</key>
-	<integer>91</integer>
+	<integer>117</integer>
 	<key>NoSyncNeverAskAboutSettingAlternateMouseScroll</key>
 	<true/>
 	<key>NoSyncNeverRemindPrefsChangesCopy</key>
@@ -2274,7 +2279,7 @@
 	<key>SUHasLaunchedBefore</key>
 	<true/>
 	<key>SULastCheckTime</key>
-	<date>2020-02-01T14:46:47Z</date>
+	<date>2020-05-29T04:49:55Z</date>
 	<key>SUUpdateRelaunchingMarker</key>
 	<false/>
 	<key>SavePasteHistory</key>
@@ -2350,7 +2355,7 @@
 	<key>findRegex_iTerm</key>
 	<false/>
 	<key>iTerm Version</key>
-	<string>3.3.8beta5</string>
+	<string>3.3.10beta4</string>
 	<key>kCPKSelectionViewPreferredModeKey</key>
 	<integer>1</integer>
 	<key>kCPKSelectionViewShowHSBTextFieldsKey</key>

requirements.txt

@@ -8,11 +8,8 @@ flake8
 neovim
 pip
 pip-tools
-mycli
 watchdog
-#python-language-server[all]==0.22.0
 python-language-server[all]
-pylint
 pycodestyle
 virtualenv
 virtualenvwrapper

vscode-settings.json

@@ -1,5 +1,5 @@
 {
-    "workbench.colorTheme": "Braver's Solarized Dark (themed workbench)",
+    "workbench.colorTheme": "Braver's Solarized Light (themed workbench)",
     "vim.enableNeovim": true,
     "vim.neovimPath": "nvim",
     "vim.easymotion": true,
@@ -35,5 +35,7 @@
     "python.linting.enabled": false,
     "update.showReleaseNotes": false,
     "editor.fontFamily": "'PragmataPro Mono Liga', Menlo, Monaco, 'Courier New', monospace",
-    "editor.fontLigatures": true
+    "editor.fontLigatures": true,
+    "markdown-pdf.executablePath": "/Applications/Google Chrome.app",
+    "markdown.preview.fontFamily": "'PingFang SC', 'Segoe WPC', 'Segoe UI', system-ui, 'Ubuntu', 'Droid Sans', sans-serif"
 }