.ideavimrc

@@ -1,29 +1,28 @@
+set idearefactormode=visual
 set ignorecase
 set incsearch
+set noerrorbells
 set number
 set relativenumber
-set scrolloff=999
+set scrolloff=12
 set showcmd
 set showmode
-set sidescrolloff=999
+set sidescrolloff=48
 set smartcase
 set virtualedit=onemore
 set visualbell
 
-set ideaglobalmode
+set acejump
+set argtextobj
+set exchange
+set highlightedyank
 set ideajoin
-set idearefactormode=visual
+set matchit
-
+set multiple-cursors
-Plug 'argtextobj.vim'
+set ReplaceWithRegister
-Plug 'nerdtree'
+set surround
-Plug 'vim-ReplaceWithRegister'
+set textobj-entire
-Plug 'vim-exchange'
+set textobj-indent
-Plug 'vim-highlightedyank'
-Plug 'vim-indent-object'
-Plug 'vim-matchit'
-Plug 'vim-multiple-cursors'
-Plug 'vim-surround'
-Plug 'vim-textobj-entire'
 
 " http://vimdoc.sourceforge.net/htmldoc/vimindex.html
 
@@ -213,7 +212,6 @@ nmap mv :action IntroduceVariable<CR>
 vmap mv :action IntroduceVariable<CR>
 
 " Actions for custom version of AceJump
-set acejump
 map <Space><Space> :action AceVimAction_JumpAllEditors<CR>
 map <Space>f :action AceVimAction_JumpForward<CR>
 map <Space>F :action AceVimAction_JumpBackward<CR>

.vimrc

@@ -12,10 +12,10 @@ set noshowcmd
 set noshowmode
 set number
 set relativenumber
-set scrolloff=999
+set scrolloff=12
 set shiftwidth=0
 set showmatch
-set sidescrolloff=999
+set sidescrolloff=48
 set smartcase
 set tabstop=4
 set wildmenu
@@ -53,12 +53,6 @@ map § %
 nnoremap <A-b> ge
 nnoremap <A-S-b> gE
 
-" Navigate soft-wrapped lines
-nnoremap <expr> j v:count ? 'j' : 'gj'
-vnoremap <expr> j v:count ? 'j' : 'gj'
-nnoremap <expr> k v:count ? 'k' : 'gk'
-vnoremap <expr> k v:count ? 'k' : 'gk'
-
 " Navigate to indents
 nnoremap J +
 vnoremap J +