hyprland: white both screens horizontal

hyprland/.config/hypr/white.conf

@@ -4,5 +4,5 @@ env = GBM_BACKEND,nvidia-drm
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 env = WLR_NO_HARDWARE_CURSORS,1
 
-monitor=DP-2,highres,0x0,2,transform,1
-monitor=DP-1,highres,1080x0,2
+monitor=DP-2,highres,0x0,2
+monitor=DP-1,highres,1920x0,2

nvim/.config/nvim/lazy-lock.json

@@ -30,6 +30,7 @@
   "orgmode": { "branch": "master", "commit": "edbcbfb7f156e0e4468d20e092e88a8127d6c12c" },
   "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
+  "telescope-git-grep.nvim": { "branch": "main", "commit": "814217cb30c076bc5edebe36e525b05a7c9eb4b2" },
   "telescope-tabs": { "branch": "master", "commit": "0a678eefcb71ebe5cb0876aa71dd2e2583d27fd3" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },

nvim/.config/nvim/lua/lupan/remap.lua

@@ -10,16 +10,14 @@ key('v', '<Space>', '<Nop>', { silent = true })
 key('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 key('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
-key("n", "<leader>dd", ":Explore<cr>", { desc = "[D]isplay [d]irectory" })
-key("n", "<leader>dv", ":Vexplore<cr>", { desc = "[D]isplay directory ([v]ertical split)" })
-key("n", "<leader>dh", ":Sexplore<cr>", { desc = "[D]isplay [d]irectory ([h]orizontal split)" })
-key("n", "<leader>dt", ":Lexplore 30<cr>", { desc = "[D]isplay directory [t]oggle" })
-key("n", "<leader>ct", ":ColorizerToggle<cr>", { desc = "[C]olorizer [t]oggle" })
-key("n", "<leader>ut", ":UndotreeToggle<cr>", { desc = "[U]undotree [t]oggle" })
+key("n", "<leader>dd", "<cmd>Explore<CR>", { desc = "[D]isplay [d]irectory" })
+key("n", "<leader>dv", "<cmd>Vexplore<CR>", { desc = "[D]isplay directory ([v]ertical split)" })
+key("n", "<leader>dh", "<cmd>Sexplore<CR>", { desc = "[D]isplay [d]irectory ([h]orizontal split)" })
+key("n", "<leader>dt", "<cmd>Lexplore 30<CR>", { desc = "[D]isplay directory [t]oggle" })
+key("n", "<leader>ct", "<cmd>ColorizerToggle<CR>", { desc = "[C]olorizer [t]oggle" })
+key("n", "<leader>ut", "<cmd>UndotreeToggle<CR>", { desc = "[U]undotree [t]oggle" })
 
--- telescope
-
-key('n', '<leader>gg', ':Git grep ', { desc = '[G]it [g]rep' })
+-- tabs
 
 key('n', '<leader>td', function()
   require('lupan.ui').tab_change_dir()
@@ -38,7 +36,7 @@ key('n', '<leader>tt', function()
 end, { desc = '[T]ab [t]oggle previous' })
 
 for i = 1, 9, 1 do
-  key('n', '<leader>t' .. i, '<cmd>' .. i .. 'tabnext<cr>', { desc = '[T]ab nr [' .. i .. ']' })
+  key('n', '<leader>t' .. i, '<cmd>' .. i .. 'tabnext<CR>', { desc = '[T]ab nr [' .. i .. ']' })
 end
 
 -- Diagnostic keymaps
@@ -47,18 +45,19 @@ vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagn
 vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' })
 vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
 
-key('n', '<leader>N', ':bn<cr>', { desc = '[N]ext buffer' })
-key('n', '<leader>P', ':bp<cr>', { desc = '[P]revious buffer' })
+key('n', '<leader>N', '<cmd>bn<CR>', { desc = '[N]ext buffer' })
+key('n', '<leader>P', '<cmd>bp<CR>', { desc = '[P]revious buffer' })
 
-key('n', '<leader>tc', ':tabnew<cr>', { desc = '[T]ab [c]reate' })
-key('n', '<leader>ts', ':tab split<cr>', { desc = '[T]ab [s]plit' })
-key('n', '<leader>tn', ':tabnext<cr>', { desc = '[T]ab [n]ext' })
-key('n', '<leader>tp', ':tabprevious<cr>', { desc = '[T]ab [p]revious' })
-key('n', '<leader>tf', ':tabfirst<cr>', { desc = '[T]ab [f]irst' })
-key('n', '<leader>tl', ':tablast<cr>', { desc = '[T]tab [l]ast' })
+key('n', '<leader>tc', '<cmd>tabnew<CR>', { desc = '[T]ab [c]reate' })
+key('n', '<leader>tx', '<cmd>tabclose<CR>', { desc = '[T]ab close' })
+key('n', '<leader>ts', '<cmd>tab split<CR>', { desc = '[T]ab [s]plit' })
+key('n', '<leader>tn', '<cmd>tabnext<CR>', { desc = '[T]ab [n]ext' })
+key('n', '<leader>tp', '<cmd>tabprevious<CR>', { desc = '[T]ab [p]revious' })
+key('n', '<leader>tf', '<cmd>tabfirst<CR>', { desc = '[T]ab [f]irst' })
+key('n', '<leader>tl', '<cmd>tablast<CR>', { desc = '[T]tab [l]ast' })
 
-key('v', 'J', ":m '>+1<cr>gv=gv", { desc = "Move lines down" })
-key('v', 'K', ":m '<-2<cr>gv=gv", { desc = "Move lines up" })
+key('v', 'J', ":m '>+1<CR>gv=gv", { desc = "Move lines down" })
+key('v', 'K', ":m '<-2<CR>gv=gv", { desc = "Move lines up" })
 
 -- Change window
 key('n', '<C-j>', '<C-w>j', opts)
@@ -79,11 +78,11 @@ key('n', 'g?', '<Plug>Lightspeed_S', { desc = "Lightspeed backward search" })
 
 -- Clipboard and quickfix
 key({ 'n', 'v' }, '<leader>y', '"+y', { desc = "Yank to clipboard" })
-key('n', '<leader>j', ':cn<CR>', { desc = "Quickfix next" })
-key('n', '<leader>k', ':cp<CR>', { desc = "Quickfix previous" })
-key('n', '<leader>co', ':copen<CR>', { desc = "Quickfix [O]pen" })
-key('n', '<leader>cc', ':cclose<CR>', { desc = "Quickfix [C]lose" })
-key('n', '<leader>ct', ':TroubleToggle<CR>', { desc = "Toggle [T]rouble" })
+key('n', '<leader>j', '<cmd>cn<CR>', { desc = "Quickfix next" })
+key('n', '<leader>k', '<cmd>cp<CR>', { desc = "Quickfix previous" })
+key('n', '<leader>co', '<cmd>copen<CR>', { desc = "Quickfix [O]pen" })
+key('n', '<leader>cc', '<cmd>cclose<CR>', { desc = "Quickfix [C]lose" })
+key('n', '<leader>ct', '<cmd>TroubleToggle<CR>', { desc = "Toggle [T]rouble" })
 
 -- luasnip
 

nvim/.config/nvim/lua/plugins/convenience.lua

@@ -9,6 +9,7 @@ return {
       require('which-key').register {
         ['<leader>c'] = { name = '[C]ode/Color', _ = 'which_key_ignore' },
         ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
+        ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
         ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
         ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
         ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },

nvim/.config/nvim/lua/plugins/git.lua

@@ -1,13 +1,23 @@
 return {
   -- Git
   {
-    "NeogitOrg/neogit",
+    'NeogitOrg/neogit',
     dependencies = {
-      "nvim-lua/plenary.nvim",
-      "sindrets/diffview.nvim",
-      "nvim-telescope/telescope.nvim",
+      'nvim-lua/plenary.nvim',
+      'sindrets/diffview.nvim',
+      'nvim-telescope/telescope.nvim',
     },
-    config = true
+    config = function()
+      local neogit = require('neogit')
+      neogit.setup()
+      vim.keymap.set('n', '<leader>go', neogit.open, { desc = 'Neo[g]it [O]pen' })
+      vim.keymap.set('n', '<leader>g.', function() neogit.open({ cwd = '%:p:h' }) end,
+        { desc = 'Neo[g]it open in current file repository' })
+      local diffview = require('diffview')
+      vim.keymap.set('n', '<leader>gh', diffview.file_history, { desc = '[G]it [H]istory' })
+      vim.keymap.set('n', '<leader>g%', function() diffview.file_history(nil, { '%' }) end,
+        { desc = '[G]it history for [%] current file' })
+    end
   },
 
   {

nvim/.config/nvim/lua/plugins/harpoon.lua

@@ -6,7 +6,7 @@ return {
     config = function()
       local harpoon = require "harpoon"
       harpoon:setup()
-      vim.keymap.set('n', '<leader>i', function() harpoon:list():append() end, { desc = "Harpoon add new [I]tem" })
+      vim.keymap.set('n', '<leader>i', function() harpoon:list():add() end, { desc = "Harpoon add new [I]tem" })
       vim.keymap.set('n', '<leader>m', function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
         { desc = "Harpoon [M]enu" })
       for i = 1, 9, 1 do

nvim/.config/nvim/lua/plugins/init.lua

@@ -31,8 +31,11 @@ return {
     config = function()
       local tsj = require('treesj')
       tsj.setup({
-        vim.keymap.set('n', '<leader>T', tsj.toggle, { desc = "[T]oggle one-line" }),
+        use_default_keymaps = false,
       })
+      vim.keymap.set('n', '<leader>tg', tsj.toggle, { desc = "[T]ree to[g]gle one-line" })
+      vim.keymap.set('n', '<leader>tj', tsj.join, { desc = "[T]ree [J]oin one-line" })
+      vim.keymap.set('n', '<leader>ts', tsj.split, { desc = "[T]ree [S]plit one-line" })
     end,
   },
 }

nvim/.config/nvim/lua/plugins/telescope.lua

@@ -28,6 +28,8 @@ return {
 
       -- Icons, requires Nerd font.
       { 'nvim-tree/nvim-web-devicons' },
+
+      'davvid/telescope-git-grep.nvim',
     },
     config = function()
       local telescope = require 'telescope'
@@ -51,6 +53,7 @@ return {
       pcall(telescope.load_extension, 'fzf')
       pcall(telescope.load_extension, 'ui-select')
       pcall(telescope.load_extension, 'whaler')
+      pcall(telescope.load_extension, 'git_grep')
 
       -- See `:help telescope.builtin`
       local builtin = require 'telescope.builtin'
@@ -70,6 +73,10 @@ return {
         { desc = '[S]earch with wha[L]er' })
       vim.keymap.set('n', '<leader>gf', builtin.git_files, { desc = '[G]it [F]iles' })
       vim.keymap.set('n', '<leader>gs', builtin.git_status, { desc = '[G]it [S]tatus' })
+      vim.keymap.set('n', '<leader>gg', function() telescope.extensions.git_grep.live_grep() end,
+        { desc = '[G]it [g]rep' })
+      vim.keymap.set('n', '<leader>gw', function() telescope.extensions.git_grep.grep() end,
+        { desc = '[G]it grep current [W]ord' })
 
       vim.keymap.set('n', '<leader>/', function()
         builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {