Compare commits

..

2 Commits

2 changed files with 50 additions and 101 deletions

View File

@@ -10,10 +10,6 @@ return {
Snacks.picker.buffers() Snacks.picker.buffers()
end, { desc = "Buffers" }) end, { desc = "Buffers" })
set("n", "<leader>e", function()
Snacks.explorer()
end, { desc = "File Explorer" })
set("n", "<leader>r", function() set("n", "<leader>r", function()
Snacks.picker.recent() Snacks.picker.recent()
end, { desc = "Recent files" }) end, { desc = "Recent files" })
@@ -22,10 +18,6 @@ return {
Snacks.picker.resume() Snacks.picker.resume()
end, { desc = "Resume" }) end, { desc = "Resume" })
set("n", "<leader>a", function()
Snacks.picker.projects()
end, { desc = "Projects" })
set("n", "<leader>l", function() set("n", "<leader>l", function()
Snacks.picker.lines() Snacks.picker.lines()
end, { desc = "Buffer lines" }) end, { desc = "Buffer lines" })
@@ -42,34 +34,10 @@ return {
Snacks.picker.grep() Snacks.picker.grep()
end, { desc = "Grep" }) end, { desc = "Grep" })
set("n", "<leader>B", function() set("n", "<leader>S", function()
Snacks.picker.git_branches()
end, { desc = "Git Branches" })
set({ "n", "v" }, "<leader>xB", function()
Snacks.gitbrowse()
end, { desc = "Git Browse" })
set("n", "<leader>i", function()
Snacks.picker.git_log_line()
end, { desc = "Git Log Line" })
set("n", "<leader>I", function()
Snacks.picker.git_log()
end, { desc = "Git Log" })
set("n", "<leader>t", function()
Snacks.picker.git_status() Snacks.picker.git_status()
end, { desc = "Git Status" }) end, { desc = "Git Status" })
set("n", "<leader>H", function()
Snacks.picker.git_diff()
end, { desc = "Git Diff (Hunks)" })
set("n", "<leader>xS", function()
Snacks.picker.git_stash()
end, { desc = "Git Stash" })
set("n", "<leader>f", function() set("n", "<leader>f", function()
Snacks.picker.git_files() Snacks.picker.git_files()
end, { desc = "Find Git Files" }) end, { desc = "Find Git Files" })
@@ -78,9 +46,9 @@ return {
Snacks.picker.git_grep() Snacks.picker.git_grep()
end, { desc = "Git Grep" }) end, { desc = "Git Grep" })
set({ "n", "v" }, "<leader>o", function() set("n", "<leader>w", function()
Snacks.picker.grep_word() Snacks.picker.grep_word()
end, { desc = "Grep Visual Selection or Word" }) end, { desc = "Grep word" })
set("n", "<leader>g", function() set("n", "<leader>g", function()
Snacks.lazygit() Snacks.lazygit()
@@ -88,7 +56,7 @@ return {
set("n", "<leader>G", function() set("n", "<leader>G", function()
Snacks.lazygit.log_file() Snacks.lazygit.log_file()
end, { desc = "Git Log File" }) end, { desc = "Lazygit log file" })
set("n", "<leader>m", function() set("n", "<leader>m", function()
Snacks.picker.marks() Snacks.picker.marks()
@@ -96,23 +64,15 @@ return {
set("n", "<leader>M", function() set("n", "<leader>M", function()
Snacks.picker.man() Snacks.picker.man()
end, { desc = "Man pages" }) end, { desc = "Marks" })
set("n", "<leader>U", function() set("n", "<leader>U", function()
Snacks.picker.undo() Snacks.picker.undo()
end, { desc = "Undo History" }) end, { desc = "Marks" })
set("n", "<leader>q", function() set("n", "<leader>xc", function()
Snacks.picker.qflist()
end, { desc = "Quickfix list" })
set("n", "<leader>Q", function()
Snacks.picker.loclist()
end, { desc = "Location List" })
set("n", "<leader>xs", function()
Snacks.picker.colorschemes() Snacks.picker.colorschemes()
end, { desc = "Colorschemes" }) end, { desc = "Marks" })
set("n", "<leader>n", function() set("n", "<leader>n", function()
Snacks.notifier.show_history() Snacks.notifier.show_history()
@@ -122,19 +82,19 @@ return {
Snacks.picker.notifications() Snacks.picker.notifications()
end, { desc = "Notifications" }) end, { desc = "Notifications" })
set("n", "<leader>xC", function() set("n", "<leader>C", function()
Snacks.picker.commands() Snacks.picker.commands()
end, { desc = "Commands" }) end, { desc = "Commands" })
set("n", "<leader>h", function() set("n", "<leader>h", function()
Snacks.picker.highlights()
end, { desc = "Keymaps" })
set("n", "<leader>k", function()
Snacks.picker.keymaps() Snacks.picker.keymaps()
end, { desc = "Keymaps" }) end, { desc = "Keymaps" })
set("n", "<leader>xh", function() set("n", "<leader>:", function()
Snacks.picker.highlights()
end, { desc = "Hightlights" })
set("n", "<leader>xc", function()
Snacks.picker.command_history() Snacks.picker.command_history()
end, { desc = "Command History" }) end, { desc = "Command History" })
@@ -149,15 +109,6 @@ return {
set("n", "<leader>z", function() set("n", "<leader>z", function()
Snacks.zen.zoom() Snacks.zen.zoom()
end, { desc = "Toggle Zoom" }) end, { desc = "Toggle Zoom" })
set("n", "<leader>.", function()
Snacks.scratch()
end, { desc = "Toggle Scratch Buffer" })
set("n", "<leader>x.", function()
Snacks.scratch.select()
end, { desc = "Select Scratch Buffer" })
-- LSP -- LSP
set("n", "gd", function() set("n", "gd", function()

View File

@@ -58,50 +58,48 @@ XTerm.vt100.color15: #ECEFF4
st.font: FiraCode Nerd Font:size=10 st.font: FiraCode Nerd Font:size=10
! gruvebox colors from https://github.com/morhetz/gruvbox-contrib/tree/master/deepin-terminal
#ifdef THEME_DARK #ifdef THEME_DARK
st.lightmode: 0 st.lightmode: 0
st.background: #282828 st.background: #1f212e
st.foreground: #d5c4a1 st.foreground: #9da0af
st.cursorColor: #bf8040 st.cursorColor: #bf8040
st.reverse-cursor: #1f212e st.reverse-cursor: #1f212e
st.color0: #282828 st.color0: #1f212e
st.color1: #cc241d st.color1: #862d2d
st.color2: #98971a st.color2: #3a783a
st.color3: #d79921 st.color3: #707010
st.color4: #458588 st.color4: #345eb2
st.color5: #b16286 st.color5: #cc66cc
st.color6: #689d6a st.color6: #3a7878
st.color7: #a89984 st.color7: #a1a3aa
st.color8: #928374 st.color8: #4d4d4d
st.color9: #fb4934 st.color9: #c27070
st.color10: #b8bb26 st.color10: #40bf40
st.color11: #fabd2f st.color11: #acac53
st.color12: #83a598 st.color12: #6b8ac7
st.color13: #d3869b st.color13: #8f248f
st.color14: #8ec07c st.color14: #509595
st.color15: #ebdbb2 st.color15: #dbdff0
#else #else
st.lightmode: 1 st.lightmode: 1
st.background: #fbf1c7 st.background: #f2f2f3
st.foreground: #3c3836 st.foreground: #1f212e
st.cursorColor: #bf8040 st.cursorColor: #bf8040
st.reverse-cursor: #1f212e st.reverse-cursor: #1f212e
st.color0: #282828 st.color0: #1f212e
st.color1: #cc241d st.color1: #862d2d
st.color2: #98971a st.color2: #3a783a
st.color3: #d79921 st.color3: #707010
st.color4: #458588 st.color4: #345eb2
st.color5: #b16286 st.color5: #cc66cc
st.color6: #689d6a st.color6: #3a7878
st.color7: #7c6f64 st.color7: #a1a3aa
st.color8: #928374 st.color8: #73778c
st.color9: #9d0006 st.color9: #c27070
st.color10: #79740e st.color10: #40bf40
st.color11: #b57614 st.color11: #acac53
st.color12: #076678 st.color12: #6b8ac7
st.color13: #8f3f71 st.color13: #8f248f
st.color14: #427b58 st.color14: #509595
st.color15: #3c3836 st.color15: #dae4f1
#endif #endif