From bf385e91c80f9963624c501eb0a8d2b35c6f2466 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Thu, 18 Nov 2021 13:44:04 +0100
Subject: Added Nerd Font to alacritty for emoji, Updated zsh aliases and
 qutebrowser for Darwin specific config

---
 config/nvim/init.lua         | 26 ++++++++++++++++++++------
 config/nvim/lua/mappings.lua |  2 +-
 config/nvim/lua/plugins.lua  |  5 ++++-
 3 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'config/nvim')

diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 9634562..1afc4a3 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -63,15 +63,16 @@ require('telescope').setup {
                 ['<C-j>'] = actions.move_selection_next,
                 ['<C-k>'] = actions.move_selection_previous,
                 ['<esc>'] = actions.close,
+                ['kj'] = actions.close,
             }
-        }
+        },
     }
 }
 
 require('lualine').setup {
     options = {
         theme = 'gruvbox',
-        icons_enabled = false,
+        icons_enabled = true,
         section_separators = '',
         component_separators = ''
     }
@@ -81,9 +82,9 @@ require('nvim-treesitter.configs').setup {
     highlight = {
         enable = true
     },
-    indent = {
-        enable = true
-    },
+    -- indent = {
+    --     enable = true
+    -- },
     incremental_selection = {
         enable = true,
         keymaps = {
@@ -94,9 +95,22 @@ require('nvim-treesitter.configs').setup {
         }
     }
 }
+vim.cmd [[ highlight link pythonTSKeywordOperator Keyword ]]
+-- require 'nvim-treesitter.highlight'
+-- local hlmap = vim.treesitter.TSHighlighter.hl_map
+-- hlmap.error = nil
+
 
 require('nvim_comment').setup()
 
-require('lspconfig').clangd.setup {}
+-- local on_attach = function(_, bufnr)
+--     local opts = {noremap = true, silent = true }
+--     vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
+--     vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
+--     vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts)
+-- end
+
+-- require('lspconfig').clangd.setup {}
+-- require('lspconfig').pyright.setup { on_attach = on_attach }
 
 require('mappings')
diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua
index 0172aa4..df2177a 100644
--- a/config/nvim/lua/mappings.lua
+++ b/config/nvim/lua/mappings.lua
@@ -54,4 +54,4 @@ map('n', 'ga', '<cmd>EasyAlign<cr>', {})
 
 map('n', '<C-p>', '<cmd>Telescope git_files<cr>', {})
 map('n', '<f2>', '<cmd>Telescope help_tags<cr>', {})
-map('n', ';', '<cmd>Telescope commands<cr>', {})
+map('n', '<leader>;', '<cmd>Telescope commands<cr>', {})
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index a501ea8..1d5d0b4 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -25,6 +25,9 @@ return require('packer').startup(function()
     -- fuzzy finder (replace fzf.vim or ctrlp.vim)
     use {
         'nvim-telescope/telescope.nvim',
-        requires = {'nvim-lua/plenary.nvim'}
+        requires = {
+            {'nvim-lua/plenary.nvim'},
+            {'kyazdani42/nvim-web-devicons', opt = true},
+        }
     }
 end)
-- 
cgit