summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/after/plugin/colors.lua2
-rw-r--r--.config/nvim/after/plugin/lsp.lua4
-rw-r--r--.config/nvim/after/plugin/lualine.lua3
-rw-r--r--.config/nvim/after/plugin/telescope.lua14
-rw-r--r--.config/nvim/after/plugin/treesitter.lua2
-rw-r--r--.config/nvim/after/plugin/xbufferline.lua12
-rw-r--r--.config/nvim/lua/dts/packer.lua21
-rw-r--r--.config/nvim/lua/dts/remap.lua7
-rw-r--r--.config/nvim/plugin/packer_compiled.lua25
9 files changed, 86 insertions, 4 deletions
diff --git a/.config/nvim/after/plugin/colors.lua b/.config/nvim/after/plugin/colors.lua
index 4d0b34d..3126d84 100644
--- a/.config/nvim/after/plugin/colors.lua
+++ b/.config/nvim/after/plugin/colors.lua
@@ -1,6 +1,6 @@
vim.g.nord_contrast = true
vim.g.nord_borders = false
-vim.g.nord_disable_background = false
+vim.g.nord_disable_background = true
vim.g.nord_italic = true
vim.g.nord_uniform_diff_background = true
vim.g.nord_bold = true
diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua
index c4117f5..045dba1 100644
--- a/.config/nvim/after/plugin/lsp.lua
+++ b/.config/nvim/after/plugin/lsp.lua
@@ -8,12 +8,12 @@ lsp.ensure_installed({
"html",
"jsonls",
"phpactor",
- "sumneko_lua",
+ "lua_ls",
"tailwindcss",
})
-- Fix Undefined global "vim"
-lsp.configure("sumneko_lua", {
+lsp.configure("lua_ls", {
settings = {
Lua = {
diagnostics = {
diff --git a/.config/nvim/after/plugin/lualine.lua b/.config/nvim/after/plugin/lualine.lua
new file mode 100644
index 0000000..43b571c
--- /dev/null
+++ b/.config/nvim/after/plugin/lualine.lua
@@ -0,0 +1,3 @@
+require("lualine").setup({
+ theme = "nord"
+})
diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua
index 8680444..28acc9d 100644
--- a/.config/nvim/after/plugin/telescope.lua
+++ b/.config/nvim/after/plugin/telescope.lua
@@ -1,3 +1,16 @@
+local actions = require("telescope.actions")
+
+require("telescope").setup({
+ defaults = {
+ mappings = {
+ i = {
+ -- Pressing escape will close finder instead of going into normal mode.
+ ["<esc>"] = actions.close,
+ }
+ }
+ }
+})
+
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
@@ -8,4 +21,5 @@ vim.keymap.set("n", "<leader>ss", builtin.spell_suggest, {})
vim.keymap.set("n", "<leader>fs", function()
builtin.grep_string({ search = vim.fn.input("Grep > ") })
end)
+vim.keymap.set("n", "<leader>fl", builtin.lsp_document_symbols, {})
diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua
index 00aab20..0be7a8f 100644
--- a/.config/nvim/after/plugin/treesitter.lua
+++ b/.config/nvim/after/plugin/treesitter.lua
@@ -1,4 +1,4 @@
-require'nvim-treesitter.configs'.setup {
+require("nvim-treesitter.configs").setup {
-- A list of parser names, or "all"
ensure_installed = {
"bash",
diff --git a/.config/nvim/after/plugin/xbufferline.lua b/.config/nvim/after/plugin/xbufferline.lua
new file mode 100644
index 0000000..3994b79
--- /dev/null
+++ b/.config/nvim/after/plugin/xbufferline.lua
@@ -0,0 +1,12 @@
+-- This file is intentionally call xbufferline.lua so that it loads last.
+-- This is so we can get access to the loaded and configured nord color scheme.
+local highlights = require("nord").bufferline.highlights()
+
+require("bufferline").setup({
+ options = {
+ show_close_icon = false,
+ show_buffer_close_icons = false,
+ },
+ highlights = highlights
+})
+
diff --git a/.config/nvim/lua/dts/packer.lua b/.config/nvim/lua/dts/packer.lua
index c00e63b..739fb79 100644
--- a/.config/nvim/lua/dts/packer.lua
+++ b/.config/nvim/lua/dts/packer.lua
@@ -16,6 +16,8 @@ return require("packer").startup(function(use)
}
-- Split and join arrays and methods.
+ -- gS to split one-liner into multiple lines.
+ -- gJ to join a block into a single-line statement.
use {
"AndrewRadev/splitjoin.vim",
config = function()
@@ -66,5 +68,24 @@ return require("packer").startup(function(use)
{"rafamadriz/friendly-snippets"},
}
}
+
+ -- Enable * seaching with visual selected text.
+ use "nelstrom/vim-visual-star-search"
+
+ -- Nice status line.
+ use {
+ "nvim-lualine/lualine.nvim",
+ requires = {"nvim-tree/nvim-web-devicons"},
+ }
+
+ -- Nice buffer status line.
+ use {
+ "akinsho/bufferline.nvim",
+ tag = "v3.*",
+ requires = {"nvim-tree/nvim-web-devicons"},
+ }
+
+ -- Mappings for [b and other handy ones.
+ use "tpope/vim-unimpaired"
end)
diff --git a/.config/nvim/lua/dts/remap.lua b/.config/nvim/lua/dts/remap.lua
index f26b792..42691bb 100644
--- a/.config/nvim/lua/dts/remap.lua
+++ b/.config/nvim/lua/dts/remap.lua
@@ -55,3 +55,10 @@ vim.keymap.set("n", "<leader>l", function()
vim.opt.list = not(vim.opt.list:get())
end)
+-- Move between buffers
+vim.keymap.set("n", "<A-,>", ":bprevious<CR>")
+vim.keymap.set("n", "<A-.>", ":bnext<CR>")
+vim.keymap.set("n", "<A-/>", ":bdelete<CR>")
+vim.keymap.set("i", "<A-,>", "<Esc>:bprevious<CR>")
+vim.keymap.set("i", "<A-.>", "<Esc>:bnext<CR>")
+vim.keymap.set("i", "<A-/>", "<Esc>:bdelete<CR>")
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index a856d06..28c49d8 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -79,6 +79,11 @@ _G.packer_plugins = {
path = "/home/david/.local/share/nvim/site/pack/packer/start/LuaSnip",
url = "https://github.com/L3MON4D3/LuaSnip"
},
+ ["bufferline.nvim"] = {
+ loaded = true,
+ path = "/home/david/.local/share/nvim/site/pack/packer/start/bufferline.nvim",
+ url = "https://github.com/akinsho/bufferline.nvim"
+ },
["cmp-buffer"] = {
loaded = true,
path = "/home/david/.local/share/nvim/site/pack/packer/start/cmp-buffer",
@@ -114,6 +119,11 @@ _G.packer_plugins = {
path = "/home/david/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
url = "https://github.com/VonHeikemen/lsp-zero.nvim"
},
+ ["lualine.nvim"] = {
+ loaded = true,
+ path = "/home/david/.local/share/nvim/site/pack/packer/start/lualine.nvim",
+ url = "https://github.com/nvim-lualine/lualine.nvim"
+ },
["mason-lspconfig.nvim"] = {
loaded = true,
path = "/home/david/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
@@ -155,6 +165,11 @@ _G.packer_plugins = {
path = "/home/david/.local/share/nvim/site/pack/packer/start/nvim-treesitter-context",
url = "https://github.com/nvim-treesitter/nvim-treesitter-context"
},
+ ["nvim-web-devicons"] = {
+ loaded = true,
+ path = "/home/david/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+ url = "https://github.com/nvim-tree/nvim-web-devicons"
+ },
["packer.nvim"] = {
loaded = true,
path = "/home/david/.local/share/nvim/site/pack/packer/start/packer.nvim",
@@ -180,6 +195,16 @@ _G.packer_plugins = {
loaded = true,
path = "/home/david/.local/share/nvim/site/pack/packer/start/vim-pasta",
url = "https://github.com/sickill/vim-pasta"
+ },
+ ["vim-unimpaired"] = {
+ loaded = true,
+ path = "/home/david/.local/share/nvim/site/pack/packer/start/vim-unimpaired",
+ url = "https://github.com/tpope/vim-unimpaired"
+ },
+ ["vim-visual-star-search"] = {
+ loaded = true,
+ path = "/home/david/.local/share/nvim/site/pack/packer/start/vim-visual-star-search",
+ url = "https://github.com/nelstrom/vim-visual-star-search"
}
}