diff --git a/.gitmodules b/.gitmodules
index dda1b189..f0ebb627 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -103,3 +103,9 @@
 [submodule ".vim/pack/alpha/start/gundo.vim"]
 	path = .vim/pack/alpha/start/gundo.vim
 	url = git@github.com:sjl/gundo.vim.git
+[submodule ".vim/pack/alpha/start/vim-operator-flashy"]
+	path = .vim/pack/alpha/start/vim-operator-flashy
+	url = git@github.com:haya14busa/vim-operator-flashy.git
+[submodule ".vim/pack/alpha/start/vim-operator-user"]
+	path = .vim/pack/alpha/start/vim-operator-user
+	url = git@github.com:kana/vim-operator-user.git
diff --git a/.vim/pack/alpha/start/vim-operator-flashy b/.vim/pack/alpha/start/vim-operator-flashy
new file mode 160000
index 00000000..b24673a9
--- /dev/null
+++ b/.vim/pack/alpha/start/vim-operator-flashy
@@ -0,0 +1 @@
+Subproject commit b24673a9b0d5d60b26d202deb13d4ebf90d7a2ae
diff --git a/.vim/pack/alpha/start/vim-operator-user b/.vim/pack/alpha/start/vim-operator-user
new file mode 160000
index 00000000..c3dfd41c
--- /dev/null
+++ b/.vim/pack/alpha/start/vim-operator-user
@@ -0,0 +1 @@
+Subproject commit c3dfd41c1ed516b4b901c97562e644de62c367aa
diff --git a/.vimrc b/.vimrc
index de27d6ec..5f35b845 100644
--- a/.vimrc
+++ b/.vimrc
@@ -11,7 +11,7 @@ noremap <right> <nop>
 
 nnoremap ' `
 nnoremap ` '
-nnoremap Y y$
+" nnoremap Y y$
 nnoremap <leader>/ :nohlsearch<cr>
 
 " don't unindent lines starting with #
@@ -179,4 +179,8 @@ let g:rainbow_active = 0
 " gundo
 nnoremap <leader>u :GundoToggle<CR>
 
+" operator-flashy
+map y <Plug>(operator-flashy)
+nmap Y <Plug>(operator-flashy)$
+
 " }}}