From c676e8e7dd0717b84fe28000eb7814c4d5825b4a Mon Sep 17 00:00:00 2001
From: Fabian Becker <fbecker18@bloomberg.net>
Date: Fri, 29 Jul 2022 16:40:51 +0200
Subject: [PATCH] Fix nvim-cmp setup and telescope config

---
 .config/nvim/after/plugin/cmp.lua         | 8 ++++----
 .config/nvim/after/plugin/keymappings.lua | 8 ++++----
 .config/nvim/lua/halfdan/init.lua         | 1 +
 .config/nvim/lua/halfdan/settings.lua     | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.config/nvim/after/plugin/cmp.lua b/.config/nvim/after/plugin/cmp.lua
index 329f75e..fef4513 100644
--- a/.config/nvim/after/plugin/cmp.lua
+++ b/.config/nvim/after/plugin/cmp.lua
@@ -9,7 +9,6 @@ local source_mapping = {
 	cmp_tabnine = "[TN]",
 	path = "[Path]",
 }
-
 cmp.setup({
     -- snippet = {
     --     -- REQUIRED - you must specify a snippet engine
@@ -32,8 +31,8 @@ cmp.setup({
         end,
     },
     mapping = {
-        ['<C-p>'] = cmp.mapping.select_prev_item(),
-        ['<C-n>'] = cmp.mapping.select_next_item(),
+        ['<C-p>'] = cmp.mapping(cmp.mapping.select_prev_item(), { 'i', 'c' }),
+        ['<C-n>'] = cmp.mapping(cmp.mapping.select_next_item(), { 'i', 'c' }),
         ['<C-d>'] = cmp.mapping.scroll_docs(-4),
         ['<C-f>'] = cmp.mapping.scroll_docs(4),
         ['<C-Space>'] = cmp.mapping.complete(),
@@ -76,7 +75,8 @@ cmp.setup.cmdline(':', {
         { name = 'path' }
     }, {
         { name = 'cmdline' }
-    })
+    }),
+    mappings = cmp.mapping.preset.cmdline(),
 })
 
 -- Setup tabnine 
diff --git a/.config/nvim/after/plugin/keymappings.lua b/.config/nvim/after/plugin/keymappings.lua
index ee53e16..7f32f54 100644
--- a/.config/nvim/after/plugin/keymappings.lua
+++ b/.config/nvim/after/plugin/keymappings.lua
@@ -6,10 +6,10 @@ local xnoremap = Remap.xnoremap
 local nmap = Remap.nmap
 
 -- better window movement
-nnoremap('<C-h>', '<C-w>h')
-nnoremap('<C-j>', '<C-w>j')
-nnoremap('<C-k>', '<C-w>k')
-nnoremap('<C-l>', '<C-w>l')
+-- nnoremap('<C-h>', '<C-w>h')
+-- nnoremap('<C-j>', '<C-w>j')
+-- nnoremap('<C-k>', '<C-w>k')
+-- nnoremap('<C-l>', '<C-w>l')
 
 -- resize with arrows
 nnoremap('<C-Up>', ':resize -2<CR>')
diff --git a/.config/nvim/lua/halfdan/init.lua b/.config/nvim/lua/halfdan/init.lua
index 0e4a97d..412f26f 100644
--- a/.config/nvim/lua/halfdan/init.lua
+++ b/.config/nvim/lua/halfdan/init.lua
@@ -7,6 +7,7 @@ require('halfdan.keymap')
 
 require('halfdan.colorscheme')
 require('halfdan.treesitter')
+require('halfdan.telescope')
 
 require('halfdan.themes.nord')
 
diff --git a/.config/nvim/lua/halfdan/settings.lua b/.config/nvim/lua/halfdan/settings.lua
index f848094..9886a29 100644
--- a/.config/nvim/lua/halfdan/settings.lua
+++ b/.config/nvim/lua/halfdan/settings.lua
@@ -38,6 +38,6 @@ vim.opt.winbar = "%=%m %f" -- Show winbar with modified flag and filename right
 
 -- Enable telescope theme
 vim.g.gruvbox_baby_telescope_theme = 1
-vim.g.gruvbox_baby_background_color = "light"
+vim.g.gruvbox_baby_background_color = "dark"
 
 vim.g.mapleader = ' '