diff --git a/.tmux.conf b/.tmux.conf
index f71afa0145d79466560b68bc958d21f76424a9e6..4739600f77e1a4046c4876d874315b6d62ede3ec 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -5,8 +5,15 @@ set-option -g set-titles on
 set-option -sg escape-time 10
 set-option -g mouse off
 
-set -g prefix M-x
-bind M-x send-prefix
+if-shell "uname | grep -q Linux" {
+	set -g prefix M-x
+	bind M-x send-prefix
+}
+
+if-shell "uname | grep -q Darwin" {
+	set -g prefix M-z
+	bind M-z send-prefix
+}
 
 set -g base-index 1
 set-window-option -g pane-base-index 1
diff --git a/.vimrc b/.vimrc
index b2a36db9a2d085983a92b35dee00d6b80c4d91c9..37f9e69a56eb74ba8b709f418e49355dce844a71 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,7 @@
 call plug#begin()
   Plug 'tpope/vim-sensible'
   Plug 'tpope/vim-commentary'
+  Plug 'tpope/vim-unimpaired'
   Plug 'airblade/vim-gitgutter'
   Plug 'ctrlpvim/ctrlp.vim'
   Plug 'dense-analysis/ale'
@@ -22,6 +23,11 @@ nnoremap <C-k> :ALEHover<cr>
 nnoremap <C-j> :ALEDetail<cr>
 nnoremap <C-r> :!sh .vim<CR>
 nnoremap <Leader>r :let @/ = ''<CR>
+
+nmap <C-Up> [e
+nmap <C-Down> ]e
+vmap <C-Up> [egv
+vmap <C-Down> ]egv
 
 nmap <silent> gr :ALEFindReferences<cr>
 nmap <silent> gd :ALEGoToDefinition<cr>