diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index 6b120b2..f4e6110 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -7,7 +7,6 @@ map <leader>gv <esc>:vsplit<bar>:GoAlternate!<cr>
 map <leader>gs <esc>:split<bar>:GoAlternate!<cr>
 map <leader>gt <esc>:w <bar> :GoTest<cr>
 map <leader>gf <esc>:w <bar> :GoTestFunc<cr>
-nnoremap <silent> gd :GoToDefinition
 
 nnoremap <silent> dr :GoDebugBreakpoint<cr>
 nnoremap <silent> d! :GoDebugStart<cr>
diff --git a/vimrc b/vimrc
index dcdea79..954e4df 100644
--- a/vimrc
+++ b/vimrc
@@ -87,6 +87,8 @@ set viewoptions-=curdir
 
 " Key mappings:
 nmap <silent> ,/ :nohlsearch<CR>
+nnoremap j gj
+nnoremap k gk
 map <up> <nop>
 map <down> <nop>
 map <left> <nop>
@@ -195,11 +197,12 @@ nmap ]l <Plug>(ale_next_wrap_error)
 
 nmap <leader>ad :ALEDetail<cr>
 map <Leader>g :ALEGoToDefinition<CR>
-map <Leader>gt :ALEGoToTypeDefinition<CR>
 map <Leader>f :ALEFindReferences<CR>
 map <Leader>fv :ALEFindReferences -vsplit<CR>
 map <Leader>fh :ALEFindReferences -split<CR>
 map <Leader>ft :ALEFindReferences -tab<CR>
+nnoremap <silent> gd :GoToDefinition
+nnoremap <silent> gD :GoToTypeDefinition
 command GoToDefinition ALEGoToDefinition
 command GoToTypeDefinition ALEGoToTypeDefinition
 command FindReferences ALEFindReferences
@@ -240,6 +243,7 @@ let g:ale_linters = {
       \ 'rust': ['analyzer'],
       \ 'css': ['stylelint'],
       \ 'python': ['pyls'],
+      \ 'ruby': ['rubocop'],
       \ }
 let g:ale_fixers = {
       \ '*': ['remove_trailing_lines', 'trim_whitespace'],
@@ -248,6 +252,7 @@ let g:ale_fixers = {
       \ 'go': [],
       \ 'css': ['stylelint'],
       \ 'python': ['autopep8'],
+      \ 'ruby': ['rubocop'],
       \ }
 
 " load internal plugins: