Merge branch 'dev' into mercury

nvim: display packer in a floating window
        change Telescope comment in packer.lua
        actually use fzf extension in Telescope
        add telescope-file-browser extension
zsh: export PATH in the right place
This commit is contained in:
David JULIEN 2022-12-26 19:12:25 +01:00
commit 3bed575e25
Signed by: swytch
GPG Key ID: 498590A3AA82A06F
5 changed files with 37 additions and 4 deletions

View File

@ -20,6 +20,8 @@ vim.keymap.set("n", "<leader>u", function() require("packer").sync() end)
-- telescope
vim.keymap.set("n", "<leader>tf",
function() require("telescope.builtin").find_files() end)
vim.keymap.set("n", "<leader>tef",
function() require("telescope").extensions.file_browser.file_browser() end)
vim.keymap.set("n", "<leader>tb",
function() require("telescope.builtin").buffers() end)
vim.keymap.set("n", "<leader>tg",

View File

@ -29,6 +29,9 @@ packer.init({
removed_sym = '- ', -- The symbol for an unused plugin which was removed
moved_sym = '', -- The symbol for a plugin which was moved (e.g. from opt to start)
header_sym = '', -- The symbol for the header line in packer's display
open_fn = function()
return require('packer.util').float({ border = "single" })
end, -- Display in a floating window
},
})
@ -51,7 +54,7 @@ return require("packer").startup(function()
config = function() require("plugin.treesitter") end
}
-- fuzzy finder
-- telescope
use {
"nvim-telescope/telescope.nvim",
requires = {
@ -61,8 +64,16 @@ return require("packer").startup(function()
{
"nvim-telescope/telescope-fzf-native.nvim",
run = "make"
},
{
"nvim-telescope/telescope-file-browser.nvim",
}
},
config = function()
require("telescope")
require("telescope").load_extension("fzf")
require("telescope").load_extension("file_browser")
end
}
-- LSP

View File

@ -0,0 +1,22 @@
-- Author : swytch
-- Created : Monday Dec. 26, 2022 18:39:16 CET
-- License : GPLv3
-- Description : treesitter config file
require("telescope").setup {
extensions = {
file_browser = {
theme = "ivy",
-- disables netrw and use telescope-file-browser in its place
hijack_netrw = true,
mappings = {
["i"] = {
-- your custom insert mode mappings
},
["n"] = {
-- your custom normal mode mappings
},
},
},
},
}

View File

@ -70,7 +70,7 @@ super + shift + m
$TERMINAL -g 128x32 -c "floating" -e $MUSIC_CLIENT
super + shift + n
$TERMINAL -g 128x32 -c "floating" -e "$MAIL_CLIENT"
$TERMINAL -g 128x32 -c "floating" -e $MAIL_CLIENT
super + shift + i
$TERMINAL -g 128x32 -c "floating" -e tsession "irc" "$IRC_CLIENT"

View File

@ -1,8 +1,6 @@
#!/bin/zsh
# This file is sourced when launching a DM from startx/xinit
# path
export PATH="$(find $HOME/.local/bin -type d | tr '\n' ':' | sed 's/:$//'):$PATH"
# environment variables
## path