diff options
| author | Gustaf Rydholm <gustaf@nexure.io> | 2022-10-10 10:13:17 +0200 |
|---|---|---|
| committer | Gustaf Rydholm <gustaf@nexure.io> | 2022-10-10 10:13:17 +0200 |
| commit | d01b8e0db9bb355c3dbbd22dc47beadbea660690 (patch) | |
| tree | 1d6c32102422d79632a6050c45531b01188775c6 | |
| parent | f39938a826551d30e84b8a62a2c6e14f003a25ca (diff) | |
| parent | 66a8bf1ac557b579fac4099affcdca2ee0764e78 (diff) | |
Merge branch 'master' of github.com:aktersnurra/nvim
| -rw-r--r-- | fnl/config/diffview.fnl | 6 | ||||
| -rw-r--r-- | fnl/config/init.fnl | 1 | ||||
| -rw-r--r-- | fnl/config/toggleterm.fnl | 2 | ||||
| -rw-r--r-- | fnl/config/which-key.fnl | 3 | ||||
| -rw-r--r-- | fnl/plugins.fnl | 1 |
5 files changed, 12 insertions, 1 deletions
diff --git a/fnl/config/diffview.fnl b/fnl/config/diffview.fnl new file mode 100644 index 0000000..eea5ed3 --- /dev/null +++ b/fnl/config/diffview.fnl @@ -0,0 +1,6 @@ +;; Trim whitespaces on save. +(module config.diffview {autoload {: util}}) + +(def- opts {}) + +(util.use-config :diffview opts) diff --git a/fnl/config/init.fnl b/fnl/config/init.fnl index b350dfa..b752361 100644 --- a/fnl/config/init.fnl +++ b/fnl/config/init.fnl @@ -9,6 +9,7 @@ config.colorizer config.colorscheme config.comment + config.diffview config.fidget config.gitsigns config.harpoon diff --git a/fnl/config/toggleterm.fnl b/fnl/config/toggleterm.fnl index 473dd80..329964c 100644 --- a/fnl/config/toggleterm.fnl +++ b/fnl/config/toggleterm.fnl @@ -2,7 +2,7 @@ (module config.toggleterm {autoload {: util nvim aniseed.nvim autocmd config.autocmd}}) -(def- opts {:size 20 :shade_terminals false}) +(def- opts {:size 16 :shade_terminals false}) (defn- set-terminal-keymaps [] (nvim.set_keymap :t :<C-h> "<Cmd>wincmd h<CR>" {}) diff --git a/fnl/config/which-key.fnl b/fnl/config/which-key.fnl index b386ca0..1d196fa 100644 --- a/fnl/config/which-key.fnl +++ b/fnl/config/which-key.fnl @@ -50,6 +50,7 @@ "Harpoon Prev"] :t ["<cmd>Telescope harpoon marks<cr>" "Search Files"] :v ["<cmd>lua vim.lsp.buf.rename()<cr>" :Rename] + :p ["<cmd>SaveSession<cr>" "Save Session"] :r ["<cmd>lua require('harpoon.ui').toggle_quick_menu()<cr>" "Harpoon UI"]}) @@ -77,6 +78,8 @@ :C ["<cmd>Telescope commands<cr>" :Commands]}) (def- git {:name :Git + :d ["<cmd>DiffviewOpen<cr>" "Diffview"] + :D ["<cmd>DiffviewFileHistory<cr>" "DiffviewFileHistory"] :j ["<cmd>lua require 'gitsigns'.next_hunk()<cr>" "Next Hunk"] :k ["<cmd>lua require 'gitsigns'.prev_hunk()<cr>" "Prev Hunk"] :l ["<cmd>lua require 'gitsigns'.blame_line()<cr>" :Blame] diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index 6fd3da9..93c87f6 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -11,6 +11,7 @@ :hrsh7th/cmp-path {} :saadparwaiz1/cmp_luasnip {} :numToStr/Comment.nvim {} + :sindrets/diffview.nvim {} :j-hui/fidget.nvim {} :rafamadriz/friendly-snippets {} :lewis6991/gitsigns.nvim {} |