File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -540,7 +540,7 @@ local _ = dap_ui.setup {
540540 },
541541
542542 tray = {
543- elements = { " repl " },
543+ elements = {},
544544 size = 15 ,
545545 position = " bottom" , -- Can be "bottom" or "top"
546546 },
Original file line number Diff line number Diff line change @@ -23,3 +23,14 @@ nmap {
2323 neogit .open { " commit" }
2424 end ,
2525}
26+
27+ -- hi NeogitNotificationInfo guifg=#80ff95
28+ -- hi NeogitNotificationWarning guifg=#fff454
29+ -- hi NeogitNotificationError guifg=#c44323
30+ -- hi def NeogitDiffAddHighlight guibg=#404040 guifg=#859900
31+ -- hi def NeogitDiffDeleteHighlight guibg=#404040 guifg=#dc322f
32+ -- hi def NeogitDiffContextHighlight guibg=#333333 guifg=#b2b2b2
33+ -- hi def NeogitHunkHeader guifg=#cccccc guibg=#404040
34+ -- hi def NeogitHunkHeaderHighlight guifg=#cccccc guibg=#4d4d4d
35+
36+ -- git config --global merge.conflictStyle diff3
Original file line number Diff line number Diff line change @@ -181,7 +181,12 @@ function M.edit_zsh()
181181end
182182
183183function M .fd ()
184- local opts = themes .get_ivy { hidden = false , sorting_strategy = " ascending" }
184+ local opts = themes .get_ivy {
185+ hidden = false ,
186+ sorting_strategy = " ascending" ,
187+ layout_config = { --[[ height = 9 ]]
188+ },
189+ }
185190 require (" telescope.builtin" ).fd (opts )
186191end
187192
Original file line number Diff line number Diff line change 1313
1414require (" telescope" ).setup {
1515 defaults = {
16- prompt_prefix = " ❯ " ,
17- selection_caret = " ❯ " ,
16+ prompt_prefix = " > " ,
17+ selection_caret = " > " ,
18+ entry_prefix = " " ,
19+ multi_icon = " <>" ,
1820
1921 winblend = 0 ,
2022
@@ -74,6 +76,8 @@ require("telescope").setup {
7476 -- This is nicer when used with smart-history plugin.
7577 [" <C-k>" ] = actions .cycle_history_next ,
7678 [" <C-j>" ] = actions .cycle_history_prev ,
79+ [" <c-g>s" ] = actions .select_all ,
80+ [" <c-g>a" ] = actions .add_selection ,
7781
7882 [" <c-space>" ] = function (prompt_bufnr )
7983 local opts = {
Original file line number Diff line number Diff line change 8989
9090nmap { " <leader>mdp" , markdown_paste }
9191-- nnoremap { "<space><space>s", "<cmd>source ~/.config/nvim/after/plugin/luasnip.lua<CR>" }
92+
93+ -- Switch between tabs
94+ vim .keymap .set (" n" , " <Right>" , function ()
95+ vim .cmd [[ checktime]]
96+ vim .api .nvim_feedkeys (" gt" , " n" , true )
97+ end )
98+
99+ vim .keymap .set (" n" , " <Left>" , function ()
100+ vim .cmd [[ checktime]]
101+ vim .api .nvim_feedkeys (" gT" , " n" , true )
102+ end )
Original file line number Diff line number Diff line change @@ -10,9 +10,6 @@ scriptencoding utf-8
1010
1111nnoremap <Up> <C-y>
1212nnoremap <Down> <C-e>
13- " Switch between tabs
14- nnoremap <Right> gt
15- nnoremap <Left> gT
1613
1714inoremap <Up> <C-o> :echom "--> k <-- "<CR>
1815inoremap <Down> <C-o> :echom "--> j <-- "<CR>
Load Diff Large diffs are not rendered by default.
You can’t perform that action at this time.
0 commit comments