diff --git a/README.md b/README.md index 63c4ce8..f7968a9 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/config/init.lua b/config/init.lua index 3e97421..2b22b6f 100644 --- a/config/init.lua +++ b/config/init.lua @@ -16,14 +16,13 @@ require("toggleterm").setup{ -- Telescope -------------------- local telescope = require("telescope.builtin") -vim.keymap.set("n", "fb", telescope.buffers, {noremap = true, silent = true}) +vim.keymap.set("n", "", telescope.buffers, {noremap = true, silent = true}) vim.keymap.set("n", "ff", telescope.find_files, {noremap = true, silent = true}) vim.keymap.set("n", "fg", telescope.git_files, {noremap = true, silent = true}) -vim.keymap.set("n", "fv", telescope.command_history, {noremap = true, silent = true}) +vim.keymap.set("n", "fc", telescope.command_history, {noremap = true, silent = true}) vim.keymap.set("n", "fa", telescope.live_grep, {noremap = true, silent = true}) vim.keymap.set("n", "f8", telescope.grep_string, {noremap = true, silent = true}) vim.keymap.set("n", "f", telescope.resume, {noremap = true, silent = true}) -vim.keymap.set("n", "fs", telescope.git_status, {noremap = true, silent = true}) local telescope = require("telescope") telescope.setup({ @@ -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', 'ng', neogit.open) -require("diffview") - -------------------- -- Oil & Undo -------------------- diff --git a/config/lua/telescope-conf.lua b/config/lua/telescope-conf.lua deleted file mode 100644 index e69de29..0000000