Skip to content

Commit 5d7d5b9

Browse files
committed
precommit before moving to lua autocmds
1 parent 6e48802 commit 5d7d5b9

7 files changed

Lines changed: 78 additions & 49 deletions

File tree

xdg_config/nvim/after/plugin/dap.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
},

xdg_config/nvim/after/plugin/git.lua

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff 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

xdg_config/nvim/lua/tj/telescope/init.lua

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,12 @@ function M.edit_zsh()
181181
end
182182

183183
function 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)
186191
end
187192

xdg_config/nvim/lua/tj/telescope/setup.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ end
1313

1414
require("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 = {

xdg_config/nvim/plugin/keymaps.lua

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,14 @@ end
8989

9090
nmap { "<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)

xdg_config/nvim/plugin/keymaps.vim

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ scriptencoding utf-8
1010

1111
nnoremap <Up> <C-y>
1212
nnoremap <Down> <C-e>
13-
" Switch between tabs
14-
nnoremap <Right> gt
15-
nnoremap <Left> gT
1613
1714
inoremap <Up> <C-o>:echom "--> k <-- "<CR>
1815
inoremap <Down> <C-o>:echom "--> j <-- "<CR>

xdg_config/nvim/plugin/packer_compiled.lua

Lines changed: 43 additions & 42 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)