Compare commits
2
Commits
b9333e7b39
...
32f3429acf
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32f3429acf | ||
|
|
da83f9ebcb |
@@ -1,9 +1,9 @@
|
||||
[Settings]
|
||||
gtk-theme-name=Adwaita-dark
|
||||
gtk-icon-theme-name=Qogir-dark
|
||||
gtk-theme-name=Arc-Dark
|
||||
gtk-icon-theme-name=Qogir-Dark
|
||||
gtk-font-name=Noto Sans 10
|
||||
gtk-cursor-theme-name=Qogir-dark
|
||||
gtk-cursor-theme-size=0
|
||||
gtk-cursor-theme-name=Qogir-Dark
|
||||
gtk-cursor-theme-size=20
|
||||
gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
|
||||
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
|
||||
gtk-button-images=0
|
||||
@@ -12,5 +12,6 @@ gtk-enable-event-sounds=0
|
||||
gtk-enable-input-feedback-sounds=0
|
||||
gtk-xft-antialias=1
|
||||
gtk-xft-hinting=1
|
||||
gtk-xft-hintstyle=hintmedium
|
||||
gtk-xft-hintstyle=hintslight
|
||||
gtk-xft-rgba=rgb
|
||||
gtk-application-prefer-dark-theme=1
|
||||
|
||||
+8
-13
@@ -833,10 +833,7 @@ local function makespec_diffview()
|
||||
"DiffviewRefresh",
|
||||
"DiffviewFileHistory",
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "DiffView Tab" },
|
||||
{ "<leader>gh", "<cmd>DiffviewFileHistory<cr>", desc = "File History Tab" },
|
||||
},
|
||||
keys = {},
|
||||
}
|
||||
end
|
||||
local function makespec_fugitive()
|
||||
@@ -884,6 +881,7 @@ local function makespec_gitsigns()
|
||||
vim.cmd.normal({ "]c", bang = true })
|
||||
else
|
||||
gs.nav_hunk("next")
|
||||
vim.schedule(gs.preview_hunk_inline)
|
||||
end
|
||||
end
|
||||
local function prev_hunk()
|
||||
@@ -891,14 +889,14 @@ local function makespec_gitsigns()
|
||||
vim.cmd.normal({ "[c", bang = true })
|
||||
else
|
||||
gs.nav_hunk("prev")
|
||||
vim.schedule(gs.preview_hunk_inline)
|
||||
end
|
||||
end
|
||||
|
||||
local function bmap(mode, l, r, desc) vim.keymap.set(mode, l, r, { buffer = bufnr, desc = desc }) end
|
||||
|
||||
-- Navigation
|
||||
bmap("n", "<M-,>", next_hunk, "Next Hunk")
|
||||
bmap("n", "<M-.>", prev_hunk, "Prev Hunk")
|
||||
bmap("n", "<M-,>", prev_hunk, "Prev Hunk")
|
||||
bmap("n", "<M-.>", next_hunk, "Next Hunk")
|
||||
bmap("n", "[h", prev_hunk, "Prev Hunk")
|
||||
bmap("n", "]h", next_hunk, "Next Hunk")
|
||||
|
||||
@@ -909,6 +907,8 @@ local function makespec_gitsigns()
|
||||
-- Hunk
|
||||
bmap("n", "<leader>gi", gs.preview_hunk_inline, "Preview Hunk Inline")
|
||||
bmap("n", "<leader>gp", gs.preview_hunk, "Preview Hunk")
|
||||
bmap("n", "<leader>gd", gs.diffthis, "Diff This (Index)")
|
||||
bmap("n", "<leader>gD", function() gs.diffthis("~") end, "Diff This (HEAD~1)")
|
||||
bmap("n", "<leader>gq", gs.setqflist, "File Hunks to QuickFix")
|
||||
bmap("n", "<leader>gQ", function() gs.setqflist("all") end, "All Hunks to QuickFix")
|
||||
bmap("n", "<leader>gx", gs.reset_hunk, "Reset Hunk")
|
||||
@@ -926,7 +926,7 @@ local function makespec_gitsigns()
|
||||
bmap("n", "<leader>gtb", gs.toggle_current_line_blame, "Toggle Line Blame")
|
||||
bmap("n", "<leader>gtd", gs.toggle_deleted, "Toggle Deleted")
|
||||
|
||||
-- Text object, e.g. for dih to delete hunk
|
||||
-- Text Object (e.g., 'dih' to delete hunk)
|
||||
bmap({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "Select Hunk")
|
||||
end
|
||||
|
||||
@@ -934,11 +934,6 @@ local function makespec_gitsigns()
|
||||
"lewis6991/gitsigns.nvim",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
opts = {
|
||||
signcolumn = true,
|
||||
numhl = false,
|
||||
linehl = false,
|
||||
word_diff = false,
|
||||
signs_staged_enable = false,
|
||||
on_attach = on_gitsigns_attach,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ if TYPE_CHECKING:
|
||||
|
||||
c: "ConfigContainer" = c # type: ignore # noqa: F821
|
||||
config: "ConfigAPI" = config # type: ignore # noqa: F821
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
config.load_autoconfig(True)
|
||||
config.bind("<", "tab-move -")
|
||||
@@ -47,7 +46,6 @@ config.bind("tj", "back -t", mode="normal")
|
||||
config.bind("wj", "back -w", mode="normal")
|
||||
config.bind("tk", "forward -t", mode="normal")
|
||||
config.bind("wk", "forward -w", mode="normal")
|
||||
config.bind("ø", "cmd-set-text :")
|
||||
config.bind("m", 'cmd-set-text :quickmark-add {url:pretty} "', mode="normal")
|
||||
config.bind("D", "tab-close")
|
||||
config.bind(",m", "hint links spawn -d mpv {hint-url}", mode="normal")
|
||||
|
||||
@@ -20,6 +20,9 @@ smart_borders on
|
||||
# Default Font
|
||||
font pango:Noto Sans Regular 10
|
||||
|
||||
# Cursor
|
||||
seat seat0 xcursor_theme Adwaita 0
|
||||
|
||||
# Title format for windows
|
||||
set $focus #00E5FF
|
||||
set $unfocused #333333
|
||||
|
||||
Reference in New Issue
Block a user