update

i3config

@@ -38,8 +38,8 @@ exec --no-startup-id nm-applet
 
 # Use pactl to adjust volume in PulseAudio.
 # set $refresh_i3status killall -SIGUSR1 i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +3% && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -3% && $refresh_i3status
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 
@@ -56,7 +56,7 @@ floating_modifier $mod
 
 # start a terminal
 bindsym $mod+Return exec kitty
-bindsym $mod+backslash exec code
+bindsym $mod+backslash exec codium
 
 # kill focused window
 bindsym $mod+Shift+q [con_id="__focused__" title="^(?!Messenger).*$" class="^(?!thunderbird|Caprine|discord|Spotify).*$"] kill
@@ -192,7 +192,7 @@ set $darkgray #1d2021
 
 # green gruvbox
 # class                 border|backgr|text|indicator|child_border
-client.focused          $green $green $darkgray $purple $green
+client.focused          $aqau $aqua $darkgray $purple $aqua
 client.focused_inactive $darkgray $darkgray $yellow $purple $darkgray
 client.unfocused        $red $darkgray $yellow $purple $darkgray
 client.urgent           $red $red $white $red $red
@@ -269,8 +269,8 @@ bindsym Ctrl+Print exec --no-startup-id maim | xclip -selection clipboard -t ima
 bindsym Ctrl+$mod+Print exec --no-startup-id maim --window $(xdotool getactivewindow) | xclip -selection clipboard -t image/png
 bindsym Ctrl+Shift+Print exec --no-startup-id maim --select | xclip -selection clipboard -t image/png
 
-default_border pixel 5
+default_border pixel 6
-default_floating_border pixel 5
+default_floating_border pixel 6
 
 smart_borders on
 

init.lua

@@ -39,7 +39,6 @@ require("lazy").setup({
 	},
 	{ "j-hui/fidget.nvim", tag = "legacy" },
 	"terrortylor/nvim-comment",
-	{ "akinsho/bufferline.nvim", version = "*", dependencies = "nvim-tree/nvim-web-devicons" },
 	"petertriho/nvim-scrollbar",
 	{
 		"nvim-tree/nvim-tree.lua",
@@ -63,7 +62,6 @@ require("lazy").setup({
 	"nvim-lua/popup.nvim",
 	"nvim-lua/plenary.nvim",
 	"nvim-telescope/telescope.nvim",
-	"nvim-lualine/lualine.nvim",
 	"ojroques/nvim-osc52",
 	{
 		"kylechui/nvim-surround",
@@ -100,8 +98,113 @@ require("lazy").setup({
 		version = "*",
 		opts = { winbar = { enabled = true }, shade_terminals = false, start_in_insert = true },
 	},
+	{
+		"williamboman/mason.nvim",
+		build = ":MasonUpdate", -- :MasonUpdate updates registry contents
+	},
+	{
+		"stevearc/overseer.nvim",
+		opts = {},
+	},
+	{
+		"rebelot/heirline.nvim",
+		-- You can optionally lazy-load heirline on UiEnter
+		-- to make sure all required plugins and colorschemes are loaded before setup
+		-- event = "UiEnter",
+	},
 })
 
+-- Terminal tabs
+local conditions = require("heirline.conditions")
+local utils = require("heirline.utils")
+heirline = require("heirline")
+local colors = {
+	bright_bg = utils.get_highlight("Folded").bg,
+	bright_fg = utils.get_highlight("Folded").fg,
+	red = utils.get_highlight("DiagnosticError").fg,
+	dark_red = utils.get_highlight("DiffDelete").bg,
+	green = utils.get_highlight("String").fg,
+	blue = utils.get_highlight("Function").fg,
+	gray = utils.get_highlight("NonText").fg,
+	orange = utils.get_highlight("Constant").fg,
+	purple = utils.get_highlight("Statement").fg,
+	cyan = utils.get_highlight("Special").fg,
+	diag_warn = utils.get_highlight("DiagnosticWarn").fg,
+	diag_error = utils.get_highlight("DiagnosticError").fg,
+	diag_hint = utils.get_highlight("DiagnosticHint").fg,
+	diag_info = utils.get_highlight("DiagnosticInfo").fg,
+	git_del = utils.get_highlight("diffDeleted").fg,
+	git_add = utils.get_highlight("diffAdded").fg,
+	git_change = utils.get_highlight("diffChanged").fg,
+}
+heirline.load_colors(colors)
+local TablineFileName = {
+	provider = function(self)
+		-- self.filename will be defined later, just keep looking at the example!
+		local filename = self.filename
+		filename = filename == "" and "[No Name]" or vim.fn.fnamemodify(filename, ":t")
+		return filename
+	end,
+	hl = function(self)
+		return { bold = self.is_active or self.is_visible, italic = true }
+	end,
+}
+
+local TablineFileNameBlock = {
+	init = function(self)
+		self.filename = vim.api.nvim_buf_get_name(self.bufnr)
+	end,
+	hl = function(self)
+		if self.is_active then
+			return "TabLineSel"
+		else
+			return "TabLine"
+		end
+	end,
+	on_click = {
+		callback = function(_, minwid, _, button)
+			vim.api.nvim_win_set_buf(0, minwid)
+		end,
+		minwid = function(self)
+			return self.bufnr
+		end,
+		name = "termline_buffer_callback",
+	},
+	TablineFileName,
+}
+local TablineBufferBlock = utils.surround({ "", "" }, function(self)
+	if self.is_active then
+		return utils.get_highlight("TabLineSel").bg
+	else
+		return utils.get_highlight("TabLine").bg
+	end
+end, { TablineFileNameBlock })
+local function get_terminal_bufs()
+	return vim.tbl_filter(function(bufnr)
+		return vim.api.nvim_buf_get_option(bufnr, "buftype") == "terminal"
+	end, vim.api.nvim_list_bufs())
+end
+
+local TerminalLine = {
+	condition = function()
+		return conditions.buffer_matches({
+			buftype = { "terminal" },
+		})
+	end,
+	utils.make_buflist(TablineBufferBlock, nil, nil, get_terminal_bufs),
+}
+local BufferLine = {
+	condition = function()
+		return not conditions.buffer_matches({
+			buftype = { "terminal" },
+		})
+	end,
+	utils.make_buflist(TablineBufferBlock),
+}
+require("heirline").setup({ winbar = { TerminalLine, BufferLine } })
+
+require("overseer").setup()
+
 require("transparent").setup()
 
 local wk = require("which-key")
@@ -268,16 +371,15 @@ vim.api.nvim_create_autocmd("BufEnter", {
 	end,
 })
 
--- vim.api.nvim_create_autocmd("TermOpen", {
+vim.api.nvim_create_autocmd("TermOpen", {
--- 	group = vim.api.nvim_create_augroup("HideTerminal", { clear = true }),
+	group = vim.api.nvim_create_augroup("HideTerminal", { clear = true }),
--- 	pattern = "term://*",
+	pattern = "term://*",
--- 	callback = function()
+	callback = function()
--- 		vim.cmd("set bufhidden=delete")
+		vim.cmd("set bufhidden=delete")
--- 		vim.cmd("set nobl")
+		vim.cmd("set nobl")
--- 		vim.cmd("PinBuffer")
+		vim.cmd("PinBuftype")
--- 	end,
+	end,
--- })
+})
---
 vim.api.nvim_create_autocmd("TermClose", {
 	group = vim.api.nvim_create_augroup("UnpinTerminal", { clear = true }),
 	pattern = "term://*",
@@ -290,13 +392,13 @@ vim.api.nvim_create_autocmd("TermClose", {
 require("nvim_comment").setup()
 
 -- Buffer line
-require("bufferline").setup({
+-- require("bufferline").setup({
-	options = {
+-- 	options = {
-		close_command = false,
+-- 		close_command = false,
-		show_buffer_close_icons = false,
+-- 		show_buffer_close_icons = false,
-		right_mouse_command = "",
+-- 		right_mouse_command = "",
-	},
+-- 	},
-})
+-- })
 
 -- Scope
 require("scope").setup({
@@ -354,6 +456,7 @@ wk.register({
 	},
 }, { prefix = "<leader>" })
 
+vim.keymap.set("n", "<c-o>", "<cmd>BufferLinePick<CR>", {})
 vim.keymap.set("n", "<c-p>", telescope_builtin.find_files, {})
 vim.keymap.set("t", "<Esc>", "<C-\\><C-n>", {})
 vim.keymap.set("n", "<c-c>", function()
@@ -364,6 +467,7 @@ end, keymap_opts)
 
 -- LSP Config
 require("lspconfig").tsserver.setup({})
+require("lspconfig").zls.setup({})
 require("lspconfig").gdscript.setup({
 	on_attach = on_attach,
 })
@@ -386,12 +490,12 @@ null_ls.setup({
 	on_attach = on_attach,
 })
 
+-- Install LSPs
+require("mason").setup()
+
 -- Scroll bar
 require("scrollbar").setup()
 
--- Status line
-require("lualine").setup()
-
 -- OSC52 copy/paste
 local function copy(lines, _)
 	require("osc52").copy(table.concat(lines, "\n"))
@@ -399,6 +503,7 @@ end
 local function paste()
 	return { vim.fn.split(vim.fn.getreg(""), "\n"), vim.fn.getregtype("") }
 end
+vim.o.clipboard = "unnamedplus"
 vim.g.clipboard = {
 	name = "osc52",
 	copy = { ["+"] = copy, ["*"] = copy },

settings.json

@@ -5,7 +5,9 @@
     "bash": {
       "path": "bash",
       "icon": "terminal-bash",
-      "args": ["--login"]
+      "args": [
+        "--login"
+      ]
     },
   },
   "editor.fontLigatures": true,
@@ -13,9 +15,6 @@
     "<C-w>": false
   },
   "editor.fontFamily": "FiraCode Nerd Font",
-  "yaml.schemas": {
-    "file:///home/jaroslaw/.vscode-oss/extensions/atlassian.atlascode-3.0.2-universal/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml"
-  },
   "git.autofetch": true,
   "editor.formatOnSave": true,
   "terminal.integrated.confirmOnExit": "always",
@@ -27,11 +26,6 @@
   },
   "workbench.editor.enablePreview": false,
   "diffEditor.renderSideBySide": false,
-  "sshfs.configs": [
-    {
-      "name": "proest"
-    }
-  ],
   "files.trimTrailingWhitespace": true,
   "files.insertFinalNewline": true,
   "terminal.integrated.scrollback": 10000,
@@ -49,13 +43,10 @@
   "editor.minimap.enabled": false,
   "editor.renderWhitespace": "all",
   "window.menuBarVisibility": "toggle",
-  "git.showActionButton": {
+  "workbench.startupEditor": "none",
-    "commit": false,
+  "zenMode.fullScreen": false,
-    "publish": false,
+  "zenMode.centerLayout": false,
-    "sync": false
+  "editor.rulers": [
-  },
+    80
-  "git.showCommitInput": false,
+  ]
-  "workbench.activityBar.visible": false,
-  "sync.gist": "ee2019552f59482a09ee3328c3a30c26",
-  "glassit.alpha": 220,
 }