This commit is contained in:
Jaroslaw Konik 2023-08-07 07:35:31 +02:00
parent 8abb71f3e1
commit 152e1dda1a
2 changed files with 16 additions and 11 deletions

View file

@ -252,7 +252,7 @@ for_window [class="Bitwarden"] floating enable
for_window [class="steam"] floating enable for_window [class="steam"] floating enable
for_window [class="dolphin"] floating enable for_window [class="dolphin"] floating enable
for_window [class="Caprine"] floating enable move scratchpad for_window [class="Caprine"] floating enable move scratchpad
for_window [title="Messenger"] floating enable move scratchpad # for_window [title="Messenger"] floating enable move scratchpad
for_window [class="discord"] floating enable move scratchpad for_window [class="discord"] floating enable move scratchpad
for_window [class="Spotify"] floating enable move scratchpad for_window [class="Spotify"] floating enable move scratchpad
for_window [class="Pavucontrol"] floating enable move scratchpad for_window [class="Pavucontrol"] floating enable move scratchpad

View file

@ -12,7 +12,7 @@ end
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
require("lazy").setup({ require("lazy").setup({
{ "NeogitOrg/neogit", dependencies = "nvim-lua/plenary.nvim" }, { "NeogitOrg/neogit", dependencies = "nvim-lua/plenary.nvim" },
"lewis6991/fileline.nvim", "lewis6991/fileline.nvim",
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
{ {
@ -122,9 +122,9 @@ require("lazy").setup({
-- refer to the configuration section below -- refer to the configuration section below
}, },
}, },
{ "ellisonleao/glow.nvim", config = true, cmd = "Glow" }, { "ellisonleao/glow.nvim", config = true, cmd = "Glow" },
"nvim-pack/nvim-spectre", "nvim-pack/nvim-spectre",
{ "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } }, { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } },
{ {
"nvim-neorg/neorg", "nvim-neorg/neorg",
build = ":Neorg sync-parsers", build = ":Neorg sync-parsers",
@ -145,8 +145,12 @@ require("lazy").setup({
}) })
end, end,
}, },
"ggandor/leap.nvim",
"tpope/vim-repeat",
}) })
require("leap").add_default_mappings()
require("dapui").setup() require("dapui").setup()
require("lualine").setup() require("lualine").setup()
@ -198,7 +202,7 @@ local TablineFileFlags = {
{ {
condition = function(self) condition = function(self)
return not vim.api.nvim_buf_get_option(self.bufnr, "modifiable") return not vim.api.nvim_buf_get_option(self.bufnr, "modifiable")
or vim.api.nvim_buf_get_option(self.bufnr, "readonly") or vim.api.nvim_buf_get_option(self.bufnr, "readonly")
end, end,
provider = function(self) provider = function(self)
if vim.api.nvim_buf_get_option(self.bufnr, "buftype") == "terminal" then if vim.api.nvim_buf_get_option(self.bufnr, "buftype") == "terminal" then
@ -216,7 +220,7 @@ local FileIcon = {
local filename = self.filename local filename = self.filename
local extension = vim.fn.fnamemodify(filename, ":e") local extension = vim.fn.fnamemodify(filename, ":e")
self.icon, self.icon_color = self.icon, self.icon_color =
require("nvim-web-devicons").get_icon_color(filename, extension, { default = true }) require("nvim-web-devicons").get_icon_color(filename, extension, { default = true })
end, end,
provider = function(self) provider = function(self)
return self.icon and (self.icon .. " ") return self.icon and (self.icon .. " ")
@ -237,7 +241,7 @@ local TablineFileNameBlock = {
return "TabLine" return "TabLine"
end end
end, end,
FileIcon, -- turns out the version defined in #crash-course-part-ii-filename-and-friends can be reutilized as is here! FileIcon, -- turns out the version defined in #crash-course-part-ii-filename-and-friends can be reutilized as is here!
TablineFileName, TablineFileName,
TablineFileFlags, -- turns out the version defined in #crash-course-part-ii-filename-and-friends can be reutilized as is here! TablineFileFlags, -- turns out the version defined in #crash-course-part-ii-filename-and-friends can be reutilized as is here!
} }
@ -278,14 +282,14 @@ end
local function get_terminal_bufs() local function get_terminal_bufs()
return vim.tbl_filter(function(bufnr) return vim.tbl_filter(function(bufnr)
return vim.api.nvim_buf_get_option(bufnr, "buftype") == "terminal" return vim.api.nvim_buf_get_option(bufnr, "buftype") == "terminal"
and safe_get_buffer_var(bufnr, "show_in_terminal_bar", false) and safe_get_buffer_var(bufnr, "show_in_terminal_bar", false)
end, vim.api.nvim_list_bufs()) end, vim.api.nvim_list_bufs())
end end
local function get_non_terminal_bufs() local function get_non_terminal_bufs()
return vim.tbl_filter(function(bufnr) return vim.tbl_filter(function(bufnr)
return vim.api.nvim_buf_get_option(bufnr, "buftype") ~= "terminal" return vim.api.nvim_buf_get_option(bufnr, "buftype") ~= "terminal"
and vim.api.nvim_buf_get_option(bufnr, "buflisted") and vim.api.nvim_buf_get_option(bufnr, "buflisted")
end, vim.api.nvim_list_bufs()) end, vim.api.nvim_list_bufs())
end end
@ -624,8 +628,8 @@ wk.register({
local current_buf_nr = vim.fn.bufnr() local current_buf_nr = vim.fn.bufnr()
local all = vim.tbl_filter(function(bufnr) local all = vim.tbl_filter(function(bufnr)
return current_buf_nr ~= bufnr return current_buf_nr ~= bufnr
and vim.api.nvim_buf_get_option(bufnr, "buftype") ~= "terminal" and vim.api.nvim_buf_get_option(bufnr, "buftype") ~= "terminal"
and vim.api.nvim_buf_get_option(bufnr, "buflisted") and vim.api.nvim_buf_get_option(bufnr, "buflisted")
end, vim.api.nvim_list_bufs()) end, vim.api.nvim_list_bufs())
for _, bufnr in ipairs(all) do for _, bufnr in ipairs(all) do
require("bufdelete").bufdelete(bufnr, false) require("bufdelete").bufdelete(bufnr, false)
@ -672,6 +676,7 @@ vim.keymap.set("n", "<c-c>", function()
end, {}) end, {})
-- LSP Config -- LSP Config
require("lspconfig").zls.setup({})
require("lspconfig").pylsp.setup({}) require("lspconfig").pylsp.setup({})
require("lspconfig").gopls.setup({}) require("lspconfig").gopls.setup({})
require("lspconfig").tsserver.setup({}) require("lspconfig").tsserver.setup({})