From 1114ddf9477244732ba33062876b72ddfc8714e9 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Tue, 6 Dec 2022 16:02:54 -0800
Subject: [PATCH] update vim plugins

---
 .config/fish/conf.d/virtualfish-loader.fish | 16 ++++------------
 .config/fish/config.fish                    |  2 +-
 .config/fish/fish_aliases.fish              |  2 +-
 .vim/nvim.lua                               | 17 ++++++++++++-----
 .vimrc                                      | 12 +++++++-----
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.config/fish/conf.d/virtualfish-loader.fish b/.config/fish/conf.d/virtualfish-loader.fish
index 562c018..c0790b2 100644
--- a/.config/fish/conf.d/virtualfish-loader.fish
+++ b/.config/fish/conf.d/virtualfish-loader.fish
@@ -1,12 +1,4 @@
-set -g VIRTUALFISH_VERSION 2.5.4
-set -g VIRTUALFISH_PYTHON_EXEC /bin/python
-
-set vfpaths /usr/local/lib/python3.10/site-packages/virtualfish/virtual.fish /usr/lib/python3.10/site-packages/virtualfish/virtual.fish /usr/lib/python3.9/site-packages/virtualfish/virtual.fish 
-
-for vfpath in vfpaths
-  if test -f $vfpath
-    source $vfpath
-    emit virtualfish_did_setup_plugins
-    break
-  end
-end
+set -g VIRTUALFISH_VERSION 2.5.5
+set -g VIRTUALFISH_PYTHON_EXEC /usr/bin/python
+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 ce0e409..85134a2 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,4 +1,4 @@
-set PATH ~/bin ~/.local/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 PATH ~/bin ~/.local/bin ~/.go/bin ~/.cargo/bin /bin /sbin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin ~/.cabal/bin ~/.ghcup/bin /usr/lib/go/bin ~/.gem/ruby/1.9.1/bin $PATH
 
 if command -vq flatpak
     set -ga fish_user_paths ~/.local/share/flatpak/exports/bin /var/lib/flatpak/exports/bin
diff --git a/.config/fish/fish_aliases.fish b/.config/fish/fish_aliases.fish
index ec2b922..1004a49 100644
--- a/.config/fish/fish_aliases.fish
+++ b/.config/fish/fish_aliases.fish
@@ -52,4 +52,4 @@ alias srsly="orly -s"
 #Funnies
 alias whothefuckis='finger'
 alias whoami="echo 24601"
-
+alias yeet="rm -rf"
diff --git a/.vim/nvim.lua b/.vim/nvim.lua
index 0cd4e9b..522e167 100644
--- a/.vim/nvim.lua
+++ b/.vim/nvim.lua
@@ -35,6 +35,7 @@ nvim_lsp.rust_analyzer.setup({
 })
 nvim_lsp.gopls.setup({ on_attach = on_attach })
 nvim_lsp.pyright.setup({ on_attach = on_attach })
+
 nvim_lsp.clangd.setup({ on_attach = on_attach })
 nvim_lsp.tsserver.setup {
   cmd = { "/home/barak/.yarn/bin/typescript-language-server", "--stdio" }
@@ -42,6 +43,9 @@ nvim_lsp.tsserver.setup {
 nvim_lsp.vuels.setup {
   cmd = { "/home/barak/.yarn/bin/vls" }
 }
+nvim_lsp.hls.setup {
+  cmd = { "haskell-language-server-wrapper", "--lsp" }
+}
 
 nvim_lsp.svelte.setup {
   cmd = { "/home/barak/.yarn/bin/svelteserver", "--stdio" }
@@ -397,14 +401,17 @@ require 'nvim-treesitter.configs'.setup {
   }
 }
 
-require "nvim-treesitter.highlight".set_custom_captures {
-  -- Highlight the @foo.bar capture group with the "Identifier" highlight group.
-  --     ["foo.bar"] = "Identifier",
-  ["generic_type_param"] = "TSCGenericTypeParam",
-}
+--require "nvim-treesitter.highlight".set_custom_captures {
+---- Highlight the @foo.bar capture group with the "Identifier" highlight group.
+----     ["foo.bar"] = "Identifier",
+--["generic_type_param"] = "TSCGenericTypeParam",
+--}
 
 require "neogen".setup {}
 
+require('leap').set_default_keymaps()
+require("flit").setup {}
+
 --
 -- Helper functions for my own grepping commands.
 --
diff --git a/.vimrc b/.vimrc
index 9f8c7a5..b4f5e7f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -231,7 +231,9 @@ Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'nvim-treesitter/playground'
 
 "Plug 'ggandor/lightspeed.nvim'
-Plug 'justinmk/vim-sneak'
+"Plug 'justinmk/vim-sneak'
+Plug 'ggandor/leap.nvim'
+Plug 'ggandor/flit.nvim'
 Plug 'simrat39/rust-tools.nvim'
 
 Plug 'Shougo/unite.vim'
@@ -395,10 +397,10 @@ let g:UseGooglePythonSettings = 0
 
 " * sneak.vim
 "let g:sneak#label = 1
-map f <Plug>Sneak_f
-map F <Plug>Sneak_F
-map t <Plug>Sneak_t
-map T <Plug>Sneak_T
+"map f <Plug>Sneak_f
+"map F <Plug>Sneak_F
+"map t <Plug>Sneak_t
+"map T <Plug>Sneak_T
 
 " * Jedi
 let g:jedi#goto_command = "gd"