diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 9c0e27b..592c0f1 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -34,6 +34,17 @@ au FileChangedShell * checktime
 au CursorHold * checktime
 au CursorHoldI * checktime
 
+" Line numnbmers are cool
+set number
+" Always show the signcolumn, otherwise it would shift the text each time
+" diagnostics appear/become resolved.
+if has("nvim-0.5.0") || has("patch-8.1.1564")
+  " Recently vim can merge signcolumn and number column into one
+  set signcolumn=number
+else
+  set signcolumn=yes
+endif
+
 " Turn off polyglot for some langs so they play nice
 if exists('g:loaded_polyglot')
     let g:polyglot_disabled = ['go', 'rst', 'tla']