Skip to content

Commit 55f3a13

Browse files
committed
updates on fresh install on a new computer
1 parent 10d9093 commit 55f3a13

File tree

7 files changed

+4551
-4352
lines changed

7 files changed

+4551
-4352
lines changed

conf/sublime-text-3/Packages/User/Package Control.merged-ca-bundle

Lines changed: 4237 additions & 4237 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"bootstrapped": true,
33
"in_process_packages":
44
[
5+
"Autoprefixer"
56
],
67
"installed_packages":
78
[

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"highlight_modified_tabs": true,
1414
"ignored_packages":
1515
[
16+
"Autoprefixer"
1617
],
1718
"indent_guide_options":
1819
[

init/30_osx_homebrew_casks.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ brew cask info this-is-somewhat-annoying 2>/dev/null
3030

3131
# Homebrew casks
3232
casks=(
33+
1password
34+
firefox
3335
# betterzipql
3436
# Color pickers
3537
# colorpicker-developer
@@ -65,7 +67,7 @@ casks=(
6567
fantastical
6668
#fastscripts
6769
github
68-
google-drive-file-stream
70+
#google-drive-file-stream
6971
growlnotify
7072
handbrake
7173
imageoptim
@@ -130,5 +132,5 @@ if (( ${#casks[@]} > 0 )); then
130132
for cask in "${casks[@]}"; do
131133
brew cask install $cask
132134
done
133-
brew cask cleanup
135+
brew cleanup
134136
fi

link/.tmux.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ bind h split-window -h -c "#{pane_current_path}"
8888

8989
run-shell "powerline-daemon -q"
9090
# run-shell 'run-shell "tmux source-file $(python3 -m site --user-site)/powerline/bindings/tmux/powerline.conf"'
91-
source "/Users/ezbon.jacob/Library/Python/3.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf"
91+
source "/usr/local/lib/python3.8/site-packages/powerline/bindings/tmux/powerline.conf"
9292

9393
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
9494
run -b '~/.tmux/plugins/tpm/tpm'

link/.vim/autoload/plug.vim

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2271,7 +2271,7 @@ endfunction
22712271

22722272
function! s:rm_rf(dir)
22732273
if isdirectory(a:dir)
2274-
call s:system(s:is_win
2274+
return s:system(s:is_win
22752275
\ ? 'rmdir /S /Q '.plug#shellescape(a:dir)
22762276
\ : ['rm', '-rf', a:dir])
22772277
endif
@@ -2355,6 +2355,7 @@ endfunction
23552355
function! s:delete(range, force)
23562356
let [l1, l2] = a:range
23572357
let force = a:force
2358+
let err_count = 0
23582359
while l1 <= l2
23592360
let line = getline(l1)
23602361
if line =~ '^- ' && isdirectory(line[2:])
@@ -2363,11 +2364,22 @@ function! s:delete(range, force)
23632364
let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1)
23642365
let force = force || answer > 1
23652366
if answer
2366-
call s:rm_rf(line[2:])
2367+
let err = s:rm_rf(line[2:])
23672368
setlocal modifiable
2368-
call setline(l1, '~'.line[1:])
2369-
let s:clean_count += 1
2370-
call setline(4, printf('Removed %d directories.', s:clean_count))
2369+
if empty(err)
2370+
call setline(l1, '~'.line[1:])
2371+
let s:clean_count += 1
2372+
else
2373+
delete _
2374+
call append(l1 - 1, s:format_message('x', line[1:], err))
2375+
let l2 += len(s:lines(err))
2376+
let err_count += 1
2377+
endif
2378+
let msg = printf('Removed %d directories.', s:clean_count)
2379+
if err_count > 0
2380+
let msg .= printf(' Failed to remove %d directories.', err_count)
2381+
endif
2382+
call setline(4, msg)
23712383
setlocal nomodifiable
23722384
endif
23732385
endif

0 commit comments

Comments
 (0)