From 79e82f8c6ab5486cdbc974bc14bb1fa9b45d4c7c Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@gwairfelin.com>
Date: Tue, 9 Sep 2025 14:10:07 +0100
Subject: [PATCH 1/2] Update tmux config

---
 home/dot_tmux.conf | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/home/dot_tmux.conf b/home/dot_tmux.conf
index a3e98f7..daaaf09 100644
--- a/home/dot_tmux.conf
+++ b/home/dot_tmux.conf
@@ -42,9 +42,9 @@ set -g allow-rename off
 #bind C-y run "tmux save-buffer - | xclip -i"
 
 #move wayland clipbord into tmux buffer
-bind C-p run "tmux set-buffer \"$(wm_paste)\""
+bind C-p run "tmux set-buffer \"$(wl-paste)\""
 # move tmux copy buffer into wayland clipboard
-bind C-y run "tmux save-buffer - | wm_copy"
+bind C-y run "tmux save-buffer - | wl-copy"
 
 
 # loud or quiet?
@@ -54,13 +54,13 @@ set-option -g visual-silence off
 set-window-option -g monitor-activity off
 set-option -g bell-action none
 
-#### COLOUR (Solarized light)
+#### COLOUR (Solarized dark)
 
 # default statusbar colors
-set-option -g status-style fg=yellow,bg=white #yellow and base2
+set-option -g status-style fg=yellow,bg=black #yellow and base02
 
 # default window title colors
-set-window-option -g window-status-style fg=brightyellow,bg=default #base0 and default
+set-window-option -g window-status-style fg=brightblue,bg=default #base0 and default
 #set-window-option -g window-status-style dim
 
 # active window title colors
@@ -68,21 +68,21 @@ set-window-option -g window-status-current-style fg=brightred,bg=default #orange
 #set-window-option -g window-status-current-style bright
 
 # pane border
-set-option -g pane-border-style fg=white #base2
-set-option -g pane-active-border-style fg=brightcyan #base1
+set-option -g pane-border-style fg=black #base02
+set-option -g pane-active-border-style fg=brightgreen #base01
 
 # message text
-set-option -g message-style fg=brightred,bg=white #orange and base2
+set-option -g message-style fg=brightred,bg=black #orange and base01
 
 # pane number display
-set-option -g display-panes-active-colour blue #blue
-set-option -g display-panes-colour brightred #orange
+set-option -g display-panes-active-colour brightred #orange
+set-option -g display-panes-colour blue #blue
 
 # clock
 set-window-option -g clock-mode-colour green #green
 
 # bell
-set-window-option -g window-status-bell-style fg=white,bg=red #base2, red
+set-window-option -g window-status-bell-style fg=black,bg=red #base02, red
 
 # Set hyperlink support
 set -ga terminal-features "*:hyperlinks"

From a78805ebccf00428b0ce5ed64ed409747eb7148c Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@gwairfelin.com>
Date: Tue, 9 Sep 2025 14:11:07 +0100
Subject: [PATCH 2/2] Improve vim conflict resolution

---
 home/dot_config/git/config                    |  4 +++
 .../nvim/lua/plugins/conflict-markers.lua     | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 home/dot_config/nvim/lua/plugins/conflict-markers.lua

diff --git a/home/dot_config/git/config b/home/dot_config/git/config
index 952b443..c0a8ebb 100644
--- a/home/dot_config/git/config
+++ b/home/dot_config/git/config
@@ -8,6 +8,7 @@
     syntax-theme = Solarized (dark)
 [diff]
     colorMoved = default
+    tool = vimdiff
 [interactive]
     diffFilter = delta --color-only
 [color]
@@ -41,6 +42,9 @@
 [merge]
     conflictStyle = zdiff3
     ff = true
+    tool = vimdiff
+[mergetool "vimdiff"]
+    cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [push]
     default = simple
 [alias]
diff --git a/home/dot_config/nvim/lua/plugins/conflict-markers.lua b/home/dot_config/nvim/lua/plugins/conflict-markers.lua
new file mode 100644
index 0000000..403a48b
--- /dev/null
+++ b/home/dot_config/nvim/lua/plugins/conflict-markers.lua
@@ -0,0 +1,26 @@
+return {
+  "akinsho/git-conflict.nvim",
+  lazy = false,
+  opts = {
+    default_mappings = {
+      ours = "<leader>ho",
+      theirs = "<leader>ht",
+      none = "<leader>h0",
+      both = "<leader>hb",
+      next = "]x",
+      prev = "[x",
+    },
+  },
+  keys = {
+    {
+      "<leader>gx",
+      "<cmd>GitConflictListQf<cr>",
+      desc = "List Conflicts",
+    },
+    {
+      "<leader>gr",
+      "<cmd>GitConflictRefresh<cr>",
+      desc = "Refresh Conflicts",
+    },
+  },
+}