mirror of
https://github.com/iofq/nvim.nix.git
synced 2026-01-23 08:55:16 -06:00
fix neogit
This commit is contained in:
parent
062f6cd5a1
commit
62b7e838d9
3 changed files with 7 additions and 6 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
```bash
|
```bash
|
||||||
nix run "github:iofq/nvim.nix" #full
|
nix run "github:iofq/nvim.nix" #neovim
|
||||||
```
|
```
|
||||||
|
|
||||||
Or, grab an AppImage from the Releases page.
|
Or, grab an AppImage from the Releases page.
|
||||||
|
|
|
||||||
|
|
@ -16,14 +16,13 @@ require("toggleterm").setup{
|
||||||
-- Telescope
|
-- Telescope
|
||||||
--------------------
|
--------------------
|
||||||
local telescope = require("telescope.builtin")
|
local telescope = require("telescope.builtin")
|
||||||
vim.keymap.set("n", "<leader>fb", telescope.buffers, {noremap = true, silent = true})
|
vim.keymap.set("n", "<leader><leader>", telescope.buffers, {noremap = true, silent = true})
|
||||||
vim.keymap.set("n", "<leader>ff", telescope.find_files, {noremap = true, silent = true})
|
vim.keymap.set("n", "<leader>ff", telescope.find_files, {noremap = true, silent = true})
|
||||||
vim.keymap.set("n", "<leader>fg", telescope.git_files, {noremap = true, silent = true})
|
vim.keymap.set("n", "<leader>fg", telescope.git_files, {noremap = true, silent = true})
|
||||||
vim.keymap.set("n", "<leader>fv", telescope.command_history, {noremap = true, silent = true})
|
vim.keymap.set("n", "<leader>fc", telescope.command_history, {noremap = true, silent = true})
|
||||||
vim.keymap.set("n", "<leader>fa", telescope.live_grep, {noremap = true, silent = true})
|
vim.keymap.set("n", "<leader>fa", telescope.live_grep, {noremap = true, silent = true})
|
||||||
vim.keymap.set("n", "<leader>f8", telescope.grep_string, {noremap = true, silent = true})
|
vim.keymap.set("n", "<leader>f8", telescope.grep_string, {noremap = true, silent = true})
|
||||||
vim.keymap.set("n", "<leader>f<BS>", telescope.resume, {noremap = true, silent = true})
|
vim.keymap.set("n", "<leader>f<BS>", telescope.resume, {noremap = true, silent = true})
|
||||||
vim.keymap.set("n", "<leader>fs", telescope.git_status, {noremap = true, silent = true})
|
|
||||||
|
|
||||||
local telescope = require("telescope")
|
local telescope = require("telescope")
|
||||||
telescope.setup({
|
telescope.setup({
|
||||||
|
|
@ -183,12 +182,14 @@ require('gitsigns').setup{
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
require("diffview").setup({
|
||||||
|
use_icons = false,
|
||||||
|
})
|
||||||
|
|
||||||
local neogit = require('neogit')
|
local neogit = require('neogit')
|
||||||
neogit.setup {integrations = {diffview = true}}
|
neogit.setup {integrations = {diffview = true}}
|
||||||
vim.keymap.set('n', '<leader>ng', neogit.open)
|
vim.keymap.set('n', '<leader>ng', neogit.open)
|
||||||
|
|
||||||
require("diffview")
|
|
||||||
|
|
||||||
--------------------
|
--------------------
|
||||||
-- Oil & Undo
|
-- Oil & Undo
|
||||||
--------------------
|
--------------------
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue