diff --git a/bashrc b/bashrc index fa690f8..f2a56fb 100644 --- a/bashrc +++ b/bashrc @@ -26,4 +26,3 @@ alias nvim=nvim_listen.sh alias vim=nvim export EDITOR=nvim export TERM='xterm-256color' - diff --git a/i3config b/i3config index a621172..d6d0441 100644 --- a/i3config +++ b/i3config @@ -257,6 +257,7 @@ for_window [title="Overview – Home Assistant"] floating enable for_window [title="Outlook"] floating enable for_window [title="Netflix"] floating enable for_window [title="Welcome to Prime Video"] floating enable +for_window [title="floating_window"] floating enable bindsym $mod+Shift+minus move scratchpad bindsym $mod+minus scratchpad show @@ -276,3 +277,6 @@ default_floating_border pixel 6 smart_borders on gaps inner 20 + +no_focus [all] +focus_on_window_activation none diff --git a/init.lua b/init.lua index 2feaa50..5365407 100644 --- a/init.lua +++ b/init.lua @@ -35,7 +35,9 @@ require("lazy").setup({ { "folke/trouble.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, - opts = {}, + opts = { + auto_open = true, + }, }, { "j-hui/fidget.nvim", tag = "legacy" }, "terrortylor/nvim-comment", @@ -111,6 +113,15 @@ require("lazy").setup({ "nvim-lualine/lualine.nvim", requires = { "nvim-tree/nvim-web-devicons", opt = true }, }, + { + "folke/zen-mode.nvim", + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + }, + }, + { "ellisonleao/glow.nvim", config = true, cmd = "Glow" }, }) require("lualine").setup() @@ -195,11 +206,6 @@ local TerminalLine = { utils.make_buflist(TablineBufferBlock, nil, nil, get_terminal_bufs), } local BufferLine = { - condition = function() - return not conditions.buffer_matches({ - buftype = { "terminal", "nofile" }, - }) - end, utils.make_buflist(TablineBufferBlock), } require("heirline").setup({ @@ -227,8 +233,10 @@ require("gitsigns").setup() vim.cmd("autocmd FileType qf set nobuflisted") vim.g.transparent_enabled = true vim.o.hidden = true +vim.cmd("autocmd FileType markdown setlocal fo+=a") vim.wo.number = true vim.o.wrap = false +vim.o.colorcolumn = "80" vim.o.showtabline = 2 vim.g.mapleader = "," vim.wo.signcolumn = "yes" -- prevents jitter @@ -381,31 +389,14 @@ vim.api.nvim_create_autocmd("TermOpen", { group = vim.api.nvim_create_augroup("HideTerminal", { clear = true }), pattern = "term://*", callback = function() - vim.cmd("set bufhidden=delete") vim.cmd("set nobl") vim.cmd("PinBuftype") end, }) -vim.api.nvim_create_autocmd("TermClose", { - group = vim.api.nvim_create_augroup("UnpinTerminal", { clear = true }), - pattern = "term://*", - callback = function() - vim.cmd("Unpin") - end, -}) -- Comments require("nvim_comment").setup() --- Buffer line --- require("bufferline").setup({ --- options = { --- close_command = false, --- show_buffer_close_icons = false, --- right_mouse_command = "", --- }, --- }) - -- Scope require("scope").setup({ restore_state = false, @@ -473,6 +464,7 @@ vim.keymap.set("n", "", function() end, {}) -- LSP Config +require("lspconfig").pylsp.setup({}) require("lspconfig").tsserver.setup({}) require("lspconfig").zls.setup({}) require("lspconfig").gdscript.setup({ @@ -548,3 +540,17 @@ vim.api.nvim_create_autocmd("BufWritePost", { vim.fn.jobstart('git add . && git -C ~/notes commit -am "update" && git -C ~/notes push') end, }) + +vim.api.nvim_create_autocmd("TermClose", { + callback = function() + local buf = vim.api.nvim_get_current_buf() + local newbuf = vim.api.nvim_create_buf(false, true) + local windows = vim.fn.getwininfo() + for _, i in ipairs(windows) do + if i.bufnr == buf then + vim.api.nvim_win_set_buf(i.winid, newbuf) + end + end + vim.api.nvim_buf_delete(buf, {}) + end, +})