dotfiles: sync

This commit is contained in:
Konstantin Bukley
2020-12-23 17:36:09 +02:00
parent 37caf7e3f7
commit 284c85d37d
10 changed files with 698 additions and 167 deletions

View File

@@ -6,7 +6,7 @@ window:
x: 0 x: 0
y: 0 y: 0
decorations: none decorations: none
startup_mode: SimpleFullscreen startup_mode: Maximized
draw_bold_text_with_bright_colors: true draw_bold_text_with_bright_colors: true
font: font:
normal: normal:
@@ -18,7 +18,7 @@ font:
italic: italic:
family: Fira Code family: Fira Code
style: Light style: Light
size: 14.0 size: 18.0
offset: offset:
x: 0 x: 0
y: 0 y: 0
@@ -27,28 +27,53 @@ font:
y: 0 y: 0
use_thin_strokes: true use_thin_strokes: true
# colors:
# primary:
# background: '0x002b36'
# foreground: '0x839496'
# normal:
# black: '0x073642'
# red: '0xdc322f'
# green: '0x859900'
# yellow: '0xb58900'
# blue: '0x268bd2'
# magenta: '0xd33682'
# cyan: '0x2aa198'
# white: '0xeee8d5'
# bright:
# black: '0x002b36'
# red: '0xcb4b16'
# green: '0x586e75'
# yellow: '0x657b83'
# blue: '0x839496'
# magenta: '0x6c71c4'
# cyan: '0x93a1a1'
# white: '0xfdf6e3'
colors: colors:
primary: primary:
background: '0x002b36' background: '0x2E3440'
foreground: '0x839496' foreground: '0xD8DEE9'
cursor:
text: '0x2E3440'
cursor: '0xD8DEE9'
normal: normal:
black: '0x073642' black: '0x3B4252'
red: '0xdc322f' red: '0xBF616A'
green: '0x859900' green: '0xA3BE8C'
yellow: '0xb58900' yellow: '0xEBCB8B'
blue: '0x268bd2' blue: '0x81A1C1'
magenta: '0xd33682' magenta: '0xB48EAD'
cyan: '0x2aa198' cyan: '0x88C0D0'
white: '0xeee8d5' white: '0xE5E9F0'
bright: bright:
black: '0x002b36' black: '0x4C566A'
red: '0xcb4b16' red: '0xBF616A'
green: '0x586e75' green: '0xA3BE8C'
yellow: '0x657b83' yellow: '0xEBCB8B'
blue: '0x839496' blue: '0x81A1C1'
magenta: '0x6c71c4' magenta: '0xB48EAD'
cyan: '0x93a1a1' cyan: '0x8FBCBB'
white: '0xfdf6e3' white: '0xECEFF4'
visual_bell: visual_bell:
duration: 0 duration: 0

View File

@@ -5,5 +5,9 @@ fi
eval "$(rbenv init - --no-rehash)" eval "$(rbenv init - --no-rehash)"
(rbenv rehash &) 2> /dev/null (rbenv rehash &) 2> /dev/null
# eval "$(docker-machine env default)"
# export NVM_DIR="$HOME/.nvm" # export NVM_DIR="$HOME/.nvm"
# [ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" # [ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"
export PATH="/usr/local/opt/icu4c/bin:$PATH"
export PATH="/usr/local/opt/icu4c/sbin:$PATH"

View File

@@ -18,6 +18,15 @@ shopt -s cmdhist # save multi-line commands in one
export BASH_SILENCE_DEPRECATION_WARNING=1 export BASH_SILENCE_DEPRECATION_WARNING=1
# ruby-build installs a non-Homebrew OpenSSL for each Ruby version installed and these are never upgraded.
# To link Rubies to Homebrew's OpenSSL 1.1 (which is upgraded) add the following
# to your /Users/madundead/.bash_profile:
# export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@1.1)"
# Note: this may interfere with building old versions of Ruby (e.g <2.4) that use
# OpenSSL <1.1.
# export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@1.1)" # export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@1.1)"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib
export EDITOR=nvim export EDITOR=nvim
@@ -43,6 +52,7 @@ alias ...='cd ../..'
alias md='mkdir -p' alias md='mkdir -p'
alias gco='git checkout' alias gco='git checkout'
alias gcom='git checkout master'
alias gd='git diff' alias gd='git diff'
alias gdc='git diff --cached' alias gdc='git diff --cached'
alias gc='git commit' alias gc='git commit'
@@ -117,8 +127,10 @@ fi
PS1='\W$(__git_ps1 ":%s") ' PS1='\W$(__git_ps1 ":%s") '
function q() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubectl get pods -n $1 -l product=quoting,app=quoting-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; } function q() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubectl get pods -n $1 -l product=quoting,app=quoting-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
function o() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubectl get pods -n $1 -l product=origin,app=origin-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
function olb() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubectl get pods -n $1 -l product=online-bind,app=online-bind-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; } function olb() { if [ -z "$1" ]; then return 1; fi; kubectl exec -n $1 -it $(kubectl get pods -n $1 -l product=online-bind,app=online-bind-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
function qstag() { kubectl exec -n staging -it $(kubectl get pods -n staging -l product=quoting,app=quoting-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; } function qstag() { kubectl exec -n staging -it $(kubectl get pods -n staging -l product=quoting,app=quoting-rails-webserver -o=custom-columns=NAME:.metadata.name | tail -1) ${@:2}; }
# bash ops-deployment/tools/debug quoting production rails c
function _calcram() { function _calcram() {
local sum local sum

View File

@@ -1,6 +1,7 @@
[user] [user]
email = madundead@gmail.com email = kostya.b@matic.com
name = Konstantin Bukley name = Konstantin Bukley
signingkey = 0EBBF5ABB284C942
[includeIf "gitdir:~/Development/work/"] [includeIf "gitdir:~/Development/work/"]
path = ~/Development/work/.gitconfig path = ~/Development/work/.gitconfig
@@ -151,7 +152,6 @@
user = "madundead" user = "madundead"
[url "git@github.com:"] [url "git@github.com:"]
insteadOf = "gh:" insteadOf = "gh:"
pushInsteadOf = "github:" pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/" pushInsteadOf = "git://github.com/"

View File

@@ -0,0 +1,271 @@
{
"global": {
"check_for_updates_on_startup": true,
"show_in_menu_bar": true,
"show_profile_name_in_menu_bar": true
},
"profiles": [
{
"complex_modifications": {
"parameters": {
"basic.simultaneous_threshold_milliseconds": 50,
"basic.to_delayed_action_delay_milliseconds": 500,
"basic.to_if_alone_timeout_milliseconds": 1000,
"basic.to_if_held_down_threshold_milliseconds": 500
},
"rules": []
},
"devices": [],
"fn_function_keys": [
{
"from": {
"key_code": "f1"
},
"to": {
"consumer_key_code": "display_brightness_decrement"
}
},
{
"from": {
"key_code": "f2"
},
"to": {
"consumer_key_code": "display_brightness_increment"
}
},
{
"from": {
"key_code": "f3"
},
"to": {
"key_code": "mission_control"
}
},
{
"from": {
"key_code": "f4"
},
"to": {
"key_code": "launchpad"
}
},
{
"from": {
"key_code": "f5"
},
"to": {
"key_code": "illumination_decrement"
}
},
{
"from": {
"key_code": "f6"
},
"to": {
"key_code": "illumination_increment"
}
},
{
"from": {
"key_code": "f7"
},
"to": {
"consumer_key_code": "rewind"
}
},
{
"from": {
"key_code": "f8"
},
"to": {
"consumer_key_code": "play_or_pause"
}
},
{
"from": {
"key_code": "f9"
},
"to": {
"consumer_key_code": "fastforward"
}
},
{
"from": {
"key_code": "f10"
},
"to": {
"consumer_key_code": "mute"
}
},
{
"from": {
"key_code": "f11"
},
"to": {
"consumer_key_code": "volume_decrement"
}
},
{
"from": {
"key_code": "f12"
},
"to": {
"consumer_key_code": "volume_increment"
}
}
],
"name": "work",
"selected": true,
"simple_modifications": [
{
"from": {
"key_code": "caps_lock"
},
"to": {
"key_code": "f18"
}
}
],
"virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 1000,
"country_code": 0,
"keyboard_type": "ansi"
}
},
{
"complex_modifications": {
"parameters": {
"basic.simultaneous_threshold_milliseconds": 50,
"basic.to_delayed_action_delay_milliseconds": 500,
"basic.to_if_alone_timeout_milliseconds": 1000,
"basic.to_if_held_down_threshold_milliseconds": 500
},
"rules": []
},
"devices": [],
"fn_function_keys": [
{
"from": {
"key_code": "f1"
},
"to": {
"consumer_key_code": "display_brightness_decrement"
}
},
{
"from": {
"key_code": "f2"
},
"to": {
"consumer_key_code": "display_brightness_increment"
}
},
{
"from": {
"key_code": "f3"
},
"to": {
"key_code": "mission_control"
}
},
{
"from": {
"key_code": "f4"
},
"to": {
"key_code": "launchpad"
}
},
{
"from": {
"key_code": "f5"
},
"to": {
"key_code": "illumination_decrement"
}
},
{
"from": {
"key_code": "f6"
},
"to": {
"key_code": "illumination_increment"
}
},
{
"from": {
"key_code": "f7"
},
"to": {
"consumer_key_code": "rewind"
}
},
{
"from": {
"key_code": "f8"
},
"to": {
"consumer_key_code": "play_or_pause"
}
},
{
"from": {
"key_code": "f9"
},
"to": {
"consumer_key_code": "fastforward"
}
},
{
"from": {
"key_code": "f10"
},
"to": {
"consumer_key_code": "mute"
}
},
{
"from": {
"key_code": "f11"
},
"to": {
"consumer_key_code": "volume_decrement"
}
},
{
"from": {
"key_code": "f12"
},
"to": {
"consumer_key_code": "volume_increment"
}
}
],
"name": "wow",
"selected": false,
"simple_modifications": [
{
"from": {
"key_code": "caps_lock"
},
"to": {
"key_code": "equal_sign"
}
},
{
"from": {
"key_code": "right_command"
},
"to": {
"pointing_button": "button2"
}
}
],
"virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 0,
"country_code": 0,
"keyboard_type": "ansi"
}
}
]
}

View File

@@ -0,0 +1,271 @@
{
"global": {
"check_for_updates_on_startup": true,
"show_in_menu_bar": true,
"show_profile_name_in_menu_bar": true
},
"profiles": [
{
"complex_modifications": {
"parameters": {
"basic.simultaneous_threshold_milliseconds": 50,
"basic.to_delayed_action_delay_milliseconds": 500,
"basic.to_if_alone_timeout_milliseconds": 1000,
"basic.to_if_held_down_threshold_milliseconds": 500
},
"rules": []
},
"devices": [],
"fn_function_keys": [
{
"from": {
"key_code": "f1"
},
"to": {
"consumer_key_code": "display_brightness_decrement"
}
},
{
"from": {
"key_code": "f2"
},
"to": {
"consumer_key_code": "display_brightness_increment"
}
},
{
"from": {
"key_code": "f3"
},
"to": {
"key_code": "mission_control"
}
},
{
"from": {
"key_code": "f4"
},
"to": {
"key_code": "launchpad"
}
},
{
"from": {
"key_code": "f5"
},
"to": {
"key_code": "illumination_decrement"
}
},
{
"from": {
"key_code": "f6"
},
"to": {
"key_code": "illumination_increment"
}
},
{
"from": {
"key_code": "f7"
},
"to": {
"consumer_key_code": "rewind"
}
},
{
"from": {
"key_code": "f8"
},
"to": {
"consumer_key_code": "play_or_pause"
}
},
{
"from": {
"key_code": "f9"
},
"to": {
"consumer_key_code": "fastforward"
}
},
{
"from": {
"key_code": "f10"
},
"to": {
"consumer_key_code": "mute"
}
},
{
"from": {
"key_code": "f11"
},
"to": {
"consumer_key_code": "volume_decrement"
}
},
{
"from": {
"key_code": "f12"
},
"to": {
"consumer_key_code": "volume_increment"
}
}
],
"name": "work",
"selected": true,
"simple_modifications": [
{
"from": {
"key_code": "caps_lock"
},
"to": {
"key_code": "f18"
}
}
],
"virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 1000,
"country_code": 0,
"keyboard_type": "ansi"
}
},
{
"complex_modifications": {
"parameters": {
"basic.simultaneous_threshold_milliseconds": 50,
"basic.to_delayed_action_delay_milliseconds": 500,
"basic.to_if_alone_timeout_milliseconds": 1000,
"basic.to_if_held_down_threshold_milliseconds": 500
},
"rules": []
},
"devices": [],
"fn_function_keys": [
{
"from": {
"key_code": "f1"
},
"to": {
"consumer_key_code": "display_brightness_decrement"
}
},
{
"from": {
"key_code": "f2"
},
"to": {
"consumer_key_code": "display_brightness_increment"
}
},
{
"from": {
"key_code": "f3"
},
"to": {
"key_code": "mission_control"
}
},
{
"from": {
"key_code": "f4"
},
"to": {
"key_code": "launchpad"
}
},
{
"from": {
"key_code": "f5"
},
"to": {
"key_code": "illumination_decrement"
}
},
{
"from": {
"key_code": "f6"
},
"to": {
"key_code": "illumination_increment"
}
},
{
"from": {
"key_code": "f7"
},
"to": {
"consumer_key_code": "rewind"
}
},
{
"from": {
"key_code": "f8"
},
"to": {
"consumer_key_code": "play_or_pause"
}
},
{
"from": {
"key_code": "f9"
},
"to": {
"consumer_key_code": "fastforward"
}
},
{
"from": {
"key_code": "f10"
},
"to": {
"consumer_key_code": "mute"
}
},
{
"from": {
"key_code": "f11"
},
"to": {
"consumer_key_code": "volume_decrement"
}
},
{
"from": {
"key_code": "f12"
},
"to": {
"consumer_key_code": "volume_increment"
}
}
],
"name": "wow",
"selected": false,
"simple_modifications": [
{
"from": {
"key_code": "caps_lock"
},
"to": {
"key_code": "equal_sign"
}
},
{
"from": {
"key_code": "right_command"
},
"to": {
"pointing_button": "button2"
}
}
],
"virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 0,
"country_code": 0,
"keyboard_type": "ansi"
}
}
]
}

View File

@@ -11,11 +11,39 @@
"basic.simultaneous_threshold_milliseconds": 50, "basic.simultaneous_threshold_milliseconds": 50,
"basic.to_delayed_action_delay_milliseconds": 500, "basic.to_delayed_action_delay_milliseconds": 500,
"basic.to_if_alone_timeout_milliseconds": 1000, "basic.to_if_alone_timeout_milliseconds": 1000,
"basic.to_if_held_down_threshold_milliseconds": 500 "basic.to_if_held_down_threshold_milliseconds": 500,
"mouse_motion_to_scroll.speed": 100
}, },
"rules": [] "rules": []
}, },
"devices": [], "devices": [
{
"disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [],
"identifiers": {
"is_keyboard": true,
"is_pointing_device": false,
"product_id": 521,
"vendor_id": 1241
},
"ignore": false,
"manipulate_caps_lock_led": false,
"simple_modifications": []
},
{
"disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [],
"identifiers": {
"is_keyboard": true,
"is_pointing_device": false,
"product_id": 632,
"vendor_id": 1452
},
"ignore": false,
"manipulate_caps_lock_led": true,
"simple_modifications": []
}
],
"fn_function_keys": [ "fn_function_keys": [
{ {
"from": { "from": {
@@ -115,6 +143,9 @@
} }
], ],
"name": "work", "name": "work",
"parameters": {
"delay_milliseconds_before_open_device": 1000
},
"selected": true, "selected": true,
"simple_modifications": [ "simple_modifications": [
{ {
@@ -129,7 +160,8 @@
"virtual_hid_keyboard": { "virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 1000, "caps_lock_delay_milliseconds": 1000,
"country_code": 0, "country_code": 0,
"keyboard_type": "ansi" "keyboard_type": "ansi",
"mouse_key_xy_scale": 100
} }
}, },
{ {
@@ -138,7 +170,8 @@
"basic.simultaneous_threshold_milliseconds": 50, "basic.simultaneous_threshold_milliseconds": 50,
"basic.to_delayed_action_delay_milliseconds": 500, "basic.to_delayed_action_delay_milliseconds": 500,
"basic.to_if_alone_timeout_milliseconds": 1000, "basic.to_if_alone_timeout_milliseconds": 1000,
"basic.to_if_held_down_threshold_milliseconds": 500 "basic.to_if_held_down_threshold_milliseconds": 500,
"mouse_motion_to_scroll.speed": 100
}, },
"rules": [] "rules": []
}, },
@@ -242,6 +275,9 @@
} }
], ],
"name": "wow", "name": "wow",
"parameters": {
"delay_milliseconds_before_open_device": 1000
},
"selected": false, "selected": false,
"simple_modifications": [ "simple_modifications": [
{ {
@@ -264,7 +300,8 @@
"virtual_hid_keyboard": { "virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 0, "caps_lock_delay_milliseconds": 0,
"country_code": 0, "country_code": 0,
"keyboard_type": "ansi" "keyboard_type": "ansi",
"mouse_key_xy_scale": 100
} }
} }
] ]

44
macos
View File

@@ -428,27 +428,27 @@ defaults write com.tapbots.TweetbotMac OpenURLsDirectly -bool true
############################################################################### ###############################################################################
for app in "Activity Monitor" \ for app in "Activity Monitor" \
"Address Book" \ "Address Book" \
"Calendar" \ "Calendar" \
"cfprefsd" \ "cfprefsd" \
"Contacts" \ "Contacts" \
"Dock" \ "Dock" \
"Finder" \ "Finder" \
"Google Chrome Canary" \ "Google Chrome Canary" \
"Google Chrome" \ "Google Chrome" \
"Mail" \ "Mail" \
"Messages" \ "Messages" \
"Opera" \ "Opera" \
"Photos" \ "Photos" \
"Safari" \ "Safari" \
"SizeUp" \ "SizeUp" \
"Spectacle" \ "Spectacle" \
"SystemUIServer" \ "SystemUIServer" \
"Terminal" \ "Terminal" \
"Transmission" \ "Transmission" \
"Tweetbot" \ "Tweetbot" \
"Twitter" \ "Twitter" \
"iCal"; do "iCal"; do
killall "${app}" &> /dev/null killall "${app}" &> /dev/null
done done
echo "Done. Note that some of these changes require a logout/restart to take effect." echo "Done. Note that some of these changes require a logout/restart to take effect."

View File

@@ -16,6 +16,9 @@ set -g visual-activity off
# Renumber windows when a window is closed # Renumber windows when a window is closed
set -g renumber-windows on set -g renumber-windows on
# https://github.com/tmux/tmux/issues/353#issuecomment-265154018
set -g focus-events off
# => Theme # => Theme
set -g status-style fg=white,bg=black set -g status-style fg=white,bg=black
set -g window-status-current-style fg=black,bg=white,bold set -g window-status-current-style fg=black,bg=white,bold

View File

@@ -60,7 +60,8 @@ Plug 'benmills/vimux'
Plug 'janko-m/vim-test' Plug 'janko-m/vim-test'
Plug 'dyng/ctrlsf.vim' Plug 'dyng/ctrlsf.vim'
Plug 'terryma/vim-expand-region' Plug 'terryma/vim-expand-region'
Plug 'terryma/vim-multiple-cursors' " Plug 'terryma/vim-multiple-cursors'
Plug 'mg979/vim-visual-multi'
Plug 'bogado/file-line' Plug 'bogado/file-line'
Plug 'vim-utils/vim-interruptless' Plug 'vim-utils/vim-interruptless'
Plug 'w0rp/ale' Plug 'w0rp/ale'
@@ -71,10 +72,10 @@ Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
" ======== Appearence =================================== " ======== Appearence ===================================
Plug 'altercation/vim-colors-solarized' " Plug 'altercation/vim-colors-solarized'
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
Plug 'mhinz/vim-startify'
Plug 'machakann/vim-highlightedyank' Plug 'machakann/vim-highlightedyank'
Plug 'arcticicestudio/nord-vim'
" ======== tpope <3 ==================================== " ======== tpope <3 ====================================
@@ -155,76 +156,12 @@ function! CloseNERDTree()
endif endif
endfunction endfunction
function! TweakSolarized()
hi! link txtBold Identifier
hi! link rubyControl Statement
hi! link rspecGroupMethods rubyControl
hi! link rspecMocks Identifier
hi! link rspecKeywords Identifier
hi! link rubyLocalVariableOrMethod Normal
hi! link rubyStringDelimiter Constant
hi! link rubyString Constant
hi! link rubyAccess Todo
hi! link rubySymbol Identifier
hi! link rubyPseudoVariable Type
hi! link rubyRailsARAssociationMethod Title
hi! link rubyRailsARValidationMethod Title
hi! link rubyRailsMethod Title
hi! link rubyDoBlock Normal
hi! link MatchParen DiffText
hi! link javascriptFuncName Type
hi! link javascriptFunction Statement
hi! link javascriptThis Statement
hi! link javascriptParens Normal
hi! link NERDTreeFile Constant
hi! link NERDTreeDir Identifier
hi! link Visual DiffChange
hi! link Search DiffAdd
hi! link Delimiter Identifier
hi! link rDollar Identifier
hi! link vimMapModKey Operator
hi! link vimNotation Label
hi! link htmlLink Include
" Line numbers
hi LineNR ctermfg=23 ctermbg=8
hi CursorLineNR ctermfg=23 ctermbg=8
" Hide ~ at the bottom
hi NonText cterm=NONE ctermfg=8
" Status Line
hi StatusLine cterm=NONE ctermbg=0 ctermfg=166
hi StatusLineNC cterm=NONE ctermbg=0 ctermfg=0
" Misc adjustments
hi WildMenu cterm=NONE ctermbg=0 ctermfg=7
hi Pmenu cterm=NONE ctermbg=0 ctermfg=25
hi PmenuSel cterm=NONE ctermbg=0 ctermfg=7
hi PmenuSbar cterm=NONE ctermbg=0 ctermfg=7
hi PmenuThumb cterm=NONE ctermbg=0 ctermfg=7
hi SpecialKey cterm=NONE ctermbg=8 ctermfg=1
hi CtrlPLinePre cterm=NONE ctermbg=8 ctermfg=8
hi Folded cterm=NONE ctermbg=0 ctermfg=4
hi TabLine cterm=NONE ctermbg=0 ctermfg=244
hi TabLineFill cterm=NONE ctermbg=0 ctermfg=4
hi TabLineSel cterm=NONE ctermbg=0 ctermfg=166
hi VertSplit cterm=NONE ctermbg=0 ctermfg=0
" GitGutter sign column adjustments
hi GitGutterAdd ctermbg=8 ctermfg=2
hi GitGutterChange ctermbg=8 ctermfg=3
hi GitGutterDelete ctermbg=8 ctermfg=1
hi GitGutterChangeDelete ctermbg=8 ctermfg=3
endfunction
" ======================================================== " ========================================================
" -> Plugin settings " -> Plugin settings
" ======================================================== " ========================================================
" Enable matchit.vim " Enable matchit.vim
runtime macros/matchit.vim runtime macros/matchit.vim
@@ -305,14 +242,14 @@ let g:fzf_layout = { 'window': { 'width': 0.3, 'height': 0.6, 'border': 'sharp'
let g:fzf_colors = let g:fzf_colors =
\ { 'fg': ['fg', 'Normal'], \ { 'fg': ['fg', 'Normal'],
\ 'bg': ['bg', 'Normal'], \ 'bg': ['bg', 'Normal'],
\ 'hl': ['fg', 'Normal'], \ 'hl': ['fg', 'Comment'],
\ 'fg+': ['fg', 'Normal'], \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
\ 'bg+': ['bg', 'Normal'], \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'],
\ 'hl+': ['fg', 'Normal'], \ 'hl+': ['fg', 'Statement'],
\ 'info': ['fg', 'PreProc'], \ 'info': ['fg', 'PreProc'],
\ 'border': ['fg', 'Ignore'], \ 'border': ['fg', 'Ignore'],
\ 'prompt': ['fg', 'Conditional'], \ 'prompt': ['fg', 'Conditional'],
\ 'pointer': ['fg', 'Identifier'], \ 'pointer': ['fg', 'Exception'],
\ 'marker': ['fg', 'Keyword'], \ 'marker': ['fg', 'Keyword'],
\ 'spinner': ['fg', 'Label'], \ 'spinner': ['fg', 'Label'],
\ 'header': ['fg', 'Comment'] } \ 'header': ['fg', 'Comment'] }
@@ -343,35 +280,6 @@ let g:gist_show_privates = 1
let g:vroom_use_vimux = 1 let g:vroom_use_vimux = 1
" --- vim-startify
let g:startify_relative_path = 0
let g:startify_files_number = 5
let g:startify_session_persistence = 1
let g:startify_session_autoload = 1
let g:startify_session_delete_buffers = 1
let g:startify_enable_special = 1
let g:startify_change_to_vcs_root = 1
let g:startify_show_sessions = 1
let g:startify_list_order =
\ [
\ [ ' > Recent: ' ],
\ 'dir',
\ [ ' > Bookmarks: ' ],
\ 'bookmarks'
\ ]
let g:startify_skiplist =
\ [
\ 'COMMIT_EDITMSG',
\ $VIMRUNTIME .'/doc',
\ 'bundle/.*/doc',
\ '\.vimgolf',
\ ]
let g:startify_custom_indices = [ '1', '2', '3', '4', '5', 'h', 'd', 'E', 'z' ]
let g:startify_bookmarks = [ '~/', '~/Development', '~/.vimrc', '~/.zshrc' ]
let g:startify_custom_footer = [ '', ' All work and no play makes Jack a dull boy', '' ]
let g:startify_custom_header = []
" ======================================================== " ========================================================
@@ -383,31 +291,30 @@ if has("autocmd")
au filetype help nnoremap <buffer><BS> <c-T> au filetype help nnoremap <buffer><BS> <c-T>
au filetype help set nonumber au filetype help set nonumber
" au filetype markdown nnoremap <silent> <leader><leader> :MarkdownPreview<CR>
au BufNewFile,BufRead Capfile,Gemfile,Vagrantfile setl ft=ruby au BufNewFile,BufRead Capfile,Gemfile,Vagrantfile setl ft=ruby
au BufNewFile,BufRead *.rabl,*.jbuilder setl ft=ruby au BufNewFile,BufRead *.rabl,*.jbuilder setl ft=ruby
au BufNewFile,BufRead *.docker setl ft=Dockerfile
au BufNewFile,BufRead *.phtml setl ft=html
" au BufNewFile,BufRead *.md,*.markdown setl ft=ghmarkdown
" Hide statusline " Hide statusline
autocmd! FileType fzf autocmd! FileType fzf
autocmd FileType fzf set laststatus=0 noshowmode noruler autocmd FileType fzf set laststatus=0 noshowmode noruler
\| autocmd BufLeave <buffer> set laststatus=2 showmode ruler \| autocmd BufLeave <buffer> set laststatus=2 showmode ruler
" NB: ! cursorline seems to be slow https://github.com/tmux/tmux/issues/353#issuecomment-364588634
" Only show cursorline in the current window and in normal mode. " Only show cursorline in the current window and in normal mode.
augroup cline " augroup cline
au! " au!
au WinLeave,InsertEnter * set nocursorline " au WinLeave,InsertEnter * set nocursorline
au WinEnter,InsertLeave * set cursorline " au WinEnter,InsertLeave * set cursorline
augroup END " augroup END
" Close tab if only NERDTree left " Close tab if only NERDTree left
au WinEnter * call CloseNERDTree() au WinEnter * call CloseNERDTree()
" Apply solarized tweak " Resize when the host window resized
au ColorScheme solarized call TweakSolarized() " NB: I remember it being laggy or something
" There was some curlpit here don't remember
au VimResized * wincmd =
" Prevent CtrlP or NERDTree from opening a split in Startify " Prevent CtrlP or NERDTree from opening a split in Startify
au User Startified setl buftype= au User Startified setl buftype=
@@ -420,12 +327,12 @@ endif
" ======================================================== " ========================================================
" Solarized is love solarized is life " Solarized is love solarized is life
colorscheme solarized " colorscheme solarized
colorscheme nord
set background=dark set background=dark
set guifont=Source\ Code\ Pro:h16 set guifont=Fira\ Code\ Medium:h18
if has('gui_running') if has('gui_running')
set guifont=Menlo:h14
set guioptions-=T " Remove toolbar set guioptions-=T " Remove toolbar
set guioptions-=m " Remove menubar set guioptions-=m " Remove menubar
set guioptions+=LlRrb " Remove set guioptions+=LlRrb " Remove
@@ -462,8 +369,9 @@ set lazyredraw
set tabline=%!Tabline() set tabline=%!Tabline()
" show status even for single buffer displayed " show status even for single buffer displayed
set laststatus=2 set laststatus=2
" highlight current line " NB: cursorline seems to slow down things quite a bit
set cursorline " highlight current line https://github.com/tmux/tmux/issues/353#issuecomment-364588634
" set cursorline
" number rows " number rows
set number set number
" disable welcome message " disable welcome message