summaryrefslogtreecommitdiff
path: root/nvim
diff options
context:
space:
mode:
Diffstat (limited to 'nvim')
-rw-r--r--nvim/.nvimlog0
-rw-r--r--nvim/init.lua9
-rw-r--r--nvim/lua/keymaps.lua10
-rw-r--r--nvim/lua/plugins/init.lua8
4 files changed, 15 insertions, 12 deletions
diff --git a/nvim/.nvimlog b/nvim/.nvimlog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/nvim/.nvimlog
diff --git a/nvim/init.lua b/nvim/init.lua
index 68090de..2f632d4 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,3 +1,12 @@
+local fn = vim.fn
+local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
+if fn.empty(fn.glob(install_path)) > 0 then
+ packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+end
+
+vim.cmd [[packadd packer.nvim]]
+
+
require 'options'
require 'keymaps'
require 'autocommands'
diff --git a/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua
index 8cbd8da..78f06fe 100644
--- a/nvim/lua/keymaps.lua
+++ b/nvim/lua/keymaps.lua
@@ -1,6 +1,8 @@
local map = vim.api.nvim_set_keymap
local opts = {noremap = true, silent = true}
+vim.g.mapleader = " "
+
-- Tree
map('n', '<C-h>', ':NvimTreeToggle<CR>', opts)
@@ -10,10 +12,10 @@ map('n', '<leader>fg', '<cmd>Telescope live_grep<CR>', opts)
map('n', '<leader>fb', '<cmd>Telescope buffers<CR>', opts)
-- LSP
---map('n', '<leader>e', vim.diagnostic.open_float, opts)
---map('n', '[d', vim.diagnostic.goto_prev, opts)
---map('n', ']d', vim.diagnostic.goto_next, opts)
---map('n', '<leader>q', vim.diagnostic.setloclist, opts)
+-- map('n', '<leader>e', vim.diagnostic.open_float, opts)
+-- map('n', '[d', vim.diagnostic.goto_prev, opts)
+-- map('n', ']d', vim.diagnostic.goto_next, opts)
+-- map('n', '<leader>q', vim.diagnostic.setloclist, opts)
local on_attach = function(client, bufnr)
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index 63c893c..20adc83 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -1,11 +1,3 @@
-local fn = vim.fn
-local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
-if fn.empty(fn.glob(install_path)) > 0 then
- packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
-end
-
-vim.cmd [[packadd packer.nvim]]
-
return require('packer').startup(function(use)
use 'wbthomason/packer.nvim'
use 'nvim-lua/plenary.nvim'