Commit Diff


commit - dc08296833d4e27f91bff440db2df8cee11f8f93
commit + c5fd5e585587acaf183b0e007cc74f391d53f11f
blob - a422c2dbc1fb185e4ecfe2c7c0b0c8a566b13788
blob + 77271c0a345bd822690cd5db3af680df67f81fa2
--- lua/config/colors.lua
+++ lua/config/colors.lua
@@ -5,6 +5,7 @@ vim.cmd.colorscheme('quiet')
 vim.api.nvim_set_hl(0, 'Keyword', { bold = true })
 vim.api.nvim_set_hl(0, 'Comment', {fg = '#696969', italic = true })
 vim.api.nvim_set_hl(0, 'String', { fg = '#008000' })
+-- vim.api.nvim_set_hl(0, 'String', { fg = '#696969' })
 vim.api.nvim_set_hl(0, 'Constant', { fg = '#999999' })
 vim.api.nvim_set_hl(0, 'Visual', { bg = '#555555' })
 vim.api.nvim_set_hl(0, 'DiagnosticError', { fg = '#708090' })
blob - 216ec7c82c3cfc87896236c3d9ca555122ec4997
blob + f62800acdf12eec276be33cf4facbe3e88f6fa1b
--- lua/config/keymaps.lua
+++ lua/config/keymaps.lua
@@ -9,20 +9,11 @@ vim.keymap.set('n', '<leader>e', ':Ex<CR>')
 -- Diagnostic keymaps
 vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
 
--- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
--- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
--- is not what someone will guess without a bit more experience.
-
--- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping
--- or just use <C-\><C-n> to exit terminal mode
--- See `:help terminal`
-vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
-
 -- TIP: Disable arrow keys in normal mode
-vim.keymap.set('n', '<left>', '<cmd>echo "No Arrows!"<CR>')
-vim.keymap.set('n', '<right>', '<cmd>echo "No Arrows!"<CR>')
-vim.keymap.set('n', '<up>', '<cmd>echo "No Arrows!"<CR>')
-vim.keymap.set('n', '<down>', '<cmd>echo "No Arrows!"<CR>')
+vim.keymap.set('n', '<left>', '')
+vim.keymap.set('n', '<right>', '')
+vim.keymap.set('n', '<up>', '')
+vim.keymap.set('n', '<down>', '')
 
 -- Keybinds to make split navigation easier.
 -- Use CTRL+<hjkl> to switch between windows
@@ -50,20 +41,12 @@ vim.keymap.set('n', '<leader>sg', '<cmd>Telescope live
 vim.keymap.set('n', '<leader>sb', '<cmd>Telescope buffers<CR>', { desc = 'List open buffers' })
 vim.keymap.set('n', '<leader>st', '<cmd>Telescope help_tags<CR>', { desc = 'Search help tags' })
 vim.keymap.set('n', '<leader>sr', '<cmd>Telescope oldfiles<CR>', { desc = 'List recent files' })
-vim.keymap.set('n', '<leader>sh', function()
-    require('custom.telescope').git_bcommits_with_preview()
-end, { desc = 'Search Git History (custom)' })
-vim.keymap.set(
-    'n',
-    '<leader>s/',
-    '<cmd>Telescope current_buffer_fuzzy_find<CR>',
-    { desc = 'Fuzzy find in current buffer' }
-)
+vim.keymap.set('n', '<leader>sh', '<cmd>Telescope git_bcommits<CR>', { desc = 'List git history' })
 
 -- Conform
 vim.keymap.set({ 'n', 'x' }, '<leader>f', function()
-    require('conform').format({ async = true, lsp_fallback = true })
-end, { desc = '[C]ode [F]ormat' })
+    require('conform').format({ async = true, lsp_fallback = false })
+end, { desc = 'Format code' })
 
 -- LSP keymaps (set on LspAttach)
 vim.api.nvim_create_autocmd('LspAttach', {
@@ -103,6 +86,5 @@ vim.api.nvim_create_autocmd('BufEnter', {
         gs_map('<leader>b', gitsigns.blame_line, 'toggle git show blame line')
         gs_map('tb', gitsigns.toggle_current_line_blame, 'toggle git show blame line')
         gs_map('td', gitsigns.toggle_deleted, 'Toggle git show deleted')
-        gs_map('tw', gitsigns.toggle_word_diff, 'Toggle git show deleted')
     end,
 })
blob - 4a26da6f36c522a3ba0fca626b55cfdbd20ed758
blob + 2e09dcf843f72a4b0f07ecec0eadff040bb5caf1
--- lua/config/options.lua
+++ lua/config/options.lua
@@ -1,5 +1,5 @@
 vim.o.number = true
-vim.o.relativenumber = true
+vim.o.relativenumber = false
 
 -- Enable mouse mode, can be useful for resizing splits for example!
 vim.o.mouse = 'a'