Skip to content

Commit

Permalink
spring cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
ftf committed Apr 14, 2017
1 parent 55c94cc commit a9a1494
Show file tree
Hide file tree
Showing 32 changed files with 2,550 additions and 117 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ privatedots/*

#submodules

# vim-plugins
vim.symlink/plugged/*

# vim temp files
vimtmp/*

Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ gem 'tmuxinator'
gem 'trollop'
gem 'wirble'
gem 'mvg-live'
gem 'mailcatcher'
15 changes: 3 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ How to use this:
./dotey privatedots delete
Delete your private dotfiles from this computer
./dotey vimupdate
Initialize or update all vim bundles
```

Installation:
Expand Down Expand Up @@ -117,12 +114,7 @@ share your ftp or irssi passwords with everyone out there.

Add VIM plugins
---------------
In your .dotfiles directory execute:

```
git submodule add --force https://github.com/$vimbundle.git vim.symlink/bundle/vim-$bundlename
```
Thanks to pathogen the newly downloaded bundle will be availabe with the next start of vim and
Launch vim and run :PlugInstall thanks to the awesome [vim-plug]:(https://github.com/junegunn/vim-plug)

Some VIM tips
-------------
Expand All @@ -145,10 +137,9 @@ Some VIM tips
- Toggle vim hardmode with ```Space + k```
(Disables all for cursor keys and ```h,j,k,l```)

Submodules
Vim Plugins
----------
Right now all git submodules pulled in are vim bundles.
- [Pathogen](https://github.com/tpope/vim-pathogen)
All vim plugins that are pulled in right now:
- [You complete me](https://github.com/Valloric/YouCompleteMe)
- [GitGutter](https://github.com/airblade/vim-gitgutter)
- [Airline](https://github.com/bling/vim-airline.git)
Expand Down
33 changes: 0 additions & 33 deletions dotey
Original file line number Diff line number Diff line change
Expand Up @@ -208,32 +208,6 @@ function delprivatedots() {
rm privatedots/*
}

function vimupdate() {
if `type git >/dev/null 2>&1`; then
OPWD=${PWD}
cd vim.symlink/bundle
vimupdates=`git submodule update --init --recursive`
vimupdates=`echo "$vimupdates" | awk '{ print substr($3, 2, length($3)-3) }'`
if [ `echo "$vimupdates" | sed '/^\s*$/d' | wc -l` -gt 0 ]; then
while read -r line; do
echo -e "$GREEN-$COLORRESET $line"
done <<< "$vimupdates"
# if there is a youcompleteme update, compile the binary again
if [ `echo "$vimupdates" | grep "youcompleteme" | wc -l` -gt 0 ]; then
cd vim-youcompleteme
echo -e "$YELLOW-$COLORRESET Compiling youcompleteme binaries, this may take a while"
./install.sh >/dev/null
echo -e "$GREEN-$COLORRESET Updated: youcompleteme binaries"
fi
else
echo -e "$GREEN-$COLORRESET No vim submodule bundles update available"
fi
cd $OPWD
else
echo -e "$RED-$COLORRESET you need git installed to use this function"
fi
}

function usage() {
cat << EOF
How to use this:
Expand Down Expand Up @@ -262,10 +236,6 @@ How to use this:
./dotey privatedots delete
Delete your private dotfiles from this computer
./dotey vimupdate
Initialize or update all vim bundles
EOF
}

Expand Down Expand Up @@ -301,9 +271,6 @@ case $1 in
;;
esac
;;
vimupdate)
vimupdate
;;
*)
usage
;;
Expand Down
6 changes: 3 additions & 3 deletions tmux.conf.symlink
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ setw -g monitor-activity on
set -g visual-activity on

# aggressive window resizing
setw -g aggressive-resize on
#setw -g aggressive-resize on

# start window numbering at 1
set -g base-index 1
Expand Down Expand Up @@ -57,7 +57,7 @@ set-window-option -g window-status-format '#I: #W'
set-window-option -g window-status-current-format '#I: #W'

# statusline
set -g status-utf8 on
#set -g status-utf8 on
set -g status-left-length 30
set -g status-right-length 60
set -g status-justify centre
Expand All @@ -68,7 +68,7 @@ set -g status-right "#[fg=green,bright][#[fg=blue,bright]#(uptime | awk -F'[a-z]
set -g history-limit 5000

# More straight forward key bindings for splitting
unbind %
#unbind %
bind H split-window -h
unbind '"'
bind V split-window -v
Expand Down
Loading

0 comments on commit a9a1494

Please sign in to comment.