diff options
author | Nicholas Noll <nbnoll@eml.cc> | 2021-10-20 09:00:16 -0700 |
---|---|---|
committer | Nicholas Noll <nbnoll@eml.cc> | 2021-10-20 09:00:16 -0700 |
commit | 5a67715d972ac1151a632dd30880a31bf14311c0 (patch) | |
tree | 3c4118d8f8ad5644a788c9cc381e1c895ecac292 | |
parent | a62423b72660d88072e95d94ec9c0cce5a4bf3ef (diff) |
-rw-r--r-- | .config/nvim/init.lua | 2 | ||||
-rw-r--r-- | .config/nvim/lua/code.lua (renamed from .config/nvim/lua/lsp.lua) | 6 | ||||
-rw-r--r-- | .config/nvim/pack/vendor/packages | 2 | ||||
-rw-r--r-- | .config/qutebrowser/config.py | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 21eac01..a3b76bb 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -33,4 +33,4 @@ require("settings") require("theme") require("function") require("keybind") -require("lsp") +require("code") diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/code.lua index 1eb2e9c..4b20290 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/code.lua @@ -1,5 +1,6 @@ local lsp = require('lspconfig') local git = require('neogit') +local gitdiff = require('diffview') local gitsigns = require('gitsigns') -------------------------------------------------------------------------- @@ -46,6 +47,11 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( git.setup({}) -------------------------------------------------------------------------- +-- diffview + +gitdiff.setup({}) + +-------------------------------------------------------------------------- -- gitsigns gitsigns.setup({ diff --git a/.config/nvim/pack/vendor/packages b/.config/nvim/pack/vendor/packages index 5b668a4..5b2d059 100644 --- a/.config/nvim/pack/vendor/packages +++ b/.config/nvim/pack/vendor/packages @@ -5,7 +5,9 @@ neovim/nvim-lspconfig nvim-neorg/neorg nvim-lua/plenary.nvim nvim-treesitter/nvim-treesitter + TimUntersberger/neogit +sindrets/diffview.nvim lewis6991/gitsigns.nvim junegunn/fzf.vim diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index 7728fb9..d8e0e66 100644 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -340,7 +340,7 @@ c.colors.tabs.pinned.selected.odd.fg = c.colors.tabs.selected.odd.fg # ------------------------------------------------------------------------ # fonts -font = "14pt consolas" +font = "12pt consolas" # ------------------------------------------------------------------------ # fonts |