summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2024-01-29 18:44:03 +0100
committerMinijackson <minijackson@riseup.net>2024-01-29 18:44:03 +0100
commitd1f48422cfff57840f60a520f40f90b30f4e2ccb (patch)
tree83193e12b3939e2b5c7de4b6c458ff11d9b52811
parentdbac0899f121b573ed67425cf225202cbe9e3c70 (diff)
downloadnixos-config-reborn-d1f48422cfff57840f60a520f40f90b30f4e2ccb.tar.gz
nixos-config-reborn-d1f48422cfff57840f60a520f40f90b30f4e2ccb.zip
vim: add telescope-undo extension
also add git-status telescope mapping
-rw-r--r--common/vim.nix1
-rw-r--r--dotfiles/vim/lua/myConfig.lua6
-rw-r--r--usecases/desktop/development.nix1
3 files changed, 7 insertions, 1 deletions
diff --git a/common/vim.nix b/common/vim.nix
index 2cf37ef..84a76db 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -89,6 +89,7 @@ inputs: {
89 89
90 # Telescope 90 # Telescope
91 telescope-nvim 91 telescope-nvim
92 telescope-undo-nvim
92 93
93 # Treesitter 94 # Treesitter
94 nvim-treesitter.withAllGrammars 95 nvim-treesitter.withAllGrammars
diff --git a/dotfiles/vim/lua/myConfig.lua b/dotfiles/vim/lua/myConfig.lua
index 67f5d41..6a847e3 100644
--- a/dotfiles/vim/lua/myConfig.lua
+++ b/dotfiles/vim/lua/myConfig.lua
@@ -29,7 +29,7 @@ vim.o.shiftwidth = 4
29 29
30vim.o.inccommand = "split" 30vim.o.inccommand = "split"
31 31
32vim.o.scrolloff = 1 32vim.o.scrolloff = 3
33vim.o.sidescrolloff = 5 33vim.o.sidescrolloff = 5
34 34
35vim.o.colorcolumn = "80" 35vim.o.colorcolumn = "80"
@@ -391,6 +391,10 @@ vim.keymap.set("n", "<leader>fh", telescope_builtin.help_tags, mapopts)
391vim.keymap.set("n", "<leader>fo", telescope_builtin.oldfiles, mapopts) 391vim.keymap.set("n", "<leader>fo", telescope_builtin.oldfiles, mapopts)
392vim.keymap.set("n", "<leader>fs", telescope_builtin.spell_suggest, mapopts) 392vim.keymap.set("n", "<leader>fs", telescope_builtin.spell_suggest, mapopts)
393vim.keymap.set("n", "<leader>ft", telescope_builtin.treesitter, mapopts) 393vim.keymap.set("n", "<leader>ft", telescope_builtin.treesitter, mapopts)
394vim.keymap.set("n", "<leader>fw", telescope_builtin.git_status, mapopts)
395
396require("telescope").load_extension("undo")
397vim.keymap.set("n", "<leader>fu", require("telescope").extensions.undo.undo, mapopts)
394 398
395-- Oil.nvim 399-- Oil.nvim
396 400
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index a49ca3d..a348844 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -63,6 +63,7 @@ in {
63 bintools 63 bintools
64 clang 64 clang
65 clang-tools 65 clang-tools
66 delta
66 diffoscopeMinimal 67 diffoscopeMinimal
67 difftastic 68 difftastic
68 elixir 69 elixir