aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/ftplugin/lua.lua1
-rw-r--r--.config/nvim/init.lua57
-rw-r--r--.config/picom/picom.conf9
3 files changed, 13 insertions, 54 deletions
diff --git a/.config/nvim/ftplugin/lua.lua b/.config/nvim/ftplugin/lua.lua
new file mode 100644
index 0000000..9a1cdd8
--- /dev/null
+++ b/.config/nvim/ftplugin/lua.lua
@@ -0,0 +1 @@
+vim.o.tabstop = 2
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index e1da046..7da591d 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -8,7 +8,7 @@ vim.o.splitright = true
vim.o.splitbelow = true
vim.o.signcolumn = "no"
vim.o.ignorecase = true
-vim.o.tabstop = 2
+vim.o.tabstop = 4
vim.o.shiftwidth = 0
vim.o.expandtab = true
vim.o.undofile = true
@@ -16,6 +16,8 @@ vim.o.scrolloff = 10
vim.o.winborder = "single"
vim.o.mouse = ""
vim.o.completeopt = "menu,menuone,noselect"
+vim.o.listchars = "trail:."
+vim.o.list = true
vim.o.backup = false
vim.o.writebackup = false
@@ -27,9 +29,13 @@ vim.g.mapleader = " "
vim.pack.add({
"https://github.com/neovim/nvim-lspconfig",
- "https://github.com/nvim-mini/mini.pick",
"https://github.com/stevearc/oil.nvim",
{src="https://github.com/nvim-treesitter/nvim-treesitter", version="main"},
+ "https://github.com/nvim-mini/mini.pick",
+ "https://github.com/nvim-mini/mini.nvim",
+ "https://github.com/nvim-mini/mini.cmdline",
+ "https://github.com/nvim-mini/mini.diff",
+ "https://github.com/nvim-mini/mini-git",
})
for _, plugin in ipairs(vim.pack.get()) do
@@ -38,6 +44,10 @@ for _, plugin in ipairs(vim.pack.get()) do
end
end
+require("mini.git").setup()
+require("mini.diff").setup()
+require("mini.pairs").setup()
+require("mini.cmdline").setup()
require("mini.pick").setup({
window = {
config = {
@@ -79,47 +89,6 @@ vim.keymap.set("n", "<leader>s", function()
print("no files to swap to")
end)
-local function get_symbols(kind)
- local bufnr = vim.api.nvim_get_current_buf()
-
- local clients = vim.lsp.get_clients({
- bufnr = bufnr,
- })
-
- local client = clients[1]
-
- client:request(
- "textDocument/documentSymbol",
- {textDocument=vim.lsp.util.make_text_document_params()},
- function(_, funcs)
- local list = {}
- for _, func in ipairs(funcs) do
- if func.kind == kind then
- table.insert(list, {
- bufnr = bufnr,
- lnum = func.range.start.line + 1,
- end_lnum = func.range["end"].line + 1,
- col = func.range.start.character,
- end_col = func.range.start.character,
- text = func.name .. "()",
- })
- end
- end
- table.sort(list, function(a, b)
- return a.lnum < b.lnum
- end)
- vim.fn.setqflist(list)
-
- vim.cmd[[cope]]
- vim.cmd[[cfirst]]
- end
- )
-end
-
-vim.keymap.set("n", "<leader>o", function()
- get_symbols(12)
-end)
-
vim.lsp.enable({"lua_ls", "clangd", "ols"})
vim.diagnostic.config({
virtual_text = true,
@@ -145,5 +114,3 @@ vim.api.nvim_create_autocmd("LspAttach", {
vim.cmd.colorscheme("lunaperche")
vim.api.nvim_create_user_command("Ex", "Oil", {})
-
--- require('vim._extui').enable({})
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
index f3a00af..f961da9 100644
--- a/.config/picom/picom.conf
+++ b/.config/picom/picom.conf
@@ -1,10 +1 @@
backend = "glx"
-
-inactive-dim = 0.5
-
-focus-exclude = [
- "class_g = 'Bar'",
- "window_type = 'utility'",
- "window_type = 'popup_menu'",
-]
-