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', 'tgb', builtin.git_branches, {}) -- Fugitive vim.keymap.set("n", "gs", vim.cmd.Git); +vim.keymap.set('n', 'ds', ':Gvdiffsplit!'); +vim.keymap.set('n', 'gl', ':diffget //2'); -- 'Get left' window +vim.keymap.set('n', 'gr', ':diffget //3'); -- 'Get right' window -- Nvim-tree vim.keymap.set("n", "nt", vim.cmd.NvimTreeToggle, {}) +