11 files changed, 101 insertions, 8 deletions
diff --git a/aliases/.aliases/aliases b/aliases/.aliases/aliases
index f50171e..7645284 100644
--- a/aliases/.aliases/aliases
+++ b/aliases/.aliases/aliases
@@ -40,7 +40,7 @@ alias fix-gpg-retrieve="gpg2 --keyserver-options auto-key-retrieve --receive-key
 alias fix-keyserver="[ -d ~/.gnupg ] || mkdir ~/.gnupg ; cp /etc/pacman.d/gnupg/gpg.conf ~/.gnupg/ ; echo 'done'" # Fix GPG server issues
 
 # Git and Version Control
-alias gs='git status' # Count installed git packages
+alias gs='git status -s'
 alias gitpkg='pacman -Q | grep -i "\-git" | wc -l' # Count installed git packages
 alias rg="rg --sort path"  # Ripgrep with sorted results
 alias lg="lazygit"         # Launch lazygit
@@ -103,4 +103,3 @@ alias tosddm="sudo pacman -S sddm --noconfirm --needed ; sudo systemctl enable s
 # random stuff
 alias rfc="PAGER='nvim +Man!' rfc"
 alias ff="fastfetch"
- 
diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config
index 486a6e8..ea4a907 100644
--- a/ghostty/.config/ghostty/config
+++ b/ghostty/.config/ghostty/config
@@ -12,7 +12,7 @@ font-family-italic = Monaspace Radon
 font-family-bold-italic = Monaspace Radon
 font-style = bold
 gtk-titlebar = false
-background-opacity = 0.6
+background-opacity = 0.85
 confirm-close-surface = false
 adjust-cell-height = 10%
 
diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..4f9d0cf
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,49 @@
+[core]
+    pager = delta
+
+[interactive]
+    diffFilter = delta --color-only
+
+[delta]
+    navigate = true  # use n and N to move between diff sections
+    dark = true      # or light = true, or omit for auto-detection
+
+[alias]
+  st = status -s
+  lol = log --oneline --graph --all
+
+[merge]
+    conflictstyle = zdiff3
+
+[http]
+	version = HTTP/1.1
+	postBuffer = 524288000
+
+[user]
+	email = omar.professional8777@gmail.com
+	name = omagdy
+
+[diff]
+	tool = nvimdiff
+
+[difftool]
+	prompt = false
+
+[column]
+  ui = auto
+
+[branch]
+  sort = -committerdate
+
+[tag]
+  sort = version:refname
+
+[init]
+  defaultBranch = main
+
+[diff]
+  algorithm = histogram
+  colorMoved = plain
+
+[push]
+  autoSetupRemote = true
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index ac097d7..60cae83 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -939,14 +939,15 @@ inactive_tab_font_style normal
 #: }}}
 
 #: Color scheme {{{
-# foreground #dddddd
-# background #000000
+#
+background #181d1c
+foreground #d4be98
 
 #: The foreground and background colors
 
 # background_opacity 0.5
 # background_opacity 0.50
-background_opacity 1.00
+background_opacity 0.80
 
 #: The opacity of the background. A number between 0 and 1, where 1 is
 #: opaque and 0 is fully transparent.  This will only work if
diff --git a/nvim/.config/nvim/lua/config/autocmds.lua b/nvim/.config/nvim/lua/config/autocmds.lua
index 8f6bb40..f3d156f 100644
--- a/nvim/.config/nvim/lua/config/autocmds.lua
+++ b/nvim/.config/nvim/lua/config/autocmds.lua
@@ -22,3 +22,4 @@
 --     end
 --   end,
 -- })
+--
diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua
index e5aa308..76a5f63 100644
--- a/nvim/.config/nvim/lua/config/keymaps.lua
+++ b/nvim/.config/nvim/lua/config/keymaps.lua
@@ -72,6 +72,21 @@ vim.cmd([[
     cnoreabbrev Qall qall
 ]])
 
+-- dap keymaps
+
+-- Eval var under cursor
+vim.keymap.set("n", "<space>;", function()
+  require("dapui").eval(nil, { enter = true })
+end)
+
+vim.keymap.set("n", "<space>b", require("dap").toggle_breakpoint)
+
+vim.keymap.set("n", "<F1>", require("dap").continue)
+vim.keymap.set("n", "<F7>", require("dap").step_over)
+vim.keymap.set("n", "<F8>", require("dap").step_into)
+vim.keymap.set("n", "<F9>", require("dap").step_out)
+vim.keymap.set("n", "<F12>", require("dap").restart)
+
 -- load the session for the current directory
 vim.keymap.set("n", "<leader>ql", function()
   require("persistence").load()
diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua
index ef5c5f7..6905561 100644
--- a/nvim/.config/nvim/lua/config/options.lua
+++ b/nvim/.config/nvim/lua/config/options.lua
@@ -9,8 +9,6 @@ vim.opt.confirm = false
 vim.o.guifont = "Monaspace Radon:bold,Noto Color Emoji:h10" -- text below applies for VimScript
 vim.o.undofile = true
 
-vim.o.spell = false
-
 -- Best search settings :)
 vim.opt.smartcase = true
 vim.opt.ignorecase = true
diff --git a/nvim/.config/nvim/lua/plugins/diffview.lua b/nvim/.config/nvim/lua/plugins/diffview.lua
new file mode 100644
index 0000000..b223c0d
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/diffview.lua
@@ -0,0 +1,4 @@
+return {
+  "sindrets/diffview.nvim",
+  lazy = false,
+}
diff --git a/nvim/.config/nvim/lua/plugins/neo-tree.lua b/nvim/.config/nvim/lua/plugins/neo-tree.lua.old
index 488ca77..488ca77 100644
--- a/nvim/.config/nvim/lua/plugins/neo-tree.lua
+++ b/nvim/.config/nvim/lua/plugins/neo-tree.lua.old
diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua
index 40817dc..11ddbbc 100644
--- a/nvim/.config/nvim/lua/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
@@ -55,6 +55,26 @@ return {
       desc = "Find Keymaps",
     },
     {
+      "<leader>cd",
+      function()
+        local actions = require("telescope.actions")
+        local action_state = require("telescope.actions.state")
+
+        require("telescope.builtin").git_commits({
+          attach_mappings = function(prompt_bufnr, _)
+            actions.select_default:replace(function()
+              actions.close(prompt_bufnr)
+              local entry = action_state.get_selected_entry()
+              local commit = entry.value
+              vim.cmd("DiffviewOpen " .. commit .. "..HEAD")
+            end)
+            return true
+          end,
+        })
+      end,
+      desc = "Diff between current commit and an arbitrary commit",
+    },
+    {
       "<leader>fw",
       function()
         require("telescope.builtin").live_grep()
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 4f9097c..d58ef3d 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -43,9 +43,15 @@ setw -g aggressive-resize on
 # don't detach tmux when killing a session
 set -g detach-on-destroy off
 
+# required by yazi for image preview
+set -g allow-passthrough on
+set -ga update-environment TERM
+set -ga update-environment TERM_PROGRAM
+
 # address vim mode switching delay (http://superuser.com/a/252717/65504)
 set -s escape-time 0
 
+
 set -as terminal-features ",*:RGB"
 # set -g default-terminal "tmux-256color"
 set -ag terminal-overrides ",xterm-256color:RGB"