Skip to content

Commit 4ed22c2

Browse files
committed
some change
1 parent 6ec5782 commit 4ed22c2

File tree

10 files changed

+181
-61
lines changed

10 files changed

+181
-61
lines changed

conf/sublime-text-3/Packages/User/Package Control.sublime-settings

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@
7474
"TrailingSpaces",
7575
"Trimmer",
7676
"Whitespace"
77-
]
77+
],
7878
}

conf/sublime-text-3/Packages/User/Preferences.sublime-settings

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
"translate_tabs_to_spaces": true,
3333
"trim_trailing_white_space_on_save": true,
3434
"vintage_start_in_command_mode": false,
35-
"word_wrap": true
35+
"word_wrap": true,
3636
}

link/.bashrc

+9
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,12 @@ src
3636

3737

3838
alias skip_precommit="SKIP=flake8"
39+
eval "$(/Users/ezbon.jacob/.pyenv/shims/alks-creds --bash-wrapper)"
40+
41+
# tabtab source for packages
42+
# uninstall by removing these lines
43+
[ -f ~/.config/tabtab/__tabtab.bash ] && . ~/.config/tabtab/__tabtab.bash || true
44+
45+
export NVM_DIR="$HOME/.nvm"
46+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
47+
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion

link/.gitignore_global

+6
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,9 @@ tfplan
8686

8787
.classpath
8888
r10k.yaml
89+
90+
venv
91+
.venv
92+
rds.cert
93+
94+
node_modules/

link/.tmux/plugins/tmux-resurrect

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit abbc4fbfc4a51948478d6b05f0c0d554111663a8
1+
Subproject commit 6be2f34b5f06c8a6a23dc3dc835e69c132d58a18

link/.tmux/plugins/tpm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 2afeff1529ec85d0c5ced5ece3714c2220b646a5
1+
Subproject commit 693e5a2a0f6acfd2666882655d5dfd32e8c6c50b

link/.tmux/resurrect/last

-1
This file was deleted.

link/.vim/autoload/plug.vim

+19-6
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ let s:TYPE = {
116116
let s:loaded = get(s:, 'loaded', {})
117117
let s:triggers = get(s:, 'triggers', {})
118118

119+
function! s:is_powershell(shell)
120+
return a:shell =~# 'powershell\(\.exe\)\?$' || a:shell =~# 'pwsh\(\.exe\)\?$'
121+
endfunction
122+
119123
function! s:isabsolute(dir) abort
120124
return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)')
121125
endfunction
@@ -263,7 +267,7 @@ function! s:define_commands()
263267
endif
264268
if has('win32')
265269
\ && &shellslash
266-
\ && (&shell =~# 'cmd\(\.exe\)\?$' || &shell =~# 'powershell\(\.exe\)\?$')
270+
\ && (&shell =~# 'cmd\(\.exe\)\?$' || s:is_powershell(&shell))
267271
return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.')
268272
endif
269273
if !has('nvim')
@@ -503,7 +507,7 @@ if s:is_win
503507
let batchfile = s:plug_tempname().'.bat'
504508
call writefile(s:wrap_cmds(a:cmd), batchfile)
505509
let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0})
506-
if &shell =~# 'powershell\(\.exe\)\?$'
510+
if s:is_powershell(&shell)
507511
let cmd = '& ' . cmd
508512
endif
509513
return [batchfile, cmd]
@@ -935,7 +939,7 @@ function! s:prepare(...)
935939
call s:new_window()
936940
endif
937941

938-
nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr>
942+
nnoremap <silent> <buffer> q :call <SID>close_pane()<cr>
939943
if a:0 == 0
940944
call s:finish_bindings()
941945
endif
@@ -957,6 +961,15 @@ function! s:prepare(...)
957961
endif
958962
endfunction
959963

964+
function! s:close_pane()
965+
if b:plug_preview == 1
966+
pc
967+
let b:plug_preview = -1
968+
else
969+
bd
970+
endif
971+
endfunction
972+
960973
function! s:assign_name()
961974
" Assign buffer name
962975
let prefix = '[Plugins]'
@@ -975,7 +988,7 @@ function! s:chsh(swap)
975988
set shell=sh
976989
endif
977990
if a:swap
978-
if &shell =~# 'powershell\(\.exe\)\?$' || &shell =~# 'pwsh$'
991+
if s:is_powershell(&shell)
979992
let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s'
980993
elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$'
981994
set shellredir=>%s\ 2>&1
@@ -2216,7 +2229,7 @@ function! plug#shellescape(arg, ...)
22162229
let script = get(opts, 'script', 1)
22172230
if shell =~# 'cmd\(\.exe\)\?$'
22182231
return s:shellesc_cmd(a:arg, script)
2219-
elseif shell =~# 'powershell\(\.exe\)\?$' || shell =~# 'pwsh$'
2232+
elseif s:is_powershell(shell)
22202233
return s:shellesc_ps1(a:arg)
22212234
endif
22222235
return s:shellesc_sh(a:arg)
@@ -2268,7 +2281,7 @@ function! s:system(cmd, ...)
22682281
return system(a:cmd)
22692282
endif
22702283
let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})'))
2271-
if &shell =~# 'powershell\(\.exe\)\?$'
2284+
if s:is_powershell(&shell)
22722285
let cmd = '& ' . cmd
22732286
endif
22742287
else

0 commit comments

Comments
 (0)