From e8626f8108abd5235cbaadbeee2d2f74cd826643 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Mon, 7 Feb 2022 09:57:31 -0800
Subject: [PATCH] config fixes for fish on fedora

---
 .config/fish/conf.d/virtualfish-loader.fish | 4 ++--
 .config/fish/config.fish                    | 3 ++-
 .vimrc                                      | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.config/fish/conf.d/virtualfish-loader.fish b/.config/fish/conf.d/virtualfish-loader.fish
index eee0754..1bfbcb8 100644
--- a/.config/fish/conf.d/virtualfish-loader.fish
+++ b/.config/fish/conf.d/virtualfish-loader.fish
@@ -1,4 +1,4 @@
 set -g VIRTUALFISH_VERSION 2.5.4
-set -g VIRTUALFISH_PYTHON_EXEC /bin/python
-source /usr/lib/python3.10/site-packages/virtualfish/virtual.fish
+set -g VIRTUALFISH_PYTHON_EXEC /usr/bin/python3
+source /usr/local/lib/python3.10/site-packages/virtualfish/virtual.fish
 emit virtualfish_did_setup_plugins
\ No newline at end of file
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index bb445b0..a271bc3 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,5 +1,6 @@
-set PATH ~/bin ~/.go/bin /bin /sbin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin ~/.cabal/bin /usr/lib/go/bin ~/.gem/ruby/1.9.1/bin $PATH
+set PATH ~/bin ~/.go/bin ~/.cargo/bin /bin /sbin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin ~/.cabal/bin /usr/lib/go/bin ~/.gem/ruby/1.9.1/bin $PATH
 
 set fish_greeting ""
+set EDITOR vi
 
 . ~/.config/fish/fish_aliases.fish
diff --git a/.vimrc b/.vimrc
index 47c70c4..651f0a7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -205,6 +205,7 @@ Plug 'onsails/lspkind-nvim'
 Plug 'nvim-lua/popup.nvim'
 Plug 'nvim-lua/plenary.nvim'
 Plug 'nvim-telescope/telescope.nvim'
+Plug 'sindrets/diffview.nvim'
 
 Plug 'kyazdani42/nvim-web-devicons' " for file icons
 "Plug 'kyazdani42/nvim-tree.lua'
@@ -260,7 +261,7 @@ nnoremap <silent> gy   <cmd>lua vim.lsp.buf.type_definition()<CR>
 nnoremap <silent> K     <cmd>lua vim.lsp.buf.hover()<CR>
 nnoremap <silent> gs <cmd>lua vim.lsp.buf.signature_help()<CR>
 nnoremap <silent> gR <cmd>lua vim.lsp.buf.rename()<CR>
-"nnoremap <silent> gr    <cmd>lua vim.lsp.buf.references()<CR>
+nnoremap <silent> gr    <cmd>lua vim.lsp.buf.references()<CR>
 nnoremap <silent> gr   <cmd>lua require('telescope.builtin').lsp_references({initial_mode = "normal"})<cr>
 nnoremap <silent> g0    <cmd>lua vim.lsp.buf.document_symbol()<CR>
 nnoremap <silent> gW    <cmd>lua vim.lsp.buf.workspace_symbol()<CR>