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:
commit
3bed575e25
@ -20,6 +20,8 @@ vim.keymap.set("n", "<leader>u", function() require("packer").sync() end)
|
|||||||
-- telescope
|
-- telescope
|
||||||
vim.keymap.set("n", "<leader>tf",
|
vim.keymap.set("n", "<leader>tf",
|
||||||
function() require("telescope.builtin").find_files() end)
|
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",
|
vim.keymap.set("n", "<leader>tb",
|
||||||
function() require("telescope.builtin").buffers() end)
|
function() require("telescope.builtin").buffers() end)
|
||||||
vim.keymap.set("n", "<leader>tg",
|
vim.keymap.set("n", "<leader>tg",
|
||||||
|
@ -29,6 +29,9 @@ packer.init({
|
|||||||
removed_sym = '- ', -- The symbol for an unused plugin which was removed
|
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)
|
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
|
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
|
config = function() require("plugin.treesitter") end
|
||||||
}
|
}
|
||||||
|
|
||||||
-- fuzzy finder
|
-- telescope
|
||||||
use {
|
use {
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
requires = {
|
requires = {
|
||||||
@ -61,8 +64,16 @@ return require("packer").startup(function()
|
|||||||
{
|
{
|
||||||
"nvim-telescope/telescope-fzf-native.nvim",
|
"nvim-telescope/telescope-fzf-native.nvim",
|
||||||
run = "make"
|
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
|
-- LSP
|
||||||
|
22
.config/nvim/lua/plugin/telescope.lua
Normal file
22
.config/nvim/lua/plugin/telescope.lua
Normal 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
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
@ -70,7 +70,7 @@ super + shift + m
|
|||||||
$TERMINAL -g 128x32 -c "floating" -e $MUSIC_CLIENT
|
$TERMINAL -g 128x32 -c "floating" -e $MUSIC_CLIENT
|
||||||
|
|
||||||
super + shift + n
|
super + shift + n
|
||||||
$TERMINAL -g 128x32 -c "floating" -e "$MAIL_CLIENT"
|
$TERMINAL -g 128x32 -c "floating" -e $MAIL_CLIENT
|
||||||
|
|
||||||
super + shift + i
|
super + shift + i
|
||||||
$TERMINAL -g 128x32 -c "floating" -e tsession "irc" "$IRC_CLIENT"
|
$TERMINAL -g 128x32 -c "floating" -e tsession "irc" "$IRC_CLIENT"
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#!/bin/zsh
|
#!/bin/zsh
|
||||||
|
|
||||||
# This file is sourced when launching a DM from startx/xinit
|
# 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
|
# environment variables
|
||||||
## path
|
## path
|
||||||
|
Reference in New Issue
Block a user