Clean up some plugins

diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 7601d689f9537a93369f3d5b067829efbcdb169c..7a3c907d5ba89e884444e04280c09479aaefafcb 100644 (file)
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -78,49 +78,12 @@ pcall(require, 'init_local')
 -- Plugin Specific Behavior
 -------------------------------------------------------------------------------
 -- FZF
 -- Plugin Specific Behavior
 -------------------------------------------------------------------------------
 -- FZF

-vim.keymap.set('', '<C-P>', ':FZF <CR>')
-vim.g.fzf_layout = { down = '40%' }
-vim.g.fzf_colors = {
-  fg = {'fg', 'Normal'},
-  bg = {'bg', 'Normal'},
-  hl = {'fg', 'Comment'},
-  ['fg+'] = {'fg', 'CursorLine', 'CursorColumn', 'Normal'},
-  ['bg+'] = {'bg', 'CursorLine', 'CursorColumn'},
-  ['hl+'] = {'fg', 'Statement'},
-  info = {'fg', 'PreProc'},
-  border = {'fg', 'Ignore'},
-  prompt = {'fg', 'Conditional'},
-  pointer = {'fg', 'Exception'},
-  marker = {'fg', 'Keyword'},
-  spinner = {'fg', 'Label'},
-  header = {'fg', 'Comment'}
-}
-
+vim.keymap.set("n", "<c-P>",
+  "<cmd>lua require('fzf-lua').files({ fzf_opts = {} })<CR>", { silent = true })

 
 -- Svelte Config
 vim.g.vim_svelte_plugin_use_typescript = true
 
 
 -- Svelte Config
 vim.g.vim_svelte_plugin_use_typescript = true
 

--- Limelight / Goyo config
-
-vim.g.limelight_conceal_ctermfg = 'gray'
-vim.g.limelight_conceal_guifg = 'DarkGray'
-
-vim.api.nvim_create_autocmd({'User'}, {
-  pattern = 'GoyoEnter',
-  command = 'Limelight'
-})
-vim.api.nvim_create_autocmd({'User'}, {
-  pattern = 'GoyoLeave',
-  command = 'Limelight!'
-})
-
-vim.keymap.set('n', '<leader>i', ':Limelight!!<CR>==')
-vim.keymap.set('i', '<leader>i', '<Esc>:Limelight!!<CR>==gi')
-vim.keymap.set('v', '<leader>i', ':<C-u>Limelight!!<CR>gv=gv')
-vim.keymap.set('n', '<leader>g', ':Goyo<CR>==')
-vim.keymap.set('i', '<leader>g', '<Esc>:Goyo<CR>==gi')
-vim.keymap.set('v', '<leader>g', ':<C-u>Goyo<CR>gv=gv')
-

 -- CoC
 vim.keymap.set('i', '<TAB>', 'pumvisible() ? "\\<C-n>" : "\\<TAB>"', {expr = true, silent = true})
 vim.keymap.set('i', '<S-TAB>', 'pumvisible() ? "\\<C-p>" : "\\<C-h>"', {expr = true, silent = true})
 -- CoC
 vim.keymap.set('i', '<TAB>', 'pumvisible() ? "\\<C-n>" : "\\<TAB>"', {expr = true, silent = true})
 vim.keymap.set('i', '<S-TAB>', 'pumvisible() ? "\\<C-p>" : "\\<C-h>"', {expr = true, silent = true})

diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index ea54628eca7ddc4f8d4e429ea7763dcb9a25c14b..ae87723916f243345bcc9487574d11799ceaf55f 100644 (file)
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,26 +1,23 @@
 {
   "LargeFile": { "branch": "master", "commit": "3941a37b2b0288524300348a39521a46539bf9f6" },
   "api-notation.vim": { "branch": "master", "commit": "b6f0708fb9f009b7051db514423e9ebf86bc9af4" },
 {
   "LargeFile": { "branch": "master", "commit": "3941a37b2b0288524300348a39521a46539bf9f6" },
   "api-notation.vim": { "branch": "master", "commit": "b6f0708fb9f009b7051db514423e9ebf86bc9af4" },

-  "coc.nvim": { "branch": "release", "commit": "9332d2ab1154dedc9dbcd3e1c873886abaf061a6" },
+  "coc.nvim": { "branch": "release", "commit": "a18ac7e9c34d6b0d7bc4d81dedc0db1d9e229371" },

   "dart-vim-plugin": { "branch": "master", "commit": "928302ec931caf0dcf21835cca284ccd2b192f7b" },
   "dart-vim-plugin": { "branch": "master", "commit": "928302ec931caf0dcf21835cca284ccd2b192f7b" },

-  "fzf": { "branch": "master", "commit": "58835e40f35fd1007de9bf607e06d555f085354c" },
+  "fzf-lua": { "branch": "main", "commit": "2a00373bd60245a1397bdf010bd23b2b51b2a25a" },

   "gemini.vim": { "branch": "master", "commit": "c9efb59c97b71c28d4678c79fd21fbdd3a69d196" },
   "gemini.vim": { "branch": "master", "commit": "c9efb59c97b71c28d4678c79fd21fbdd3a69d196" },

-  "goyo.vim": { "branch": "master", "commit": "fa0263d456dd43f5926484d1c4c7022dfcb21ba9" },

   "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
   "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
   "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
   "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },

-  "limelight.vim": { "branch": "master", "commit": "86aaec1700b27618d33d6182f44691d84d2cb6e5" },

   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
   "snes-syntax-vim": { "branch": "master", "commit": "a6a699c8905f7b6119bf91e44f960667d9f03d59" },
   "typescript-vim": { "branch": "master", "commit": "31ede5ad905ce4159a5e285073a391daa3bf83fa" },
   "vim-closer": { "branch": "master", "commit": "6007d9db0a35e983af246b667282606612076b07" },
   "vim-endwise": { "branch": "master", "commit": "e714ac3bcfd5a90038de49c3254eded7c70ae3c3" },
   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
   "snes-syntax-vim": { "branch": "master", "commit": "a6a699c8905f7b6119bf91e44f960667d9f03d59" },
   "typescript-vim": { "branch": "master", "commit": "31ede5ad905ce4159a5e285073a391daa3bf83fa" },
   "vim-closer": { "branch": "master", "commit": "6007d9db0a35e983af246b667282606612076b07" },
   "vim-endwise": { "branch": "master", "commit": "e714ac3bcfd5a90038de49c3254eded7c70ae3c3" },

-  "vim-fugitive": { "branch": "master", "commit": "572c8510123cbde02e8a1dafcd376c98e1e13f43" },
+  "vim-fugitive": { "branch": "master", "commit": "6fcb0ad03982de646e3fecb6915e585651b9a9fb" },

   "vim-glsl": { "branch": "master", "commit": "bfd330a271933c3372fcfa8ce052970746c8e9dd" },
   "vim-glsl": { "branch": "master", "commit": "bfd330a271933c3372fcfa8ce052970746c8e9dd" },

-  "vim-graphql": { "branch": "master", "commit": "996749a7d69a3709768fa8c4d259f79b5fd9bdb1" },
+  "vim-graphql": { "branch": "master", "commit": "6089a44e89e76f9eba138fb68bfd132420404ff7" },

   "vim-indent-object": { "branch": "master", "commit": "5c5b24c959478929b54a9e831a8e2e651a465965" },
   "vim-json": { "branch": "master", "commit": "3727f089410e23ae113be6222e8a08dd2613ecf2" },
   "vim-pug": { "branch": "master", "commit": "ea39cd942cf3194230cf72bfb838901a5344d3b3" },
   "vim-indent-object": { "branch": "master", "commit": "5c5b24c959478929b54a9e831a8e2e651a465965" },
   "vim-json": { "branch": "master", "commit": "3727f089410e23ae113be6222e8a08dd2613ecf2" },
   "vim-pug": { "branch": "master", "commit": "ea39cd942cf3194230cf72bfb838901a5344d3b3" },

-  "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" },

   "vim-svelte-plugin": { "branch": "master", "commit": "612b34640919c29b5cf2d85289dbc762b099858a" },
   "vim-swift": { "branch": "master", "commit": "76dd8b90aec0e934e5a9c524bba9327436d54348" },
   "vim-togglelist": { "branch": "master", "commit": "48f0d30292efdf20edc883e61b121e6123e03df7" },
   "vim-svelte-plugin": { "branch": "master", "commit": "612b34640919c29b5cf2d85289dbc762b099858a" },
   "vim-swift": { "branch": "master", "commit": "76dd8b90aec0e934e5a9c524bba9327436d54348" },
   "vim-togglelist": { "branch": "master", "commit": "48f0d30292efdf20edc883e61b121e6123e03df7" },

diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 8b5b64b735b5570d0a59b1d7d20cf6425a6f8d13..7a34348fade1a66efda44c2212764e9773f6a58a 100644 (file)
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -12,7 +12,36 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 require('lazy').setup({
 vim.opt.rtp:prepend(lazypath)
 
 require('lazy').setup({

-  'junegunn/fzf',
+  {
+    "ibhagwan/fzf-lua",
+    config = function()
+      -- calling `setup` is optional for customization
+      require("fzf-lua").setup({
+        winopts={
+          width=1,
+          height=0.4,
+          row=1
+        },
+        fzf_opts={
+          ['--layout']='default'
+        },
+        fzf_colors = {
+          ['fg'] = {'fg', 'Normal'},
+          ['bg'] = {'bg', 'Normal'},
+          ['hl'] = {'fg', 'Comment'},
+          ['fg+'] = {'fg', 'CursorLine'},
+          ['bg+'] = {'bg', 'CursorLine'},
+          ['hl+'] = {'fg', 'Statement'},
+          ['info'] = {'fg', 'PreProc'},
+          ['prompt'] = {'fg', 'Conditional'},
+          ['pointer'] = {'fg', 'Exception'},
+          ['marker'] = {'fg', 'Keyword'},
+          ['spinner'] = {'fg', 'Label'},
+          ['header'] = {'fg', 'Comment'}
+        }
+      })
+    end
+  },

 
   -- Syntaxes
   'https://git.sr.ht/~rbdr/api-notation.vim',
 
   -- Syntaxes
   'https://git.sr.ht/~rbdr/api-notation.vim',


@@ -36,14 +65,9 @@ require('lazy').setup({
   'rstacruz/vim-closer',
   'michaeljsmith/vim-indent-object',
 
   'rstacruz/vim-closer',
   'michaeljsmith/vim-indent-object',
 

-  -- Distraction free editing
-  'junegunn/goyo.vim',
-  'junegunn/limelight.vim',
-

   -- Tools
   {'neoclide/coc.nvim', branch='release'},
   'vim-scripts/LargeFile',
   'tpope/vim-fugitive',
   -- Tools
   {'neoclide/coc.nvim', branch='release'},
   'vim-scripts/LargeFile',
   'tpope/vim-fugitive',

-  'milkypostman/vim-togglelist',
-  'jremmen/vim-ripgrep',
+  'milkypostman/vim-togglelist'

 })
 })