restores
This commit is contained in:
Fernando Bueno
parent
ab5a430ce9
commit
d9aba24302
12
init.lua
12
init.lua
|
|
@ -91,7 +91,7 @@ vim.g.mapleader = ' '
|
|||
vim.g.maplocalleader = ' '
|
||||
|
||||
-- Set to true if you have a Nerd Font installed and selected in the terminal
|
||||
vim.g.have_nerd_font = false
|
||||
vim.g.have_nerd_font = true
|
||||
|
||||
-- [[ Setting options ]]
|
||||
-- See `:help vim.opt`
|
||||
|
|
@ -430,12 +430,20 @@ require('lazy').setup({
|
|||
['ui-select'] = {
|
||||
require('telescope.themes').get_dropdown(),
|
||||
},
|
||||
['media_files'] = {
|
||||
-- filetypes whitelist
|
||||
-- defaults to {"png", "jpg", "mp4", "webm", "pdf"}
|
||||
filetypes = {"png", "webp", "jpg", "jpeg"},
|
||||
-- find command (defaults to `fd`)
|
||||
find_cmd = "rg"
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
-- Enable Telescope extensions if they are installed
|
||||
pcall(require('telescope').load_extension, 'fzf')
|
||||
pcall(require('telescope').load_extension, 'ui-select')
|
||||
pcall(require('telescope').load_extension, 'media-files')
|
||||
|
||||
-- See `:help telescope.builtin`
|
||||
local builtin = require 'telescope.builtin'
|
||||
|
|
@ -952,7 +960,7 @@ require('lazy').setup({
|
|||
--
|
||||
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
||||
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
|
||||
-- { import = 'custom.plugins' },
|
||||
{ import = 'custom.plugins' },
|
||||
}, {
|
||||
ui = {
|
||||
-- If you are using a Nerd Font: set icons to an empty table which will use the
|
||||
|
|
|
|||
|
|
@ -63,43 +63,43 @@ keymap.set('n', '<C-F2>', ':BookmarkToggle<CR>')
|
|||
-- PLUGINS
|
||||
|
||||
-- vim-maximizer
|
||||
-- keymap.set("n", "<leader>sm", ":MaximizerToggle<CR>") -- toggle split window maximization
|
||||
keymap.set("n", "<leader>sm", ":MaximizerToggle<CR>") -- toggle split window maximization
|
||||
|
||||
-- nvim-tree
|
||||
-- keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>") -- toggle file explorer
|
||||
keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>") -- toggle file explorer
|
||||
|
||||
-- telescope
|
||||
-- keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>") -- find files within current working directory, respects .gitignore
|
||||
-- keymap.set("n", "<leader>fs", "<cmd>Telescope live_grep<cr>") -- find string in current working directory as you type
|
||||
-- keymap.set("n", "<leader>fc", "<cmd>Telescope grep_string<cr>") -- find string under cursor in current working directory
|
||||
-- keymap.set("n", "<leader>fb", "<cmd>Telescope buffers<cr>") -- list open buffers in current neovim instance
|
||||
-- keymap.set("n", "<leader>fh", "<cmd>Telescope help_tags<cr>") -- list available help tags
|
||||
keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>") -- find files within current working directory, respects .gitignore
|
||||
keymap.set("n", "<leader>fs", "<cmd>Telescope live_grep<cr>") -- find string in current working directory as you type
|
||||
keymap.set("n", "<leader>fc", "<cmd>Telescope grep_string<cr>") -- find string under cursor in current working directory
|
||||
keymap.set("n", "<leader>fb", "<cmd>Telescope buffers<cr>") -- list open buffers in current neovim instance
|
||||
keymap.set("n", "<leader>fh", "<cmd>Telescope help_tags<cr>") -- list available help tags
|
||||
|
||||
-- keymap.set("n", "<leader>t", "<cmd>Telescope vim_bookmarks current_file<cr>")
|
||||
-- keymap.set("n", "<leader>tt", "<cmd>Telescope vim_bookmarks all<cr>")
|
||||
keymap.set("n", "<leader>t", "<cmd>Telescope vim_bookmarks current_file<cr>")
|
||||
keymap.set("n", "<leader>tt", "<cmd>Telescope vim_bookmarks all<cr>")
|
||||
|
||||
|
||||
-- telescope git commands (not on youtube nvim video)
|
||||
-- keymap.set("n", "<leader>gc", "<cmd>Telescope git_commits<cr>") -- list all git commits (use <cr> to checkout) ["gc" for git commits]
|
||||
-- keymap.set("n", "<leader>gfc", "<cmd>Telescope git_bcommits<cr>") -- list git commits for current file/buffer (use <cr> to checkout) ["gfc" for git file commits]
|
||||
-- keymap.set("n", "<leader>gb", "<cmd>Telescope git_branches<cr>") -- list git branches (use <cr> to checkout) ["gb" for git branch]
|
||||
-- keymap.set("n", "<leader>gs", "<cmd>Telescope git_status<cr>") -- list current changes per file with diff preview ["gs" for git status]
|
||||
keymap.set("n", "<leader>gc", "<cmd>Telescope git_commits<cr>") -- list all git commits (use <cr> to checkout) ["gc" for git commits]
|
||||
keymap.set("n", "<leader>gfc", "<cmd>Telescope git_bcommits<cr>") -- list git commits for current file/buffer (use <cr> to checkout) ["gfc" for git file commits]
|
||||
keymap.set("n", "<leader>gb", "<cmd>Telescope git_branches<cr>") -- list git branches (use <cr> to checkout) ["gb" for git branch]
|
||||
keymap.set("n", "<leader>gs", "<cmd>Telescope git_status<cr>") -- list current changes per file with diff preview ["gs" for git status]
|
||||
|
||||
-- restart lsp server (not on youtube nvim video)
|
||||
-- keymap.set("n", "<leader>rs", ":LspRestart<CR>") -- mapping to restart lsp if necessary
|
||||
keymap.set("n", "<leader>rs", ":LspRestart<CR>") -- mapping to restart lsp if necessary
|
||||
|
||||
-- move
|
||||
local opts = { noremap = true, silent = false }
|
||||
-- Normal-mode commands
|
||||
keymap.set('n', '<S-A-k>', ':MoveLine(-1)<CR>', opts)
|
||||
keymap.set('n', '<S-A-j>', ':MoveLine(1)<CR>', opts)
|
||||
-- keymap.set('n', '<A-h>', ':MoveHChar(-1)<CR>', opts)
|
||||
-- keymap.set('n', '<A-l>', ':MoveHChar(1)<CR>', opts)
|
||||
keymap.set('n', '<A-h>', ':MoveHChar(-1)<CR>', opts)
|
||||
keymap.set('n', '<A-l>', ':MoveHChar(1)<CR>', opts)
|
||||
-- Visual-mode commands
|
||||
keymap.set('v', '<S-A-j>', ':MoveBlock(1)<CR>', opts)
|
||||
keymap.set('v', '<S-A-k>', ':MoveBlock(-1)<CR>', opts)
|
||||
-- keymap.set('v', '<A-h>', ':MoveHBlock(-1)<CR>', opts)
|
||||
-- keymap.set('v', '<A-l>', ':MoveHBlock(1)<CR>', opts)
|
||||
keymap.set('v', '<A-h>', ':MoveHBlock(-1)<CR>', opts)
|
||||
keymap.set('v', '<A-l>', ':MoveHBlock(1)<CR>', opts)
|
||||
|
||||
-- Harpoon
|
||||
keymap.set("n", "<leader>a", function() require("harpoon.mark").add_file() end, opts)
|
||||
|
|
|
|||
|
|
@ -2,27 +2,27 @@ require("custom.core.keymaps")
|
|||
require("custom.core.options")
|
||||
|
||||
return {
|
||||
'nvim-lua/popup.nvim',
|
||||
'christoomey/vim-tmux-navigator',
|
||||
-- 'christoomey/vim-tmux-navigator',
|
||||
'nvim-lua/popup.nvim', -- used by other plugins
|
||||
'szw/vim-maximizer', -- maximizes and restores current window
|
||||
'tpope/vim-surround', -- add, delete, change surroundings (it's awesome)
|
||||
'vim-scripts/ReplaceWithRegister', -- replace with register contents using motion (gr + motion)
|
||||
'kyazdani42/nvim-web-devicons', -- vs-code like icons
|
||||
'hrsh7th/cmp-buffer', -- source for text in buffer,
|
||||
'hrsh7th/cmp-path', -- source for file system paths
|
||||
'rafamadriz/friendly-snippets', -- useful snippets
|
||||
{ "glepnir/lspsaga.nvim", branch = "main" }, -- enhanced lsp uis
|
||||
'jose-elias-alvarez/typescript.nvim', -- additional functionality for typescript server (e.g. rename file & update imports)
|
||||
'onsails/lspkind.nvim', -- vs-code like icons for autocompletion
|
||||
'jose-elias-alvarez/null-ls.nvim', -- configure formatters & linters
|
||||
'jayp0521/mason-null-ls.nvim', -- bridges gap b/w mason & null-ls
|
||||
{ "windwp/nvim-ts-autotag", after = "nvim-treesitter" }, -- autoclose tags
|
||||
'fedepujol/move.nvim', -- move line/block up/down
|
||||
-- 'hrsh7th/cmp-buffer', -- source for text in buffer,
|
||||
-- 'hrsh7th/cmp-path', -- source for file system paths
|
||||
'rafamadriz/friendly-snippets', -- useful snippets
|
||||
-- { "glepnir/lspsaga.nvim", branch = "main" }, -- enhanced lsp uis
|
||||
-- 'jose-elias-alvarez/typescript.nvim', -- additional functionality for typescript server (e.g. rename file & update imports)
|
||||
-- 'onsails/lspkind.nvim', -- vs-code like icons for autocompletion
|
||||
-- 'jose-elias-alvarez/null-ls.nvim', -- configure formatters & linters
|
||||
-- 'jayp0521/mason-null-ls.nvim', -- bridges gap b/w mason & null-ls
|
||||
{ "windwp/nvim-ts-autotag", after = "nvim-treesitter" }, -- autoclose tags
|
||||
'ThePrimeagen/harpoon', -- the name is... ThePrimeagen
|
||||
'MattesGroeger/vim-bookmarks', -- vim-bookmarks
|
||||
'tom-anders/telescope-vim-bookmarks.nvim', -- telescope-vim-bookmarks
|
||||
'tpope/vim-unimpaired', -- vim-unimpared
|
||||
-- 'nvim-telescope/telescope-media-files.nvim',
|
||||
'nvim-telescope/telescope-ui-select.nvim',
|
||||
-- 'nvim-telescope/telescope-media-files.nvim', -- doesnt work for windows
|
||||
'nvim-telescope/telescope-file-browser.nvim',
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue