adding colorscheme & changing indentation

7 files changed, 25 insertions, 6 deletions

diff --git a/init.lua b/init.lua
index 62b4a51..815566d 100644
--- a/init.lua
+++ b/init.lua
@@ -6,3 +6,4 @@ require "user.autopairs"
 require "user.lsp"
 require "user.nvim-tree"
 require "user.bufferline"
+require "user.colorscheme"
diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua
index e1f3101..cb9f56f 100644
--- a/lua/user/cmp.lua
+++ b/lua/user/cmp.lua
@@ -121,7 +121,7 @@ cmp.setup {
         select = false,
     },
     documentation = {
-        -- border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" },
+        border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" },
     },
         experimental = {
         ghost_text = true,
diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua
new file mode 100644
index 0000000..0e8db98
--- /dev/null
+++ b/lua/user/colorscheme.lua
@@ -0,0 +1,11 @@
+vim.cmd [[
+try
+	colorscheme gruvbox
+catch /^Vim\%((\a\+)\)\=:E185/
+	colorscheme default
+	set background=dark
+endtry
+]]
+
+-- removes background added by colorscheme
+vim.cmd "hi Normal guibg=NONE ctermbg=NONE"
diff --git a/lua/user/lsp/ccls.lua b/lua/user/lsp/ccls.lua
index 9127e5b..8b048e3 100644
--- a/lua/user/lsp/ccls.lua
+++ b/lua/user/lsp/ccls.lua
@@ -9,6 +9,10 @@ local extraArgs_opt = {};
 
 if string.match(vim.fn.expand('%:p'),"/home/aleksa/mygit/mykernel/") then
     extraArgs_opt = { "--sysroot=/opt/aleksa", "--gcc-toolchain=/opt/aleksa/usr/bin/i686-aleksa-gcc", };
+    vim.opt["shiftwidth"]=4;
+    vim.opt["tabstop"]=4;
+    vim.opt["expandtab"]=true;
+    vim.notify("aleksav013/mykernel");
 else
 end
 
diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua
index 6a55097..5f3e493 100644
--- a/lua/user/lsp/handlers.lua
+++ b/lua/user/lsp/handlers.lua
@@ -67,8 +67,8 @@ local function lsp_keymaps(bufnr)
     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", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
     vim.api.nvim_buf_set_keymap(bufnr, "n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
-    -- vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
-    vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
+    vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
+    -- vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
     -- vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
     -- vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>f", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
     vim.api.nvim_buf_set_keymap(bufnr, "n", "[d", '<cmd>lua vim.diagnostic.goto_prev({ border = "rounded" })<CR>', opts)
diff --git a/lua/user/options.lua b/lua/user/options.lua
index a15e0e4..a24db50 100644
--- a/lua/user/options.lua
+++ b/lua/user/options.lua
@@ -21,9 +21,9 @@ local options = {
     undofile = true,                         -- enable persistent undo
     updatetime = 300,                        -- faster completion (4000ms default)
     writebackup = false,                     -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
-    expandtab = true,                        -- convert tabs to spaces
-    shiftwidth = 4,                          -- the number of spaces inserted for each indentation
-    tabstop = 4,                             -- insert 4 spaces for a tab
+    expandtab = false,                       -- convert tabs to spaces
+    shiftwidth = 8,                          -- the number of spaces inserted for each indentation
+    tabstop = 8,                             -- insert 4 spaces for a tab
     preserveindent = true,
     softtabstop = 0,
     cursorline = true,                       -- highlight the current line
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index 401de7f..44eac6b 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -46,6 +46,9 @@ return packer.startup(function(use)
     use "neovim/nvim-lspconfig"
     use "williamboman/nvim-lsp-installer"
 
+-- Colorsheme
+    use "morhetz/gruvbox"
+
 -- Other
     use "windwp/nvim-autopairs"
     use "kyazdani42/nvim-web-devicons"