diff --git a/extensions.json b/extensions.json index 7bebde3..ec54877 100644 --- a/extensions.json +++ b/extensions.json @@ -1 +1 @@ -[{"identifier":{"id":"geequlim.godot-tools","uuid":"bbcbb8de-2baf-455f-a458-d5a6f084cebb"},"version":"1.3.1","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/geequlim.godot-tools-1.3.1-universal","scheme":"file"},"relativeLocation":"geequlim.godot-tools-1.3.1-universal","metadata":{"id":"bbcbb8de-2baf-455f-a458-d5a6f084cebb","publisherId":"aad638a3-8106-4023-80fe-66580f3e3b1c","publisherDisplayName":"geequlim","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1680358851415,"preRelease":false}},{"identifier":{"id":"rhaiscript.vscode-rhai","uuid":"a42498de-5a1f-4d59-bd71-d93e51e0a0ed"},"version":"0.6.6","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/rhaiscript.vscode-rhai-0.6.6-universal","scheme":"file"},"relativeLocation":"rhaiscript.vscode-rhai-0.6.6-universal","metadata":{"id":"a42498de-5a1f-4d59-bd71-d93e51e0a0ed","publisherId":"628c077a-8ff1-4dea-8505-7c6b295c7ea6","publisherDisplayName":"rhaiscript","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684314707040,"preRelease":false}},{"identifier":{"id":"bungcip.better-toml","uuid":"464f4ac7-af65-4aa9-9907-4ba7fa419085"},"version":"0.3.2","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/bungcip.better-toml-0.3.2-universal","scheme":"file"},"relativeLocation":"bungcip.better-toml-0.3.2-universal","metadata":{"id":"464f4ac7-af65-4aa9-9907-4ba7fa419085","publisherId":"87bfa971-0ee5-4ec2-afdb-1d26a8959fa4","publisherDisplayName":"bungcip","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684478813643,"preRelease":false}},{"identifier":{"id":"vsls-contrib.gitdoc","uuid":"7be174a5-ac74-4496-bf8b-8cc6cc60408c"},"version":"0.1.0","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/vsls-contrib.gitdoc-0.1.0-universal","scheme":"file"},"relativeLocation":"vsls-contrib.gitdoc-0.1.0-universal","metadata":{"id":"7be174a5-ac74-4496-bf8b-8cc6cc60408c","publisherId":"03b54342-c642-4e41-b84d-6a2222e2b060","publisherDisplayName":"vsls-contrib","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684771186531,"preRelease":false}},{"identifier":{"id":"laurenttreguier.vscode-simple-icons","uuid":"23d65a8c-fcd4-4897-86da-7fe55088e2c6"},"version":"1.16.0","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/laurenttreguier.vscode-simple-icons-1.16.0-universal","scheme":"file"},"relativeLocation":"laurenttreguier.vscode-simple-icons-1.16.0-universal","metadata":{"id":"23d65a8c-fcd4-4897-86da-7fe55088e2c6","publisherId":"08f24380-f487-49dd-ba4a-ea7bc7bda282","publisherDisplayName":"LaurentTreguier","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684869578706,"preRelease":false}},{"identifier":{"id":"castwide.solargraph","uuid":"349e83e2-207c-4309-a8d2-dfa43f7ee0c9"},"version":"0.24.0","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/castwide.solargraph-0.24.0-universal","scheme":"file"},"relativeLocation":"castwide.solargraph-0.24.0-universal","metadata":{"id":"349e83e2-207c-4309-a8d2-dfa43f7ee0c9","publisherId":"8244762e-597b-434d-b303-f780ff47b36c","publisherDisplayName":"castwide","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684905859995,"preRelease":false}},{"identifier":{"id":"shopify.ruby-lsp"},"version":"0.3.1","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/shopify.ruby-lsp-0.3.1","scheme":"file"},"relativeLocation":"shopify.ruby-lsp-0.3.1","metadata":{"installedTimestamp":1684906930324}},{"identifier":{"id":"yzane.markdown-pdf","uuid":"f015bc3c-a098-4245-8765-615e002e09ab"},"version":"1.4.4","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/yzane.markdown-pdf-1.4.4-universal","scheme":"file"},"relativeLocation":"yzane.markdown-pdf-1.4.4-universal","metadata":{"id":"f015bc3c-a098-4245-8765-615e002e09ab","publisherId":"86794f67-46a8-4137-a5a4-1415a0e41e7d","publisherDisplayName":"yzane","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1686561194091,"preRelease":false}},{"identifier":{"id":"jeanp413.open-remote-ssh","uuid":"9fc16cea-08e2-4ae5-bf75-224004d722ff"},"version":"0.0.39","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/jeanp413.open-remote-ssh-0.0.39-universal","scheme":"file"},"relativeLocation":"jeanp413.open-remote-ssh-0.0.39-universal","metadata":{"id":"9fc16cea-08e2-4ae5-bf75-224004d722ff","publisherId":"82e59b79-acc5-4a5b-81cb-9303cbdc05cb","publisherDisplayName":"jeanp413","targetPlatform":"universal","isApplicationScoped":false,"updated":true,"isPreReleaseVersion":false,"installedTimestamp":1686647128069,"preRelease":false}},{"identifier":{"id":"polymeilex.wgsl","uuid":"5f7eb109-3b69-42c6-b2a2-b93fa06fb18d"},"version":"0.1.15","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/polymeilex.wgsl-0.1.15-universal","scheme":"file"},"relativeLocation":"polymeilex.wgsl-0.1.15-universal","metadata":{"id":"5f7eb109-3b69-42c6-b2a2-b93fa06fb18d","publisherId":"d74e7254-1bbd-4279-ad17-0745bd092120","publisherDisplayName":"PolyMeilex","targetPlatform":"universal","isApplicationScoped":false,"updated":true,"isPreReleaseVersion":false,"installedTimestamp":1688987988432,"preRelease":false}},{"identifier":{"id":"rust-lang.rust-analyzer","uuid":"06574cb4-e5dc-4631-8174-a543a4533621"},"version":"0.3.1583","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/rust-lang.rust-analyzer-0.3.1583-linux-x64","scheme":"file"},"relativeLocation":"rust-lang.rust-analyzer-0.3.1583-linux-x64","metadata":{"id":"06574cb4-e5dc-4631-8174-a543a4533621","publisherId":"cb14a7a7-a188-40bd-a953-e0a20757c5dd","publisherDisplayName":"rust-lang","targetPlatform":"linux-x64","isApplicationScoped":false,"updated":true,"isPreReleaseVersion":false,"installedTimestamp":1688987988477,"preRelease":false}},{"identifier":{"id":"ms-azuretools.vscode-docker","uuid":"0479fc1c-3d67-49f9-b087-fb9069afe48f"},"version":"1.25.2","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/ms-azuretools.vscode-docker-1.25.2-universal","scheme":"file"},"relativeLocation":"ms-azuretools.vscode-docker-1.25.2-universal","metadata":{"id":"0479fc1c-3d67-49f9-b087-fb9069afe48f","publisherId":"52b787f2-79a9-4f32-99b4-393afe3005d3","publisherDisplayName":"ms-azuretools","targetPlatform":"universal","isApplicationScoped":false,"updated":true,"isPreReleaseVersion":false,"installedTimestamp":1689058565146,"preRelease":false}},{"identifier":{"id":"jdinhlife.gruvbox","uuid":"c6d564c4-ca8c-45ba-abf6-c85f2d1468d8"},"version":"1.8.0","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/jdinhlife.gruvbox-1.8.0-universal","scheme":"file"},"relativeLocation":"jdinhlife.gruvbox-1.8.0-universal","metadata":{"id":"c6d564c4-ca8c-45ba-abf6-c85f2d1468d8","publisherId":"571210a8-f372-43c2-8b5a-018868d4ac96","publisherDisplayName":"jdinhlife","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1689674016345,"preRelease":false}},{"identifier":{"id":"vscodevim.vim","uuid":"d96e79c6-8b25-4be3-8545-0e0ecefcae03"},"version":"1.25.2","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/vscodevim.vim-1.25.2-universal","scheme":"file"},"relativeLocation":"vscodevim.vim-1.25.2-universal","metadata":{"id":"d96e79c6-8b25-4be3-8545-0e0ecefcae03","publisherId":"5d63889b-1b67-4b1f-8350-4f1dce041a26","publisherDisplayName":"vscodevim","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1689755968303,"preRelease":false}}] \ No newline at end of file +[{"identifier":{"id":"geequlim.godot-tools","uuid":"bbcbb8de-2baf-455f-a458-d5a6f084cebb"},"version":"1.3.1","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/geequlim.godot-tools-1.3.1-universal","scheme":"file"},"relativeLocation":"geequlim.godot-tools-1.3.1-universal","metadata":{"id":"bbcbb8de-2baf-455f-a458-d5a6f084cebb","publisherId":"aad638a3-8106-4023-80fe-66580f3e3b1c","publisherDisplayName":"geequlim","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1680358851415,"preRelease":false}},{"identifier":{"id":"rhaiscript.vscode-rhai","uuid":"a42498de-5a1f-4d59-bd71-d93e51e0a0ed"},"version":"0.6.6","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/rhaiscript.vscode-rhai-0.6.6-universal","scheme":"file"},"relativeLocation":"rhaiscript.vscode-rhai-0.6.6-universal","metadata":{"id":"a42498de-5a1f-4d59-bd71-d93e51e0a0ed","publisherId":"628c077a-8ff1-4dea-8505-7c6b295c7ea6","publisherDisplayName":"rhaiscript","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684314707040,"preRelease":false}},{"identifier":{"id":"bungcip.better-toml","uuid":"464f4ac7-af65-4aa9-9907-4ba7fa419085"},"version":"0.3.2","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/bungcip.better-toml-0.3.2-universal","scheme":"file"},"relativeLocation":"bungcip.better-toml-0.3.2-universal","metadata":{"id":"464f4ac7-af65-4aa9-9907-4ba7fa419085","publisherId":"87bfa971-0ee5-4ec2-afdb-1d26a8959fa4","publisherDisplayName":"bungcip","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684478813643,"preRelease":false}},{"identifier":{"id":"vsls-contrib.gitdoc","uuid":"7be174a5-ac74-4496-bf8b-8cc6cc60408c"},"version":"0.1.0","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/vsls-contrib.gitdoc-0.1.0-universal","scheme":"file"},"relativeLocation":"vsls-contrib.gitdoc-0.1.0-universal","metadata":{"id":"7be174a5-ac74-4496-bf8b-8cc6cc60408c","publisherId":"03b54342-c642-4e41-b84d-6a2222e2b060","publisherDisplayName":"vsls-contrib","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684771186531,"preRelease":false}},{"identifier":{"id":"laurenttreguier.vscode-simple-icons","uuid":"23d65a8c-fcd4-4897-86da-7fe55088e2c6"},"version":"1.16.0","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/laurenttreguier.vscode-simple-icons-1.16.0-universal","scheme":"file"},"relativeLocation":"laurenttreguier.vscode-simple-icons-1.16.0-universal","metadata":{"id":"23d65a8c-fcd4-4897-86da-7fe55088e2c6","publisherId":"08f24380-f487-49dd-ba4a-ea7bc7bda282","publisherDisplayName":"LaurentTreguier","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684869578706,"preRelease":false}},{"identifier":{"id":"castwide.solargraph","uuid":"349e83e2-207c-4309-a8d2-dfa43f7ee0c9"},"version":"0.24.0","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/castwide.solargraph-0.24.0-universal","scheme":"file"},"relativeLocation":"castwide.solargraph-0.24.0-universal","metadata":{"id":"349e83e2-207c-4309-a8d2-dfa43f7ee0c9","publisherId":"8244762e-597b-434d-b303-f780ff47b36c","publisherDisplayName":"castwide","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1684905859995,"preRelease":false}},{"identifier":{"id":"shopify.ruby-lsp"},"version":"0.3.1","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/shopify.ruby-lsp-0.3.1","scheme":"file"},"relativeLocation":"shopify.ruby-lsp-0.3.1","metadata":{"installedTimestamp":1684906930324}},{"identifier":{"id":"yzane.markdown-pdf","uuid":"f015bc3c-a098-4245-8765-615e002e09ab"},"version":"1.4.4","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/yzane.markdown-pdf-1.4.4-universal","scheme":"file"},"relativeLocation":"yzane.markdown-pdf-1.4.4-universal","metadata":{"id":"f015bc3c-a098-4245-8765-615e002e09ab","publisherId":"86794f67-46a8-4137-a5a4-1415a0e41e7d","publisherDisplayName":"yzane","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1686561194091,"preRelease":false}},{"identifier":{"id":"jeanp413.open-remote-ssh","uuid":"9fc16cea-08e2-4ae5-bf75-224004d722ff"},"version":"0.0.39","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/jeanp413.open-remote-ssh-0.0.39-universal","scheme":"file"},"relativeLocation":"jeanp413.open-remote-ssh-0.0.39-universal","metadata":{"id":"9fc16cea-08e2-4ae5-bf75-224004d722ff","publisherId":"82e59b79-acc5-4a5b-81cb-9303cbdc05cb","publisherDisplayName":"jeanp413","targetPlatform":"universal","isApplicationScoped":false,"updated":true,"isPreReleaseVersion":false,"installedTimestamp":1686647128069,"preRelease":false}},{"identifier":{"id":"ms-azuretools.vscode-docker","uuid":"0479fc1c-3d67-49f9-b087-fb9069afe48f"},"version":"1.25.2","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/ms-azuretools.vscode-docker-1.25.2-universal","scheme":"file"},"relativeLocation":"ms-azuretools.vscode-docker-1.25.2-universal","metadata":{"id":"0479fc1c-3d67-49f9-b087-fb9069afe48f","publisherId":"52b787f2-79a9-4f32-99b4-393afe3005d3","publisherDisplayName":"ms-azuretools","targetPlatform":"universal","isApplicationScoped":false,"updated":true,"isPreReleaseVersion":false,"installedTimestamp":1689058565146,"preRelease":false}},{"identifier":{"id":"jdinhlife.gruvbox","uuid":"c6d564c4-ca8c-45ba-abf6-c85f2d1468d8"},"version":"1.8.0","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/jdinhlife.gruvbox-1.8.0-universal","scheme":"file"},"relativeLocation":"jdinhlife.gruvbox-1.8.0-universal","metadata":{"id":"c6d564c4-ca8c-45ba-abf6-c85f2d1468d8","publisherId":"571210a8-f372-43c2-8b5a-018868d4ac96","publisherDisplayName":"jdinhlife","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1689674016345,"preRelease":false}},{"identifier":{"id":"vscodevim.vim","uuid":"d96e79c6-8b25-4be3-8545-0e0ecefcae03"},"version":"1.25.2","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/vscodevim.vim-1.25.2-universal","scheme":"file"},"relativeLocation":"vscodevim.vim-1.25.2-universal","metadata":{"id":"d96e79c6-8b25-4be3-8545-0e0ecefcae03","publisherId":"5d63889b-1b67-4b1f-8350-4f1dce041a26","publisherDisplayName":"vscodevim","targetPlatform":"universal","updated":false,"isPreReleaseVersion":false,"installedTimestamp":1689755968303,"preRelease":false}},{"identifier":{"id":"polymeilex.wgsl","uuid":"5f7eb109-3b69-42c6-b2a2-b93fa06fb18d"},"version":"0.1.16","location":{"$mid":1,"path":"/home/jaroslaw/.vscode-oss/extensions/polymeilex.wgsl-0.1.16-universal","scheme":"file"},"relativeLocation":"polymeilex.wgsl-0.1.16-universal","metadata":{"id":"5f7eb109-3b69-42c6-b2a2-b93fa06fb18d","publisherId":"d74e7254-1bbd-4279-ad17-0745bd092120","publisherDisplayName":"PolyMeilex","targetPlatform":"universal","isApplicationScoped":false,"updated":true,"isPreReleaseVersion":false,"installedTimestamp":1690192165251,"preRelease":false}},{"identifier":{"id":"rust-lang.rust-analyzer","uuid":"06574cb4-e5dc-4631-8174-a543a4533621"},"version":"0.3.1599","location":{"$mid":1,"fsPath":"/home/jaroslaw/.vscode-oss/extensions/rust-lang.rust-analyzer-0.3.1599-linux-x64","path":"/home/jaroslaw/.vscode-oss/extensions/rust-lang.rust-analyzer-0.3.1599-linux-x64","scheme":"file"},"relativeLocation":"rust-lang.rust-analyzer-0.3.1599-linux-x64","metadata":{"id":"06574cb4-e5dc-4631-8174-a543a4533621","publisherId":"cb14a7a7-a188-40bd-a953-e0a20757c5dd","publisherDisplayName":"rust-lang","targetPlatform":"linux-x64","isApplicationScoped":false,"updated":true,"isPreReleaseVersion":false,"installedTimestamp":1690192165397,"preRelease":false}}] \ No newline at end of file diff --git a/i3config b/i3config index 445b279..437f0e9 100644 --- a/i3config +++ b/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 XF86AudioLowerVolume 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@ -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_floating_border pixel 5 +default_border pixel 6 +default_floating_border pixel 6 smart_borders on diff --git a/init.lua b/init.lua index ea20fab..80d056f 100644 --- a/init.lua +++ b/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", { --- group = vim.api.nvim_create_augroup("HideTerminal", { clear = true }), --- pattern = "term://*", --- callback = function() --- vim.cmd("set bufhidden=delete") --- vim.cmd("set nobl") --- vim.cmd("PinBuffer") --- end, --- }) --- +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://*", @@ -290,13 +392,13 @@ vim.api.nvim_create_autocmd("TermClose", { require("nvim_comment").setup() -- Buffer line -require("bufferline").setup({ - options = { - close_command = false, - show_buffer_close_icons = false, - right_mouse_command = "", - }, -}) +-- require("bufferline").setup({ +-- options = { +-- close_command = false, +-- show_buffer_close_icons = false, +-- right_mouse_command = "", +-- }, +-- }) -- Scope require("scope").setup({ @@ -354,6 +456,7 @@ wk.register({ }, }, { prefix = "" }) +vim.keymap.set("n", "", "BufferLinePick", {}) vim.keymap.set("n", "", telescope_builtin.find_files, {}) vim.keymap.set("t", "", "", {}) vim.keymap.set("n", "", 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 }, diff --git a/settings.json b/settings.json index 5fd55e5..bec0e19 100644 --- a/settings.json +++ b/settings.json @@ -5,7 +5,9 @@ "bash": { "path": "bash", "icon": "terminal-bash", - "args": ["--login"] + "args": [ + "--login" + ] }, }, "editor.fontLigatures": true, @@ -13,9 +15,6 @@ "": 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": { - "commit": false, - "publish": false, - "sync": false - }, - "git.showCommitInput": false, - "workbench.activityBar.visible": false, - "sync.gist": "ee2019552f59482a09ee3328c3a30c26", - "glassit.alpha": 220, + "workbench.startupEditor": "none", + "zenMode.fullScreen": false, + "zenMode.centerLayout": false, + "editor.rulers": [ + 80 + ] }