Merge branch 'master' of github.com:cacharle/dotfiles

1 files changed, 68 insertions, 28 deletions

diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 7665221..faa3cf4 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -1,8 +1,8 @@
-require('plugins')
+require("plugins")
 
 -- common
-vim.g.mapleader = ' '              -- set leader key to space
-vim.g.maplocalleader = '-'         -- set file local leader key to backslash
+vim.g.mapleader = " "              -- set leader key to space
+vim.g.maplocalleader = "-"         -- set file local leader key to backslash
 vim.opt.compatible = false         -- not compatible with vi
 vim.opt.number = true              -- line number
 vim.opt.numberwidth = 1            -- line numbers gutter autowidth
@@ -15,10 +15,10 @@ vim.opt.swapfile = false           -- disable swap files
 vim.opt.scrolloff = 2              -- line padding when scrolling
 vim.opt.textwidth = 0              -- when line wrap occurs
 vim.opt.wrapmargin = 0             -- disable auto line wrapping
-vim.opt.clipboard = 'unnamedplus'  -- use system clipboard
+vim.opt.clipboard = "unnamedplus"  -- use system clipboard
 vim.g.c_syntax_for_h = 1           -- .h file use C filetype instead of C++
 vim.opt.encoding = "utf-8"         -- utf-8 encoding
-vim.opt.shellredir = ">"           -- don't inclue stderr when reading a command
+vim.opt.shellredir = ">"           -- don"t inclue stderr when reading a command
 
 -- intuitif split opening
 vim.opt.splitbelow = true
@@ -39,34 +39,74 @@ vim.opt.hlsearch  = true         -- match highlight
 vim.opt.incsearch = true
 
 -- status
-vim.opt.laststatus=2             -- always a statusline (all window)
+vim.opt.laststatus = 2           -- always a statusline (all window)
 vim.opt.showcmd = true           -- show current partial command in the bottom right
 vim.opt.showmode = false         -- dont show current mode (i.e --INSERT--)
 
--- colorscheme
-vim.opt.termguicolors = true
-vim.opt.background = "dark"
-vim.cmd [[ colorscheme gruvbox ]]
-vim.g.gruvbox_italic = 1
-vim.g.gruvbox_bold = 1
-vim.g.gruvbox_termcolors = 256
-vim.g.gruvbox_contrast_dark = 'medium'
-vim.g.gruvbox_contrast_light = 'hard'
-vim.g.gruvbox_invert_selection = 0
-
 -- remove ugly treesitter error highlight
-require 'nvim-treesitter.highlight'
-local hlmap = vim.treesitter.highlighter.hl_map
-hlmap.error = nil
+-- require "nvim-treesitter.highlight"
+-- local hlmap = vim.treesitter.highlighter.hl_map
+-- hlmap.error = nil
+
+local augroup = vim.api.nvim_create_augroup("cacharle_init_group", {})
 
-vim.cmd [[
-augroup packer_user_config
-    autocmd!
-    autocmd BufWritePost plugins.lua source <afile> | PackerCompile
-augroup end
-]]
+-- run PackerCompile when we modify plugins.lua
+vim.api.nvim_create_autocmd(
+    "BufWritePost",
+    {
+        pattern = "plugins.lua",
+        command = "source <afile> | PackerCompile",
+        group = augroup
+    }
+)
 
 -- remove trailing white space on save
-vim.cmd [[ autocmd BufWritePre * %s/\s\+$//e ]]
+vim.api.nvim_create_autocmd(
+    "BufWritePre",
+    { pattern = "*", command = [[ %s/\s\+$//e ]], group = augroup }
+)
+
+-- set filttype for *.sql.j2 files
+vim.api.nvim_create_autocmd(
+    "BufReadPre",
+    {
+        pattern = "*.sql.j2",
+        callback = function() vim.opt.filetype = "sql" end,
+        group = augroup,
+    }
+)
+
+-- -- Format go files on save
+-- vim.api.nvim_create_autocmd(
+--     "BufWritePre",
+--     { command = [[ !go fmt % ]], pattern = "*.go", group = augroup }
+-- )
+
+vim.api.nvim_create_autocmd(
+    "FileType",
+    {
+        pattern = "haskell",
+        callback = function() vim.opt_local.formatprg = "stylish-haskell" end,
+        group = augroup,
+    }
+)
+
+vim.api.nvim_create_autocmd(
+    "FileType",
+    {
+        pattern = "lisp,html,css,htmldjango",
+        callback = function() vim.opt_local.shiftwidth = 2 end,
+        group = augroup,
+    }
+)
+
+vim.api.nvim_create_autocmd(
+    "FileType",
+    {
+        pattern = "go",
+        callback = function() vim.opt_local.expandtab = false end,
+        group = augroup,
+    }
+)
 
-require('mappings')
+require("mappings")