From 1323d4bf8a6f0cf63e4b5ac4e1ddfb809b3c5abb Mon Sep 17 00:00:00 2001
From: Uttarayan Mondal <email@uttarayan.me>
Date: Thu, 11 May 2023 14:19:35 +0530
Subject: [PATCH] [fix] Updates to some env files and don't lazy-load tpope
 plugins.

---
 config/fish/config.fish     | 14 ++++++--------
 config/nvim/lua/plugins.lua | 18 +++++++++---------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 706b3900..8f3a0568 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,15 +1,13 @@
 if status is-interactive
-    # Commands to run in interactive sessions can go here
+    macchina
 end
 
-# export BROWSER="open"
-# export DYLD_FALLBACK_LIBRARY_PATH="/Library/Developer/CommandLineTools/usr/lib"
-# export DYLD_FALLBACK_LIBRARY_PATH="/Library/Developer/CommandLineTools/usr/lib"
-# export FZF_DEFAULT_COMMAND="fd --type f --hidden --exclude .git"
-# export CARGO_TARGET_DIR="$HOME/.local/share/cargo-target"
+export BROWSER="open"
+export DYLD_FALLBACK_LIBRARY_PATH="/Library/Developer/CommandLineTools/usr/lib"
+export FZF_DEFAULT_COMMAND="fd --type f --hidden --exclude .git"
+export CARGO_TARGET_DIR="$HOME/.local/share/cargo-target"
 
 
 # The next line updates PATH for the Google Cloud SDK.
-# if [ -f '/Users/fs0c131y/Projects/gcloud/google-cloud-sdk/path.fish.inc' ]; . '/Users/fs0c131y/Projects/gcloud/google-cloud-sdk/path.fish.inc'; end
+if [ -f '/Users/fs0c131y/Projects/gcloud/google-cloud-sdk/path.fish.inc' ]; . '/Users/fs0c131y/Projects/gcloud/google-cloud-sdk/path.fish.inc'; end
 
-macchina
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 9555a826..29e788c1 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -19,25 +19,25 @@ vim.opt.rtp:prepend(lazypath)
 -- local use = require('packer').use
 
 return require('lazy').setup({
-    { "ellisonleao/glow.nvim", config = true,                                                                                                   cmd = "Glow" },
+    { "ellisonleao/glow.nvim",         config = true,                                                                                                   cmd = "Glow" },
     'samoshkin/vim-mergetool',
     'mhartington/formatter.nvim',
     -- 'christianrondeau/vim-base64',
 
-    { 'tpope/vim-commentary',  lazy = false },
-    { 'tpope/vim-fugitive',    cmd = { "Git", "Gdiffsplit", "Gvdiffsplit", "Gedit", "Gread", "Gwrite", "Ggrep", "Gbrowse", "GMove", "GDelete" } },
-    'tpope/vim-repeat',
-    'tpope/vim-speeddating',
+    { 'tpope/vim-commentary',          lazy = false },
+    { 'tpope/vim-fugitive',            cmd = { "Git", "Gdiffsplit", "Gvdiffsplit", "Gedit", "Gread", "Gwrite", "Ggrep", "Gbrowse", "GMove", "GDelete" } },
+    { 'tpope/vim-repeat',              lazy = false },
+    { 'tpope/vim-speeddating',         lazy = false },
     { 'tpope/vim-surround',            lazy = false },
-    'tpope/vim-vinegar',
-    'tpope/vim-abolish',
+    { 'tpope/vim-vinegar',             lazy = false },
+    { 'tpope/vim-abolish',             lazy = false },
     { 'yuttie/comfortable-motion.vim', event = "BufEnter" },
     -- 'ruanyl/vim-gh-line',
     { 'rest-nvim/rest.nvim',           event = "BufEnter" },
     -- 'b0o/SchemaStore.nvim',
     -- 'rcarriga/nvim-notify',
     { 'folke/todo-comments.nvim',      event = "BufEnter" },
-    { 'github/copilot.vim',            event = "LspAttach", cmd = "Copilot" },
+    { 'github/copilot.vim',            event = "LspAttach",                                                                                             cmd = "Copilot" },
     -- 'ggandor/leap.nvim',
     {
         'shortcuts/no-neck-pain.nvim',
@@ -90,7 +90,7 @@ return require('lazy').setup({
             dependencies = { { "nvim-lua/plenary.nvim" } },
         }
     },
-    { 'folke/which-key.nvim',         config = function() require("which-key").setup() end },
+    { 'folke/which-key.nvim',         config = function() require("which-key").setup() end,         event = "BufEnter" },
     { 'nvim-telescope/telescope.nvim',
         cmd = "Telescope",
         dependencies = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope-ui-select.nvim', 'nvim-telescope/telescope-fzf-native.nvim' }