From 30196e455be943777f56da672dee039ca6a27932 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Mon, 21 Mar 2022 09:27:51 +0100 Subject: Added black python formatter --- config/nvim/init.lua | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'config/nvim/init.lua') diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 7665221..db908c6 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -43,17 +43,6 @@ 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 -- cgit From a601873e477807e90cbd9bbbcec431815bc3f9ca Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Fri, 1 Apr 2022 16:13:48 +0200 Subject: Added .sql.j2 to sql syntax in neovim --- config/nvim/init.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/nvim/init.lua') diff --git a/config/nvim/init.lua b/config/nvim/init.lua index db908c6..2b46cc9 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -58,4 +58,6 @@ augroup end -- remove trailing white space on save vim.cmd [[ autocmd BufWritePre * %s/\s\+$//e ]] +vim.cmd [[ autocmd BufReadPre *.sql.j2 set ft=sql ]] + require('mappings') -- cgit From dfa9425bc2ff78f8c34a11b83cca9ec1277747db Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 27 Apr 2022 14:01:46 +0200 Subject: Added golang lsp --- config/nvim/init.lua | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'config/nvim/init.lua') diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 2b46cc9..1caa245 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -39,7 +39,7 @@ 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--) @@ -48,16 +48,28 @@ require 'nvim-treesitter.highlight' local hlmap = vim.treesitter.highlighter.hl_map hlmap.error = nil -vim.cmd [[ -augroup packer_user_config - autocmd! - autocmd BufWritePost plugins.lua source | PackerCompile -augroup end -]] +local augroup = vim.api.nvim_create_augroup("cacharle_init_group", {}) + +-- run PackerCompile when we modify plugins.lua +vim.api.nvim_create_autocmd( + "BufWritePost", + { + command = "source | PackerCompile", + pattern = "plugins.lua", + group = augroup + } +) -- remove trailing white space on save -vim.cmd [[ autocmd BufWritePre * %s/\s\+$//e ]] +vim.api.nvim_create_autocmd( + "BufWritePre", + { command = [[ %s/\s\+$//e ]], pattern = "*", group = augroup } +) -vim.cmd [[ autocmd BufReadPre *.sql.j2 set ft=sql ]] +-- set filttype for *.sql.j2 files +vim.api.nvim_create_autocmd( + "BufReadPre", + { command = "set ft=sql", pattern = "*.sql.j2", group = augroup } +) require('mappings') -- cgit From bcf388658b20ba4d06df539d6befd01557f5bd8a Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 27 Apr 2022 14:20:34 +0200 Subject: Added telescope fzf native sorter --- config/nvim/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/nvim/init.lua') diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 1caa245..016819a 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -44,9 +44,9 @@ vim.opt.showcmd = true -- show current partial command in the bottom r vim.opt.showmode = false -- dont show current mode (i.e --INSERT--) -- 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", {}) -- cgit From a7c757ff4d4b6bbb3f164cd479a600f4cdd1a288 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 27 Apr 2022 14:28:30 +0200 Subject: Changing single quote to double quotes in nvim configs --- config/nvim/init.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'config/nvim/init.lua') diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 016819a..d046567 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 @@ -44,7 +44,7 @@ vim.opt.showcmd = true -- show current partial command in the bottom r vim.opt.showmode = false -- dont show current mode (i.e --INSERT--) -- remove ugly treesitter error highlight --- require 'nvim-treesitter.highlight' +-- require "nvim-treesitter.highlight" -- local hlmap = vim.treesitter.highlighter.hl_map -- hlmap.error = nil @@ -72,4 +72,4 @@ vim.api.nvim_create_autocmd( { command = "set ft=sql", pattern = "*.sql.j2", group = augroup } ) -require('mappings') +require("mappings") -- cgit From 41a8601bd0ac8fe8d3b1b480b85d5d02c711b3bf Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 18 May 2022 14:16:48 +0200 Subject: Added previous vim config autocommand to neovim, Updated lua-snip and argwrap plugins configurations --- config/nvim/init.lua | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'config/nvim/init.lua') diff --git a/config/nvim/init.lua b/config/nvim/init.lua index d046567..4e050a9 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -54,8 +54,8 @@ local augroup = vim.api.nvim_create_augroup("cacharle_init_group", {}) vim.api.nvim_create_autocmd( "BufWritePost", { - command = "source | PackerCompile", pattern = "plugins.lua", + command = "source | PackerCompile", group = augroup } ) @@ -63,13 +63,28 @@ vim.api.nvim_create_autocmd( -- remove trailing white space on save vim.api.nvim_create_autocmd( "BufWritePre", - { command = [[ %s/\s\+$//e ]], pattern = "*", group = augroup } + { pattern = "*", command = [[ %s/\s\+$//e ]], group = augroup } ) -- set filttype for *.sql.j2 files vim.api.nvim_create_autocmd( "BufReadPre", - { command = "set ft=sql", pattern = "*.sql.j2", group = augroup } + { pattern = "*.sql.j2", command = "set ft=sql", 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", command = [[ set formatprg=stylish-haskell ]], group = augroup } +) +vim.api.nvim_create_autocmd( + "FileType", + { pattern = "lisp,html,css,htmldjango", command = [[ setlocal shiftwidth=2 ]], group = augroup } ) require("mappings") -- cgit From e1f72640b039fcaaa0e0f44caa2edb7ff1bc42f8 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 18 May 2022 15:08:34 +0200 Subject: Updated nvim auto commands with lua callbacks instead of vimscript, Updated vim-argwrap to leave space in lua and go --- config/nvim/init.lua | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) (limited to 'config/nvim/init.lua') diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 4e050a9..faa3cf4 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -69,7 +69,11 @@ vim.api.nvim_create_autocmd( -- set filttype for *.sql.j2 files vim.api.nvim_create_autocmd( "BufReadPre", - { pattern = "*.sql.j2", command = "set ft=sql", group = augroup } + { + pattern = "*.sql.j2", + callback = function() vim.opt.filetype = "sql" end, + group = augroup, + } ) -- -- Format go files on save @@ -80,11 +84,29 @@ vim.api.nvim_create_autocmd( vim.api.nvim_create_autocmd( "FileType", - { pattern = "haskell", command = [[ set formatprg=stylish-haskell ]], group = augroup } + { + pattern = "haskell", + callback = function() vim.opt_local.formatprg = "stylish-haskell" end, + group = augroup, + } ) + vim.api.nvim_create_autocmd( "FileType", - { pattern = "lisp,html,css,htmldjango", command = [[ setlocal shiftwidth=2 ]], group = augroup } + { + 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") -- cgit