From 73d8e6bd63b31d42167da3ae78e0a53456ee9c6e Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Tue, 18 Apr 2023 12:08:37 +0100
Subject: [PATCH] Use new monitor

---
 users/tsv/hyprland/hyprland.conf  | 2 +-
 users/tsv/hyprland/hyprpaper.conf | 2 +-
 users/tsv/nvim/lua/tsv/remap.lua  | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/users/tsv/hyprland/hyprland.conf b/users/tsv/hyprland/hyprland.conf
index 99ff336..745ee39 100644
--- a/users/tsv/hyprland/hyprland.conf
+++ b/users/tsv/hyprland/hyprland.conf
@@ -6,7 +6,7 @@
 #env = WLR_NO_HARDWARE_CURSORS,1
 
 monitor=eDP-1, preferred, auto, 1
-monitor=DP-1, preferred, auto, auto, transform, 1
+monitor=DP-2, preferred, auto, auto, transform, 1
 
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
diff --git a/users/tsv/hyprland/hyprpaper.conf b/users/tsv/hyprland/hyprpaper.conf
index a53221b..1090c6c 100644
--- a/users/tsv/hyprland/hyprpaper.conf
+++ b/users/tsv/hyprland/hyprpaper.conf
@@ -1,4 +1,4 @@
 preload = ~/img/wallpaper/carina_nebula.jpg
 wallpaper = eDP-1,~/img/wallpaper/carina_nebula.jpg
-wallpaper = DP-1,~/img/wallpaper/carina_nebula.jpg
+wallpaper = DP-2,~/img/wallpaper/carina_nebula.jpg
 
diff --git a/users/tsv/nvim/lua/tsv/remap.lua b/users/tsv/nvim/lua/tsv/remap.lua
index 398721c..b607e4a 100644
--- a/users/tsv/nvim/lua/tsv/remap.lua
+++ b/users/tsv/nvim/lua/tsv/remap.lua
@@ -15,6 +15,10 @@ vim.keymap.set('n', '<leader>tgb', builtin.git_branches, {})
 
 -- Fugitive
 vim.keymap.set("n", "<leader>gs", vim.cmd.Git);
+vim.keymap.set('n', '<leader>ds', ':Gvdiffsplit!<CR>');
+vim.keymap.set('n', '<leader>gl', ':diffget //2<CR>'); -- 'Get left' window
+vim.keymap.set('n', '<leader>gr', ':diffget //3<CR>'); -- 'Get right' window
 
 -- Nvim-tree
 vim.keymap.set("n", "<leader>nt", vim.cmd.NvimTreeToggle, {})
+