Skip to content

Commit

Permalink
fix neogit
Browse files Browse the repository at this point in the history
  • Loading branch information
iofq committed Jul 27, 2024
1 parent 062f6cd commit 62b7e83
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage
```bash
nix run "github:iofq/nvim.nix" #full
nix run "github:iofq/nvim.nix" #neovim
```

Or, grab an AppImage from the Releases page.
Expand Down
11 changes: 6 additions & 5 deletions config/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@ require("toggleterm").setup{
-- Telescope
--------------------
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>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>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>fs", telescope.git_status, {noremap = true, silent = true})

local telescope = require("telescope")
telescope.setup({
Expand Down Expand Up @@ -183,12 +182,14 @@ require('gitsigns').setup{
end
}

require("diffview").setup({
use_icons = false,
})

local neogit = require('neogit')
neogit.setup {integrations = {diffview = true}}
vim.keymap.set('n', '<leader>ng', neogit.open)

require("diffview")

--------------------
-- Oil & Undo
--------------------
Expand Down
Empty file removed config/lua/telescope-conf.lua
Empty file.

0 comments on commit 62b7e83

Please sign in to comment.