diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 4b76f6d..bb9eb74 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -111,7 +111,7 @@ font: # - (macOS) Menlo # - (Linux/BSD) monospace # - (Windows) Consolas - family: Source Code Pro + family: SauceCodePro Nerd Font Mono # The `style` can be specified to pick a specific face. #style: Regular diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index bbccb97..57840ee 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,4 @@ -require('plugins') require('settings') +require('plugins') require('mappings') require('autocmd') diff --git a/home/.config/nvim/lua/plugins/config/bufferline.lua b/home/.config/nvim/lua/plugins/config/bufferline.lua new file mode 100644 index 0000000..da65645 --- /dev/null +++ b/home/.config/nvim/lua/plugins/config/bufferline.lua @@ -0,0 +1 @@ +require("bufferline").setup() diff --git a/home/.config/nvim/lua/plugins/config/gitsigns.lua b/home/.config/nvim/lua/plugins/config/gitsigns.lua index c0c7c9a..b5cb9db 100644 --- a/home/.config/nvim/lua/plugins/config/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/config/gitsigns.lua @@ -2,7 +2,6 @@ require("gitsigns").setup { current_line_blame = true, current_line_blame_opts = { virt_text = true, - virt_text_pos = "right_align", delay = 0, }, } diff --git a/home/.config/nvim/lua/plugins/config/lightbulb.lua b/home/.config/nvim/lua/plugins/config/lightbulb.lua new file mode 100644 index 0000000..aab8922 --- /dev/null +++ b/home/.config/nvim/lua/plugins/config/lightbulb.lua @@ -0,0 +1,10 @@ +local lightbulb = require("nvim-lightbulb") + +lightbulb.get_status_text() +lightbulb.update_lightbulb({ + status_text = { + enabled = true, + text = "💡", + text_unavailble = "", + } +}) diff --git a/home/.config/nvim/lua/plugins/config/lspinstall.lua b/home/.config/nvim/lua/plugins/config/lspinstall.lua index 8a90683..f0a4588 100644 --- a/home/.config/nvim/lua/plugins/config/lspinstall.lua +++ b/home/.config/nvim/lua/plugins/config/lspinstall.lua @@ -38,6 +38,11 @@ local on_attach = function(client, bufnr) buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) + require("lsp-status").on_attach(client) -- required for LSP status to function + local basics = require("lsp_basics") -- adds nice human accessible LSP commands + basics.make_lsp_commands(client, bufnr) + basics.make_lsp_mappings(client, bufnr) + local sources = { null_ls.builtins.formatting.gofumpt, null_ls.builtins.formatting.goimports, diff --git a/home/.config/nvim/lua/plugins/config/mini.lua b/home/.config/nvim/lua/plugins/config/mini.lua index bb28b65..c6c80e6 100644 --- a/home/.config/nvim/lua/plugins/config/mini.lua +++ b/home/.config/nvim/lua/plugins/config/mini.lua @@ -3,4 +3,3 @@ require("mini.comment").setup() require("mini.cursorword").setup() require("mini.surround").setup() require("mini.trailspace").setup() -require("mini.tabline").setup() diff --git a/home/.config/nvim/lua/plugins/config/statusline.lua b/home/.config/nvim/lua/plugins/config/statusline.lua index 372e4ce..9bf28c3 100644 --- a/home/.config/nvim/lua/plugins/config/statusline.lua +++ b/home/.config/nvim/lua/plugins/config/statusline.lua @@ -1,3 +1,2 @@ -local statusline = require("statusline") - -statusline.tableline = false +local statusline = require('statusline') +statusline.tabline = false diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 33e872d..cc3af71 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -11,7 +11,7 @@ require "paq" { "morhetz/gruvbox"; -- gruvbox theme - "beauwilliams/statusline.lua"; -- status & tab line + "kyazdani42/nvim-web-devicons"; -- per the name, fancy icons with a Nerd Font patched font "lewis6991/gitsigns.nvim"; -- git gutter "nvim-lua/plenary.nvim"; -- dependency of lewis6991/gitsigns.nvim, nvim-telescope/telescope.nvim @@ -20,7 +20,10 @@ require "paq" { "phaazon/hop.nvim"; -- easymotion navigation - "echasnovski/mini.nvim"; -- bunch of good small plugins: whitespace, buffer layout, commenting, surround, tabline, etc + "beauwilliams/statusline.lua"; -- statusline + "akinsho/bufferline.nvim"; -- bufferline + + "echasnovski/mini.nvim"; -- bunch of good small plugins: whitespace, buffer layout, commenting, surround, etc {"nvim-treesitter/nvim-treesitter", run=TSUpdate}; -- nice and quick syntax tree @@ -29,12 +32,15 @@ require "paq" { "kosayoda/nvim-lightbulb"; -- shows a light bulb like vs code for code actions "nvim-lua/lsp-status.nvim"; -- nice statusline components for LSP servers + "tpope/vim-sleuth"; -- automatic tab/spaces detection + "rhysd/vim-grammarous"; -- grammar checking -- LSP Server "neovim/nvim-lspconfig"; "williamboman/nvim-lsp-installer"; "jose-elias-alvarez/null-ls.nvim"; + "nanotee/nvim-lsp-basics"; -- autocomplete with nvim-cmp "hrsh7th/cmp-nvim-lsp"; @@ -46,10 +52,13 @@ require "paq" { "saadparwaiz1/cmp_luasnip"; } +require("plugins.config.bufferline") require("plugins.config.cmp") require("plugins.config.gitsigns") require("plugins.config.hop") require("plugins.config.indentblankline") -require("plugins.config.mini") -require("plugins.config.treesitter") +require("plugins.config.lightbulb") require("plugins.config.lspinstall") +require("plugins.config.mini") +require("plugins.config.statusline") +require("plugins.config.treesitter") diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua index 1d0e3ec..6aa6f5e 100644 --- a/home/.config/nvim/lua/settings.lua +++ b/home/.config/nvim/lua/settings.lua @@ -4,10 +4,10 @@ local cmd = vim.cmd -- color theme -- gruvbox is used via the autocmd require -g.gruvbox_contrast_dark = "hard" -- hard contrast mode for gruvobx +g.gruvbox_contrast_dark = "hard" -- hard contrast mode for gruvobx opt.background = "dark" -- make sure dark mode is used - +opt.termguicolors = true -- enable 24 bit colors opt.mouse = 'c' -- disable mouse opt.number = true -- show line numbers -- opt.cursorline = true -- highlight the line that the cursor is on