From 9ffce7022e1f6d19d42b8c42500ca693a3c0fdb2 Mon Sep 17 00:00:00 2001
From: c0dev0id <sh+git@codevoid.de>
Date: Thu, 26 Dec 2024 20:41:45 +0100
Subject: [PATCH] Update 2024-12-26 20:41 OpenBSD/amd64-t14

---
 .config/luakit/rc.lua |  4 ++--
 .gitconfig            |  2 ++
 .kshrc                |  1 +
 .vim/vimrc            | 17 +++++++++--------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.config/luakit/rc.lua b/.config/luakit/rc.lua
index ae59bba..4ac563b 100644
--- a/.config/luakit/rc.lua
+++ b/.config/luakit/rc.lua
@@ -39,7 +39,7 @@ window.add_signal("build", function (w)
     l.layout:pack(widgets.uri())
     l.layout:pack(widgets.hist())
     l.layout:pack(widgets.progress())
-    l.layout:pack(widgets.zoom())
+    -- l.layout:pack(widgets.zoom())
 
     -- Right-aligned status bar widgets
     r.layout:pack(widgets.buf())
@@ -55,7 +55,7 @@ local binds = require "binds"
 
 -- Settings (the commented ones do not [yet] work)
 local settings = require "settings"
-local settings_chrome = require "settings_chrome"
+-- local settings_chrome = require "settings_chrome"
 
 -- settings.window.home_page           = "luakit://newtab"
 -- settings.window.scroll_step         = 20
diff --git a/.gitconfig b/.gitconfig
index a5dbfea..503a09c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -39,3 +39,5 @@
 [credential "https://github.wdf.sap.corp"]
 	helper = 
 	helper = !/usr/bin/gh auth git-credential
+[difftool]
+	prompt = false
diff --git a/.kshrc b/.kshrc
index 12030b2..c7c5399 100644
--- a/.kshrc
+++ b/.kshrc
@@ -212,6 +212,7 @@ alias mygit-changed-files="git --no-pager whatchanged origin/HEAD..HEAD | grep -
 mygit-diffbranch() {
     for file in $(mygit-changed-files)
     do
+        git difftool -y ..origin/HEAD
     done
 }
 
diff --git a/.vim/vimrc b/.vim/vimrc
index 555c84d..e32b2e9 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -88,14 +88,12 @@ let g:currentmode={
 
 " STATUSLINE, AIRLINE/POWERLINE IS FOR NOOBS
 set statusline=\ %{toupper(g:currentmode[mode()])}
-set statusline+=\ %f
 set statusline+=%m%r%h%w%q
+set statusline+=\ bufNo:%n
+set statusline+=\ %F:%l:%c
 set statusline+=%=
-set statusline+=\ BUF:%n
-set statusline+=\ %{&fileencoding?&fileencoding:&encoding}
-set statusline+=\ %{&fileformat}
-set statusline+=\ HEX:%B\ INT:%b
-set statusline+=\ ROW:%l\ COL:%c
+set statusline+=\ (%{&fileformat}/%{&fileencoding?&fileencoding:&encoding})
+set statusline+=\ 0x%B
 set statusline+=\ %p%%
 set statusline+=\ 
 
@@ -156,7 +154,7 @@ highlight SpellBad cterm=NONE ctermfg=darkred ctermbg=NONE
 
 " VIMDIFF COLOR FIX
 highlight DiffAdd    ctermfg=76 ctermbg=234
-highlight DiffDelete ctermfg=234 ctermbg=0
+highlight DiffDelete ctermfg=234 ctermbg=52
 highlight DiffChange ctermfg=255 ctermbg=234
 highlight DiffText   ctermfg=166 ctermbg=234
 
@@ -202,6 +200,9 @@ imap <silent> <Up> <C-o> gk
 nmap <silent> <Down> gj
 nmap <silent> <Up> gk
 
+" NEXT WINDOW
+nnoremap <Tab> :wincmd w<cr>
+
 " USE ARROW / VIM KEYS INSIDE OMNIBOX
 inoremap <expr> j pumvisible() ? '<C-n>' : 'j'
 inoremap <expr> k pumvisible() ? '<C-p>' : 'k'
@@ -289,7 +290,7 @@ function! TogglePasteMode()
     endif
     let s:enablepaste = s:enablepaste ? 0 : 1
 endfunction
-nmap <tab> :call TogglePasteMode()<CR>
+nmap <S-tab> :call TogglePasteMode()<CR>
 
 if executable('ugrep')
     set grepprg=ugrep\ -RInk\ -j\ -u\ --tabs=1\ --ignore-files