Switched to ghostty

10 files changed, 23 insertions, 233 deletions

diff --git a/.config/ghostty/config b/.config/ghostty/config
new file mode 100644
index 0000000..d70c88a
--- /dev/null
+++ b/.config/ghostty/config
@@ -0,0 +1,9 @@
+font-family = ""
+font-family = "Adwaita Mono"
+
+theme = dark:Adwaita Dark,light:Adwaita
+shell-integration-features = false
+gtk-single-instance = true
+linux-cgroup = always
+window-theme = ghostty
+window-subtitle = working-directory
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 2d516ab..597d757 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -27,8 +27,14 @@ vim.o.mouse = 'a'
 vim.o.foldcolumn = "auto"
 vim.o.cursorline = true
 vim.o.laststatus = 2
-vim.o.statusline = "%!v:lua.require'lines'.status()"
-vim.o.tabline = "%!v:lua.require'lines'.tab()"
+vim.o.statusline =  table.concat({
+        '%<%n:',
+        '%f %h%w%m%r%y ',
+        '%=',
+        "%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}",
+        "%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}",
+        "%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}",
+      })
 vim.o.signcolumn = 'yes'
 
 vim.o.completeopt = "menuone,noselect,popup,fuzzy"
@@ -36,8 +42,6 @@ vim.o.showtabline = 2
 
 vim.o.exrc = true
 
-vim.cmd.colorscheme 'retrobox'
-
 vim.keymap.set({ 'n', 'x' }, '<leader>y', '"+y')
 vim.keymap.set('n', '<leader>p', '"+p')
 vim.keymap.set('x', '<leader>p', '"+P')
@@ -49,19 +53,6 @@ vim.keymap.set('n', '<Esc>', function()
 	vim.cmd.nohlsearch()
 end)
 
-vim.keymap.set('n', '<leader>t', function()
-	vim.cmd.split()
-	vim.cmd.terminal()
-end)
-
-vim.keymap.set('n', '<leader>o', function()
-	vim.cmd.Lexplore()
-end)
-
-vim.keymap.set('n', '<leader>O', function()
-	vim.cmd.Lexplore(vim.fn.expand "%:p:h")
-end)
-
 for _, value in ipairs({
 	'<Up>', '<Up>', '<Down>', '<Left>', '<Right>',
 	'<Home>', '<End>', '<PageUp>', '<PageDown>'
diff --git a/.config/nvim/lua/lines.lua b/.config/nvim/lua/lines.lua
deleted file mode 100644
index 3e0b539..0000000
--- a/.config/nvim/lua/lines.lua
+++ /dev/null
@@ -1,112 +0,0 @@
----@class Line
-local line = {}
-
----@param buffer integer
----@return string
-function line.get_formated_bufname(buffer)
-	buffer = buffer or 0
-
-	local name = vim.api.nvim_buf_get_name(buffer)
-	local buftype = vim.bo[buffer].buftype
-	if buftype == "terminal" then
-		name = vim.b[buffer].term_title
-	else
-		if #name == 0 then
-			name = '[No Name] (' .. (buftype or vim.bo[buffer].filetype) .. ')'
-		end
-		local modified = vim.bo[buffer].modified and '[+]' or ""
-		local readonly = vim.bo[buffer].readonly and '[RO]' or ""
-		name = name .. modified .. readonly
-	end
-
-	return name
-end
-
----@return string
-function line.status()
-	local window = vim.g.statusline_winid
-	local fillchar
-	if window == vim.api.nvim_get_current_win() then
-		fillchar = vim.opt.fillchars:get()["stl"]
-	else
-		fillchar = vim.opt.fillchars:get()["stlnc"]
-	end
-
-	if fillchar == nil then
-		fillchar = " "
-	end
-
-	local buffer = vim.api.nvim_win_get_buf(window)
-	local buftype = vim.bo[buffer].buftype
-
-
-	if buftype == "terminal" then
-		return table.concat({ vim.b[buffer].term_title, vim.api.nvim_buf_get_name(buffer) }, '%=')
-	end
-
-	if vim.bo[buffer].filetype == "netrw"
-	then
-		return "%f"
-	end
-
-	--	return '%=%-11.S%k%-14.(%l,%c%V%) %P'
-	local ruler = ""
-	if vim.o.ruler then
-		ruler = vim.o.rulerformat
-		if #ruler == 0 then
-			ruler = "%-14.(%l:%c%V%)" .. fillchar .. "%P"
-		end
-	end
-
-	local clients = {}
-	for _, client in ipairs(vim.lsp.get_clients()) do
-		if client.attached_buffers[buffer] then
-			table.insert(clients, client.name)
-		end
-	end
-
-	local cli = ""
-	if #clients ~= 0 then
-		cli = "(" .. table.concat(clients, ", ") .. ")"
-	end
-
-	return table.concat({
-		'%<%f',
-		'%h%w%m%r',
-		"%=",
-		vim.bo[buffer].filetype,
-		cli,
-		vim.bo[buffer].spelllang,
-		vim.bo[buffer].fileencoding,
-		vim.bo[buffer].fileformat,
-		'%-12.k',
-		'%S',
-		ruler
-	}, fillchar)
-end
-
----@return string
-function line.tab()
-	local tabs = vim.api.nvim_list_tabpages()
-	local format = vim.tbl_map(function(tab)
-		local str = ""
-		if tab == vim.api.nvim_get_current_tabpage() then
-			str = '%#TabLineSel#'
-		else
-			str = '%#TabLine#'
-		end
-		local buffer = vim.api.nvim_win_get_buf(vim.api.nvim_tabpage_get_win(tab))
-		return
-		    table.concat {
-			    str,
-			    "%", tab, 'T',
-			    line.get_formated_bufname(buffer),
-			    " %", tab, 'XX'
-		    }
-	end, tabs)
-	local tabline = table.concat(format, " ")
-
-	return tabline .. '%#TabLineFill#%T'
-end
-
-return line
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 4b5fe02..418179b 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/