diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index aa3f33e..0037388 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -322,3 +322,44 @@ require('bufferline').setup { }, } } + +-- Git sign +require("gitsigns").setup { + signs = { + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + interval = 1000, + follow_files = true + }, + attach_to_untracked = true, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + ignore_whitespace = false, + }, + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, + preview_config = { + -- Options passed to nvim_open_win + border = 'single', + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1 + }, +} + diff --git a/nvim/.config/nvim/lua/keymap.lua b/nvim/.config/nvim/lua/keymap.lua index 828f71d..8f794e9 100644 --- a/nvim/.config/nvim/lua/keymap.lua +++ b/nvim/.config/nvim/lua/keymap.lua @@ -97,3 +97,10 @@ keymap("n", "q", "Bdelete! %d", opts) -- toggle whitespace -- keymap("n", "w", "set list!", opts) +-- floaterm +keymap("n", "", ":FloatermNew", opts) +keymap("n", "", ":FloatermPrev", opts) +keymap("n", "", ":FloatermNext", opts) +keymap("n", "", ":FloatermToggle", opts) + + diff --git a/nvim/.config/nvim/lua/options.lua b/nvim/.config/nvim/lua/options.lua index 6ca4bd7..5bed36a 100644 --- a/nvim/.config/nvim/lua/options.lua +++ b/nvim/.config/nvim/lua/options.lua @@ -42,6 +42,8 @@ for k, v in pairs(options) do vim.opt[k] = v end +vim.cmd [[ command! Format execute 'lua vim.lsp.buf.format()' ]] + vim.g.vimwiki_list = {{path = '~/Documents/vimwiki', syntax = 'markdown', ext = '.md'}} vim.g.nord_disable_background = true diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 5a905f7..d86c4bc 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -84,6 +84,12 @@ return packer.startup(function(use) -- dicord fuckery use 'andweeb/presence.nvim' + -- floaterm + use 'voldikss/vim-floaterm' + + -- git gud + use 'lewis6991/gitsigns.nvim' + -- LaTeX --use 'lervag/vimtex'