Merge branch 'master' of https://gitlab.com/Toric/dotfiles

neovim/.config/nvim/init.vim

@@ -63,9 +63,6 @@ set noswapfile "disables creation of swap files
 	"adds a ruler to the side of the screen
 	set number
 
-	"makes the ruler show how many lines away a given line is from your cursor
-	set relativenumber
-
 	"displays the coordinates of your cursour in the statusbar
 	set ruler
 

zsh/.zshrc

@@ -191,3 +191,13 @@ PROMPT='%F{cyan}[%n@%m]%f%F{red}├────┤%f${vcs_info_msg_0_}
 
 	# export grep settings
 	alias grep="grep $GREP_OPTIONS"
+
+#fzf stuff
+	#zsh key bindings (different distros put these in different places.)
+	source $(find /usr/share -path '*fzf/*key-bindings.zsh')
+	#zsh completions, if it exists.
+	testPath=$(find /usr/share -path '*fzf/*completion.zsh')
+	if test $(echo $testPath | wc -c) -eq 0
+	then
+		source $testPath
+	fi