diff --git a/users/kat/base/vim/vimrc.nix b/users/kat/base/vim/vimrc.nix
index dda715dc..0d3097aa 100644
--- a/users/kat/base/vim/vimrc.nix
+++ b/users/kat/base/vim/vimrc.nix
@@ -56,6 +56,9 @@
     set relativenumber
     set completeopt=longest,menuone
     
+    command Spaces set expandtab
+    command Tabs set noexpandtab
+
   inoremap <silent><expr> <TAB>
         \ pumvisible() ? "\<C-n>" :
         \ <SID>check_back_space() ? "\<TAB>" :
@@ -76,7 +79,7 @@
 
   " Make <CR> auto-select the first completion item and notify coc.nvim to
   " format on enter, <cr> could be remapped by other vim plugin
-  inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
+  noremap <silent><expr> <C-cr> pumvisible() ? coc#_select_confirm()
                                 \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
 
   " Use `[g` and `]g` to navigate diagnostics