update

:

@@ -0,0 +1,200 @@
+vim.g.mapleader = " "
+vim.opt.termguicolors = true
+vim.opt.cursorline = true
+vim.o.background = "dark"
+vim.opt.updatetime = 1000
+vim.opt.signcolumn = "yes"
+vim.opt.colorcolumn = "80"
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+vim.wo.number = true
+
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+	vim.fn.system({
+		"git",
+		"clone",
+		"--filter=blob:none",
+		"https://github.com/folke/lazy.nvim.git",
+		"--branch=stable", -- latest stable release
+		lazypath,
+	})
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup({
+	{
+		"amrbashir/nvim-docs-view",
+		lazy = true,
+		cmd = "DocsViewToggle",
+		opts = {
+			position = "right",
+			width = 60,
+			-- update_mode = "manual"
+			update_mode = "auto"
+		}
+	},
+	{ { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" } },
+	{
+		'windwp/nvim-autopairs',
+		event = "InsertEnter",
+		config = true
+		-- use opts = {} for passing setup options
+		-- this is equalent to setup({}) function
+	},
+	"hrsh7th/cmp-vsnip",
+	"hrsh7th/vim-vsnip",
+	"neovim/nvim-lspconfig",
+	"terrortylor/nvim-comment",
+	"hrsh7th/cmp-nvim-lsp",
+	"hrsh7th/nvim-cmp",
+	"nvim-tree/nvim-tree.lua",
+	{
+		'romgrk/barbar.nvim',
+		dependencies = {
+			'lewis6991/gitsigns.nvim', -- OPTIONAL: for git status
+			'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
+		},
+		init = function() vim.g.barbar_auto_setup = false end,
+		opts = {
+			-- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default:
+			-- animation = true,
+			-- insert_at_start = true,
+			-- …etc.
+		},
+		version = '^1.0.0', -- optional: only update when a new 1.x version is released
+	},
+	{ "ellisonleao/gruvbox.nvim" },
+	{
+		"kylechui/nvim-surround",
+		version = "*", -- Use for stability; omit to use `main` branch for the latest features
+		event = "VeryLazy",
+		config = function()
+			require("nvim-surround").setup({
+				-- Configuration here, or leave empty to use defaults
+			})
+		end,
+	},
+	{
+		'nvim-telescope/telescope.nvim',
+		tag = '0.1.6',
+		-- or                              , branch = '0.1.x',
+		dependencies = { 'nvim-lua/plenary.nvim' }
+	},
+	"lewis6991/gitsigns.nvim",
+	{ "folke/neodev.nvim", opts = {} },
+	{
+		'nvim-lualine/lualine.nvim',
+		dependencies = { 'nvim-tree/nvim-web-devicons' }
+	},
+	{ "catppuccin/nvim",   name = "catppuccin", priority = 1000 },
+
+
+})
+
+vim.cmd.colorscheme "catppuccin-mocha"
+
+require('lualine').setup({})
+
+require 'nvim-treesitter.configs'.setup({
+	auto_install = true,
+	highlight = {
+		enable = true
+	},
+	sync_install = false,
+	ignore_install = {},
+	highlight = {
+		enable = true,
+	}
+
+})
+
+require('gitsigns').setup()
+
+local cmp = require('cmp')
+
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+cmp.setup({
+	sources = {
+		{ name = 'nvim_lsp' },
+	},
+	mapping = cmp.mapping.preset.insert({
+		['<C-b>'] = cmp.mapping.scroll_docs(-4),
+		['<C-f>'] = cmp.mapping.scroll_docs(4),
+		['<C-Space>'] = cmp.mapping.complete(),
+		['<C-e>'] = cmp.mapping.abort(),
+		['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+	}),
+	snippet = {
+		expand = function(args)
+			vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+		end,
+	},
+})
+
+require("neodev").setup({
+	override = function(_, library)
+		library.enabled = true
+		library.plugins = true
+	end,
+})
+
+require("nvim_comment").setup()
+require("lspconfig").pyright.setup({})
+require('lspconfig').lua_ls.setup({})
+require("lspconfig").rust_analyzer.setup({
+	capabilities = capabilities
+})
+
+
+vim.api.nvim_create_autocmd('BufWritePre', {
+	callback = function(args)
+		vim.lsp.buf.format()
+	end,
+})
+
+local on_attach = function(bufnr)
+	local function buf_set_option(...)
+		vim.api.nvim_buf_set_option(bufnr, ...)
+	end
+
+	buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+	-- Mappings.
+	local opts = { buffer = bufnr, noremap = true, silent = true }
+	vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+	vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+	vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+	vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+	vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+	vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
+	vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
+	vim.keymap.set('n', '<leader>wl', function()
+		print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+	end, opts)
+	vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
+	vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
+	vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+	vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, opts)
+	vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+	vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+	vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, opts)
+	vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, opts)
+end
+
+vim.api.nvim_create_autocmd("LspAttach", {
+	callback = function(args)
+		local bufnr = args.buf
+		on_attach(bufnr)
+	end,
+})
+
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+
+require("nvim-tree").setup()
+vim.keymap.set('n', '<leader>tt', require("nvim-tree.api").tree.toggle)

init.lua

@@ -1,3 +1,15 @@
+vim.g.mapleader = " "
+vim.opt.termguicolors = true
+vim.opt.cursorline = true
+vim.o.background = "dark"
+vim.opt.updatetime = 1000
+vim.opt.signcolumn = "yes"
+vim.opt.colorcolumn = "80"
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+vim.wo.number = true
+vim.opt.shortmess:append("sI")
+
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
 	vim.fn.system({
@@ -5,845 +17,159 @@ if not vim.loop.fs_stat(lazypath) then
 		"clone",
 		"--filter=blob:none",
 		"https://github.com/folke/lazy.nvim.git",
-		"--branch=stable", -- latest stable release
+		"--branch=stable",
 		lazypath,
 	})
 end
 vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
-	{ "NeogitOrg/neogit",  dependencies = "nvim-lua/plenary.nvim" },
+	{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
-	"lewis6991/fileline.nvim",
-	"mfussenegger/nvim-dap",
 	{
-		"stevearc/stickybuf.nvim",
+		'windwp/nvim-autopairs',
-		opts = {},
+		event = "InsertEnter",
+		config = true
 	},
-	"famiu/bufdelete.nvim",
+	'hrsh7th/cmp-nvim-lsp',
+	'hrsh7th/cmp-buffer',
+	'hrsh7th/cmp-path',
+	'hrsh7th/cmp-cmdline',
+	'hrsh7th/nvim-cmp',
+	'hrsh7th/cmp-vsnip',
+	'hrsh7th/vim-vsnip',
 	"neovim/nvim-lspconfig",
-	"jose-elias-alvarez/null-ls.nvim",
-	"tiagovla/scope.nvim",
-	{
-		"folke/which-key.nvim",
-		event = "VeryLazy",
-		init = function()
-			vim.o.timeout = true
-			vim.o.timeoutlen = 300
-		end,
-		opts = {},
-	},
-	{
-		"folke/trouble.nvim",
-		dependencies = { "nvim-tree/nvim-web-devicons" },
-		opts = {
-			auto_open = true,
-		},
-	},
-	{ "j-hui/fidget.nvim", tag = "legacy" },
 	"terrortylor/nvim-comment",
-	"petertriho/nvim-scrollbar",
-	{
 	"nvim-tree/nvim-tree.lua",
-		version = "*",
+	{
-		lazy = false,
+		'romgrk/barbar.nvim',
 		dependencies = {
-			"nvim-tree/nvim-web-devicons",
+			'lewis6991/gitsigns.nvim',
+			'nvim-tree/nvim-web-devicons',
 		},
-		config = function()
+		init = function() vim.g.barbar_auto_setup = false end,
-			require("nvim-tree").setup({})
+		opts = {
-		end,
+		},
+		version = '^1.0.0',
 	},
-	"hrsh7th/nvim-cmp",
-	"hrsh7th/cmp-nvim-lsp",
-	"hrsh7th/cmp-nvim-lsp-signature-help",
-	"hrsh7th/cmp-vsnip",
-	"hrsh7th/cmp-path",
-	"hrsh7th/cmp-buffer",
-	"hrsh7th/vim-vsnip",
-	"simrat39/rust-tools.nvim",
-	"nvim-lua/popup.nvim",
-	"nvim-lua/plenary.nvim",
-	"nvim-telescope/telescope.nvim",
-	"ojroques/nvim-osc52",
 	{
 		"kylechui/nvim-surround",
-		version = "*", -- Use for stability; omit to use `main` branch for the latest features
+		version = "*",
 		event = "VeryLazy",
 		config = function()
-			require("nvim-surround").setup({
+			require("nvim-surround").setup({})
-				-- Configuration here, or leave empty to use defaults
-			})
 		end,
 	},
-	"f-person/git-blame.nvim",
+	{
+		'nvim-telescope/telescope.nvim',
+		tag = '0.1.6',
+		dependencies = { 'nvim-lua/plenary.nvim' }
+	},
 	"lewis6991/gitsigns.nvim",
-	"nvim-treesitter/nvim-treesitter",
+	{ "folke/neodev.nvim",               opts = {} },
-	"vim-test/vim-test",
-	"sindrets/diffview.nvim",
 	{
-		"windwp/nvim-autopairs",
+		'nvim-lualine/lualine.nvim',
-		event = "InsertEnter",
+		dependencies = { 'nvim-tree/nvim-web-devicons' }
-		opts = {}, -- this is equalent to setup({}) function
 	},
-	{
+	{ "catppuccin/nvim", name = "catppuccin", priority = 1000 },
-		"nmac427/guess-indent.nvim",
-		config = function()
-			require("guess-indent").setup({})
-		end,
-	},
-	"onsails/lspkind.nvim",
-	"edluffy/hologram.nvim",
-	"xiyaowong/transparent.nvim",
-	"ellisonleao/gruvbox.nvim",
-	"rebelot/kanagawa.nvim",
-	{
-		"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",
-	},
-	{
-		"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" },
-	"nvim-pack/nvim-spectre",
-	{ "rcarriga/nvim-dap-ui",  requires = { "mfussenegger/nvim-dap" } },
-	{
-		"nvim-neorg/neorg",
-		build = ":Neorg sync-parsers",
-		dependencies = { "nvim-lua/plenary.nvim" },
-		config = function()
-			require("neorg").setup({
-				load = {
-					["core.defaults"] = {}, -- Loads default behaviour
-					["core.concealer"] = {}, -- Adds pretty icons to your documents
-					["core.dirman"] = { -- Manages Neorg workspaces
-						config = {
-							workspaces = {
-								notes = "~/notes",
-							},
-						},
-					},
-				},
-			})
-		end,
-	},
-	"ggandor/leap.nvim",
-	"tpope/vim-repeat",
 })
 
-require("leap").add_default_mappings()
+require("neodev").setup({
-
+	override = function(_, library)
-require("dapui").setup()
+		library.enabled = true
-
+		library.plugins = true
-require("lualine").setup()
-
--- Terminal tabs
-local conditions = require("heirline.conditions")
-local utils = require("heirline.utils")
-local 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 TablineFileFlags = {
-	{
-		condition = function(self)
-			return vim.api.nvim_buf_get_option(self.bufnr, "modified")
-		end,
-		provider = "[+]",
-		hl = { fg = "green" },
-	},
-	{
-		condition = function(self)
-			return not vim.api.nvim_buf_get_option(self.bufnr, "modifiable")
-			    or vim.api.nvim_buf_get_option(self.bufnr, "readonly")
-		end,
-		provider = function(self)
-			if vim.api.nvim_buf_get_option(self.bufnr, "buftype") == "terminal" then
-				return "  "
-			else
-				return ""
-			end
-		end,
-		hl = { fg = "orange" },
-	},
-}
-
-local FileIcon = {
-	init = function(self)
-		local filename = self.filename
-		local extension = vim.fn.fnamemodify(filename, ":e")
-		self.icon, self.icon_color =
-		    require("nvim-web-devicons").get_icon_color(filename, extension, { default = true })
-	end,
-	provider = function(self)
-		return self.icon and (self.icon .. " ")
-	end,
-	hl = function(self)
-		return { fg = self.icon_color }
-	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,
-	FileIcon,  -- turns out the version defined in #crash-course-part-ii-filename-and-friends can be reutilized as is here!
-	TablineFileName,
-	TablineFileFlags, -- turns out the version defined in #crash-course-part-ii-filename-and-friends can be reutilized as is here!
-}
-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 TerminalLineFileNameBlock = {
-	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,
-	TablineFileName,
-}
-local TerminalLineBufferBlock = utils.surround({ "", "" }, function(self)
-	if self.is_active then
-		return utils.get_highlight("TabLineSel").bg
-	else
-		return utils.get_highlight("TabLine").bg
-	end
-end, { TerminalLineFileNameBlock })
-
-local function safe_get_buffer_var(bufnr, key, default_value)
-	local success, value = pcall(vim.api.nvim_buf_get_var, bufnr, key)
-	return success and value or default_value
-end
-
-local function get_terminal_bufs()
-	return vim.tbl_filter(function(bufnr)
-		return vim.api.nvim_buf_get_option(bufnr, "buftype") == "terminal"
-		    and safe_get_buffer_var(bufnr, "show_in_terminal_bar", false)
-	end, vim.api.nvim_list_bufs())
-end
-
-local function get_non_terminal_bufs()
-	return vim.tbl_filter(function(bufnr)
-		return vim.api.nvim_buf_get_option(bufnr, "buftype") ~= "terminal"
-		    and vim.api.nvim_buf_get_option(bufnr, "buflisted")
-	end, vim.api.nvim_list_bufs())
-end
-
-local TerminalLine = {
-	condition = function()
-		return conditions.buffer_matches({
-			buftype = { "terminal" },
-		})
-	end,
-	utils.make_buflist(TerminalLineBufferBlock, nil, nil, get_terminal_bufs),
-}
-local BufferLine = {
-	utils.make_buflist(TablineBufferBlock, nil, nil, get_non_terminal_bufs),
-}
-require("heirline").setup({
-	winbar = { TerminalLine },
-	statusline = { TerminalLine },
-	tabline = { BufferLine },
-})
-
-require("overseer").setup()
-
-require("transparent").setup()
-
-local wk = require("which-key")
-
--- Stick buffer
-require("stickybuf").setup()
-
--- LSP Status
-require("fidget").setup({})
-
--- Git gutter
-require("gitsigns").setup()
-
--- Vim options
-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.g.maplocalleader = " "
-vim.wo.signcolumn = "yes" -- prevents jitter
-vim.opt.updatetime = 100
-vim.o.background = "dark" -- or "light" for light mode
-vim.cmd("colorscheme kanagawa")
--- Set completeopt to have a better completion experience
--- :help completeopt
--- menuone: popup even when there's only one match
--- noinsert: Do not insert text until a selection is made
--- noselect: Do not auto-select, nvim-cmp plugin will handle this for us.
-vim.o.completeopt = "menuone,noinsert,noselect"
--- Avoid showing extra messages when using completion
-vim.opt.shortmess = vim.opt.shortmess + "c"
-
-local function on_attach(client, buffer)
-	if client.supports_method("textDocument/formatting") then
-		vim.api.nvim_create_autocmd({ "BufWritePre" }, {
-			buffer = buffer,
-			callback = function()
-				vim.lsp.buf.format({
-					async = false,
-					timeout_ms = 5000,
-					filter = function(cl)
-						return cl.name ~= "tsserver"
 	end,
 })
-			end,
-		})
-	end
 
-	local keymap_opts = { buffer = buffer }
+vim.cmd.colorscheme "catppuccin-mocha"
 
-	wk.register({
+require('lualine').setup({})
-		w = {
-			name = "Word",
-			r = { vim.lsp.buf.rename, "Rename" },
-		},
-	}, { prefix = "<leader>" })
 
-	-- TODO: Register all in which-key
+require 'nvim-treesitter.configs'.setup({
-	vim.keymap.set("n", "gi", vim.lsp.buf.implementation, keymap_opts)
+	ensure_installed = {},
-	vim.keymap.set("n", "<c-k>", vim.lsp.buf.signature_help, keymap_opts)
+	auto_install = true,
-	vim.keymap.set("n", "gD", vim.lsp.buf.type_definition, keymap_opts)
+	highlight = {
-	vim.keymap.set("n", "gr", vim.lsp.buf.references, keymap_opts)
+		enable = true
-	vim.keymap.set("n", "g0", vim.lsp.buf.document_symbol, keymap_opts)
-	vim.keymap.set("n", "gW", vim.lsp.buf.workspace_symbol, keymap_opts)
-	vim.keymap.set("n", "gd", vim.lsp.buf.definition, keymap_opts)
-	vim.keymap.set("n", "ga", vim.lsp.buf.code_action, keymap_opts)
-	vim.keymap.set("n", "gh", vim.lsp.buf.hover, keymap_opts)
-	vim.keymap.set("n", "g[", vim.diagnostic.goto_prev, keymap_opts)
-	vim.keymap.set("n", "g]", vim.diagnostic.goto_next, keymap_opts)
-end
-
-require("rust-tools").setup({
-	tools = {
-		runnables = {
-			use_telescope = true,
-		},
-		inlay_hints = {
-			auto = true,
-			show_parameter_hints = false,
-			parameter_hints_prefix = "",
-			other_hints_prefix = "",
-		},
-	},
-	server = {
-		on_attach = on_attach,
-		settings = {
-			["rust-analyzer"] = {
-				checkOnSave = {
-					command = "clippy",
-				},
-			},
-		},
 	},
+	sync_install = false,
+	ignore_install = {},
+	modules = {}
 })
 
--- Completion
+require('gitsigns').setup()
-local cmp = require("cmp")
-local lspkind = require("lspkind")
 
+local cmp = require('cmp')
 cmp.setup({
-	formatting = {
-		format = lspkind.cmp_format({}),
-	},
 	snippet = {
 		expand = function(args)
 			vim.fn["vsnip#anonymous"](args.body)
 		end,
 	},
-	mapping = {
+	window = {
-		["<Up>"] = cmp.mapping.select_prev_item(),
+	},
-		["<Down>"] = cmp.mapping.select_next_item(),
+	mapping = cmp.mapping.preset.insert({
-		["<S-Tab>"] = cmp.mapping.select_prev_item(),
+		['<C-b>'] = cmp.mapping.scroll_docs(-4),
-		["<Tab>"] = cmp.mapping.select_next_item(),
+		['<C-f>'] = cmp.mapping.scroll_docs(4),
-		["<C-d>"] = cmp.mapping.scroll_docs(-4),
+		['<C-Space>'] = cmp.mapping.complete(),
-		["<C-f>"] = cmp.mapping.scroll_docs(4),
+		['<C-e>'] = cmp.mapping.abort(),
-		["<C-Space>"] = cmp.mapping.complete(),
+		['<CR>'] = cmp.mapping.confirm({ select = true }),
-		["<C-e>"] = cmp.mapping.close(),
-		["<CR>"] = cmp.mapping.confirm({
-			behavior = cmp.ConfirmBehavior.Insert,
-			select = true,
 	}),
-	},
+	sources = cmp.config.sources({
-	sources = {
+		{ name = 'nvim_lsp' },
-		{ name = "nvim_lsp" },
+		{ name = 'vsnip' },
-		{ name = "nvim_lsp_signature_help" },
+	}, {
-		{ name = "vsnip" },
+		{ name = 'buffer' },
-		{ name = "path" },
+	})
-		{ name = "buffer" },
-	},
 })
 
--- Git
-local neogit = require("neogit")
-neogit.setup({
-	integrations = {
-		diffview = true,
-	},
-})
-
--- Folder tree
-local function open_nvim_tree(data)
-	local directory = vim.fn.isdirectory(data.file) == 1
-
-	if not directory then
-		return
-	end
-	vim.cmd.cd(data.file)
-
-	require("nvim-tree.api").tree.open()
-end
-vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
-
-local timers = {}
-
-vim.api.nvim_create_autocmd("TermOpen", {
-	group = vim.api.nvim_create_augroup("TermOpenCallback", { clear = true }),
-	pattern = "term://*",
-	callback = function()
-		vim.cmd("PinBuftype")
-		vim.cmd("set nobl")
-
-		local timer = vim.loop.new_timer()
-		local bufnr = vim.api.nvim_get_current_buf()
-
-		vim.api.nvim_buf_set_var(bufnr, "show_in_terminal_bar", true)
-
-		timers[bufnr] = timer
-		timer:start(1000, 750, function()
-			vim.schedule(function()
-				if vim.api.nvim_buf_is_valid(bufnr) then
-					local tji = vim.api.nvim_buf_get_var(bufnr, "terminal_job_id")
-					local pid = vim.fn.jobpid(tji)
-					local result = vim.fn.system("pgrep -lP " .. pid)
-					local first_child = result:gmatch("([^\n]*)\n?")()
-
-					local words_iterator = first_child:gmatch("%S+")
-					words_iterator()
-
-					local words = {}
-					for word in words_iterator do
-						table.insert(words, word)
-					end
-
-					local process_name = table.concat(words, " ")
-					if process_name ~= "" then
-						vim.api.nvim_buf_set_name(bufnr, bufnr .. " " .. process_name)
-					else
-						vim.api.nvim_buf_set_name(bufnr, tostring(bufnr))
-					end
-				end
-			end)
-		end)
-	end,
-})
-vim.api.nvim_create_autocmd("TermClose", {
-	group = vim.api.nvim_create_augroup("TermCloseCallback", { clear = true }),
-	pattern = "term://*",
-	callback = function()
-		local bufnr = vim.api.nvim_get_current_buf()
-		timers[bufnr]:close()
-	end,
-})
-
--- Comments
 require("nvim_comment").setup()
 
--- Scope
+require("lspconfig").pyright.setup({})
-require("scope").setup({
+require('lspconfig').lua_ls.setup({})
-	restore_state = false,
+require("lspconfig").rust_analyzer.setup({})
-})
+vim.api.nvim_create_autocmd('BufWritePre', {
-
--- Keybinds
-local telescope_builtin = require("telescope.builtin")
-
-wk.register({
-	c = {
-		name = "Config",
-		e = { "<cmd>e ~/src/dotfiles/init.lua<CR>", "Edit config" },
-		u = {
-			function()
-				os.execute('git -C ~/src/dotfiles commit -am "update" && git -C ~/src/dotfiles push')
-			end,
-			"Upload config",
-		},
-		d = {
-			function()
-				os.execute("git -C ~/src/dotfiles pull")
-			end,
-			"Download config",
-		},
-	},
-	d = {
-		name = "Debug",
-		c = { require("dap").continue, "Continue" },
-		t = { require("dapui").toggle, "Toggle UI" },
-	},
-	n = {
-		name = "New",
-		t = { "<cmd>terminal<CR>", "New Terminal" },
-	},
-	f = {
-		name = "Find",
-		f = { telescope_builtin.find_files, "Find files" },
-		g = { telescope_builtin.live_grep, "Grep" },
-		b = { telescope_builtin.buffers, "Find buffers" },
-		h = { telescope_builtin.help_tags, "Find help tags" },
-		d = { telescope_builtin.diagnostics, "List diagnostics" },
-		s = { require("spectre").toggle, "Search" },
-	},
-	t = {
-		name = "Tree",
-		f = { "<cmd>NvimTreeFindFile<CR>", "Focus current file in tree" },
-		t = { require("nvim-tree.api").tree.toggle, "Toggle tree" },
-	},
-	g = {
-		name = "Git",
-		o = {
-			function()
-				neogit.open({ kind = "split" })
-			end,
-			"Open Git",
-		},
-	},
-	r = {
-		name = "Run",
-		j = {
-			"<cmd>OverseerRun<cr>",
-			"Job",
-		},
-		t = {
-			"<cmd>TestNearest<cr>",
-			"Test",
-		},
-		f = {
-			"<cmd>TestFile<cr>",
-			"Test File",
-		},
-		s = {
-			"<cmd>TestSuite<cr>",
-			"Test Suite",
-		},
-	},
-	p = {
-		name = "Refresh",
-		d = { vim.diagnostic.reset, "Diagnostic" },
-	},
-	e = {
-		name = "Eval",
-		r = { "<cmd>w !ruby<cr>", "Ruby" },
-	},
-	o = {
-		name = "Organizer",
-		i = { "<cmd>Neorg<cr>", "Index" },
-		n = { "<cmd>Neorg workspace notes<cr>", "Notes" },
-		j = {
-			name = "Journal",
-			t = { "<cmd>Neorg journal today<cr>", "Today" },
-			i = { "<cmd>Neorg journal toc<cr>", "Index" },
-		},
-	},
-	b = {
-		name = "Buffer",
-		p = { "<cmd>PinBuffer<CR>", "Pin buffer" },
-		u = { "<cmd>Unpin<CR>", "Unpin buffer" },
-		d = {
-			name = "Delete",
-			o = {
-				function()
-					local current_buf_nr = vim.fn.bufnr()
-					local all = vim.tbl_filter(function(bufnr)
-						return current_buf_nr ~= bufnr
-						    and vim.api.nvim_buf_get_option(bufnr, "buftype") ~= "terminal"
-						    and vim.api.nvim_buf_get_option(bufnr, "buflisted")
-					end, vim.api.nvim_list_bufs())
-					for _, bufnr in ipairs(all) do
-						require("bufdelete").bufdelete(bufnr, false)
-					end
-				end,
-				"Delete others",
-			},
-		},
-	},
-}, { prefix = "<leader>" })
-
-require("spectre").setup({
-	live_update = true,
-})
-
-vim.keymap.set("n", "<Tab>", function()
-	if vim.bo.buftype == "terminal" then
-		local current_buf_nr = vim.fn.bufnr()
-		local current_idx = nil
-		local terminals = get_terminal_bufs()
-		for i, v in pairs(terminals) do
-			if v == current_buf_nr then
-				current_idx = i
-				break
-			end
-		end
-
-		if current_idx < #terminals then
-			vim.cmd("buffer " .. terminals[current_idx + 1])
-		else
-			vim.cmd("buffer " .. terminals[1])
-		end
-	else
-		vim.cmd("bnext")
-	end
-end, {})
-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()
-	if vim.bo.buftype ~= "nofile" and vim.bo.buftype ~= "terminal" then
-		require("bufdelete").bufdelete(0, false)
-	end
-end, {})
-
--- LSP Config
-require("lspconfig").zls.setup({})
-require("lspconfig").pylsp.setup({})
-require("lspconfig").gopls.setup({})
-require("lspconfig").tsserver.setup({})
-require("lspconfig").zls.setup({})
-require("lspconfig").gdscript.setup({
-	on_attach = on_attach,
-})
-require("lspconfig").ruby_ls.setup({
-	cmd = { "bundle", "exec", "ruby-lsp" },
-	on_attach = on_attach,
-})
-require("lspconfig").lua_ls.setup({
-	settings = {
-		Lua = {
-			diagnostics = {
-				-- Get the language server to recognize the `vim` global
-				globals = { "vim" },
-			},
-		},
-	},
-})
-require("lspconfig").solargraph.setup({
-	cmd = { "bundle", "exec", "solargraph", "stdio" },
-	init_options = {
-		formatting = false,
-	},
-	on_attach = on_attach,
-})
-local null_ls = require("null-ls")
-null_ls.setup({
-	sources = {
-		null_ls.builtins.formatting.prettierd,
-		null_ls.builtins.formatting.rubocop,
-		null_ls.builtins.formatting.stylua,
-		null_ls.builtins.code_actions.gitsigns,
-	},
-	on_attach = on_attach,
-})
-
--- Install LSPs
-require("mason").setup()
-
--- Scroll bar
-require("scrollbar").setup()
-
--- OSC52 copy/paste
-local function copy(lines, _)
-	require("osc52").copy(table.concat(lines, "\n"))
-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 },
-	paste = { ["+"] = paste, ["*"] = paste },
-}
-
--- Language Syntax
-require("nvim-treesitter.configs").setup({
-	ensure_installed = { "c", "lua", "vim", "vimdoc", "query" },
-	auto_install = true,
-	highlight = {
-		enable = true,
-	},
-	indent = {
-		enable = true,
-	},
-})
-
--- Tests
-vim.g["test#strategy"] = "neovim"
-
-vim.api.nvim_create_autocmd("BufWritePost", {
-	pattern = vim.fn.expand("~") .. "/notes/*",
 	callback = function()
-		vim.fn.jobstart('git add . && git -C ~/notes commit -am "update" && git -C ~/notes push')
+		vim.lsp.buf.format()
+	end,
+})
+local on_attach = function(bufnr)
+	local function buf_set_option(...)
+		vim.api.nvim_buf_set_option(bufnr, ...)
+	end
+
+	buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
+
+	local opts = { buffer = bufnr, noremap = true, silent = true }
+	vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+	vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+	vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+	vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+	vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+	vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
+	vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
+	vim.keymap.set('n', '<leader>wl', function()
+		print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+	end, opts)
+	vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
+	vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
+	vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+	vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, opts)
+	vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+	vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+	vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, opts)
+	vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, opts)
+end
+vim.api.nvim_create_autocmd("LspAttach", {
+	callback = function(args)
+		local bufnr = args.buf
+		on_attach(bufnr)
 	end,
 })
 
-vim.api.nvim_create_autocmd("TermClose", {
+local builtin = require('telescope.builtin')
-	callback = function()
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-		local buf = vim.api.nvim_get_current_buf()
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-		local newbuf = vim.api.nvim_create_buf(false, true)
+vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-		local windows = vim.fn.getwininfo()
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
-		for _, i in ipairs(windows) do
-			if i.bufnr == buf then
-				vim.api.nvim_win_set_buf(i.winid, newbuf)
-			end
-		end
 
-		local current_idx = nil
+require("nvim-tree").setup()
-		local terminals = get_terminal_bufs()
+vim.keymap.set('n', '<leader>tt', require("nvim-tree.api").tree.toggle)
-		for i, v in pairs(terminals) do
-			if v == buf then
-				current_idx = i
-				break
-			end
-		end
-
-		if current_idx < #terminals then
-			vim.cmd("buffer " .. terminals[current_idx + 1])
-		else
-			vim.cmd("buffer " .. terminals[1])
-		end
-
-		vim.api.nvim_buf_delete(buf, {})
-	end,
-})
-
-local dap = require("dap")
-dap.adapters.lldb = {
-	type = "executable",
-	command = "/usr/bin/lldb-vscode", -- adjust as needed, must be absolute path
-	name = "lldb",
-}
-vim.keymap.set("n", "gb", dap.toggle_breakpoint, {})
-
-dap.configurations.rust = {
-	{
-		-- initCommands = function()
-		-- 	-- Find out where to look for the pretty printer Python module
-		-- 	local rustc_sysroot = vim.fn.trim(vim.fn.system("rustc --print sysroot"))
-		--
-		-- 	local script_import = 'command script import "' .. rustc_sysroot .. '/lib/rustlib/etc/lldb_lookup.py"'
-		-- 	local commands_file = rustc_sysroot .. "/lib/rustlib/etc/lldb_commands"
-		--
-		-- 	local commands = {}
-		-- 	local file = io.open(commands_file, "r")
-		-- 	if file then
-		-- 		for line in file:lines() do
-		-- 			table.insert(commands, line)
-		-- 		end
-		-- 		file:close()
-		-- 	end
-		-- 	table.insert(commands, 1, script_import)
-		--
-		-- 	return commands
-		-- end,
-		name = "Launch",
-		type = "lldb",
-		request = "launch",
-		program = function()
-			vim.fn.jobstart("cargo build")
-			return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
-		end,
-		cwd = "${workspaceFolder}",
-		stopOnEntry = false,
-		args = {},
-
-		-- 💀
-		-- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting:
-		--
-		--    echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope
-		--
-		-- Otherwise you might get the following error:
-		--
-		--    Error on launch: Failed to attach to the target process
-		--
-		-- But you should be aware of the implications:
-		-- https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html
-		runInTerminal = true,
-	},
-}
-
-vim.api.nvim_create_autocmd({ "BufWritePre" }, {
-	pattern = { "*" },
-	command = [[%s/\s\+$//e]],
-})

settings.json

@@ -1,5 +1,6 @@
 {
   "keyboard.dispatch": "keyCode",
+  "rust-analyzer.lens.implementations.enable": false,
   "godot_tools.gdscript_lsp_server_port": 6005,
   "terminal.integrated.profiles.linux": {
     "bash": {
@@ -9,9 +10,6 @@
     }
   },
   "editor.fontLigatures": true,
-  // "vim.handleKeys": {
-  //   "<C-w>": false
-  // },
   "editor.fontFamily": "FiraCode Nerd Font",
   "git.autofetch": true,
   "editor.formatOnSave": true,
@@ -30,24 +28,24 @@
   "[rust]": {
     "editor.defaultFormatter": "rust-lang.rust-analyzer"
   },
-  "editor.inlayHints.fontSize": 8,
+  "editor.inlayHints.enabled": "offUnlessPressed",
-  "editor.inlayHints.padding": true,
+  "workbench.colorTheme": "Night Coder Ash Contrast",
-  "workbench.colorTheme": "GitHub Dark",
   "gitdoc.autoCommitDelay": 3000,
   "workbench.iconTheme": "catppuccin-frappe",
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "editor.renderWhitespace": "all",
   "window.menuBarVisibility": "hidden",
   "workbench.startupEditor": "none",
-  "zenMode.fullScreen": false,
   "editor.rulers": [80],
   "[jsonc]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "vim.useSystemClipboard": true,
   "python.languageServer": "None",
-  "go.toolsManagement.autoUpdate": true,
+  "debug.onTaskErrors": "abort",
-  "debug.onTaskErrors": "abort"
+  "extensions.experimental.affinity": {
+    "asvetliakov.vscode-neovim": 1
+  },
+  "remote.autoForwardPortsSource": "hybrid"
 }

tmux.conf

@@ -1,15 +1,15 @@
 set -g mouse on
-
+#
 set -g set-clipboard on
 
 # List of plugins
-set -g @plugin 'tmux-plugins/tpm'
+# set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
+# set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'egel/tmux-gruvbox'
+# set -g @plugin 'egel/tmux-gruvbox'
-set -g @plugin 'artemave/tmux_super_fingers'
+# set -g @plugin 'artemave/tmux_super_fingers'
-set -g @super-fingers-extend ~/src/dotfiles/open_nvim_action.py
+# set -g @super-fingers-extend ~/src/dotfiles/open_nvim_action.py
 
-set -g @tmux-gruvbox 'dark'
+# set -g @tmux-gruvbox 'dark'
 
 # Other examples:
 # set -g @plugin 'github_username/plugin_name'
@@ -17,11 +17,11 @@ set -g @tmux-gruvbox 'dark'
 # set -g @plugin 'git@github.com:user/plugin'
 # set -g @plugin 'git@bitbucket.com:user/plugin'
 
-bind-key -n Home send Escape "OH"
+# bind-key -n Home send Escape "OH"
-bind-key -n End send Escape "OF"
+# bind-key -n End send Escape "OF"
-
-set -g default-terminal xterm-256color
-set -ga terminal-overrides ",xterm-256color:Tc"
 
+# set -g default-terminal xterm-256color
+# set -ga terminal-overrides ",xterm-256color:Tc"
+#
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run '~/.tmux/plugins/tpm/tpm'
+# run '~/.tmux/plugins/tpm/tpm'