aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjdhao <jdhao@hotmail.com>2022-09-28 23:32:48 +0800
committerGitHub <noreply@github.com>2022-09-28 23:32:48 +0800
commita8db734e750edd909255790aed8e2c108269ab83 (patch)
tree1ea5f61bb6e93c6de1bc55c5d3ae8665331bfe8e
parentf63152f79b8605a1fe040777caee30de49c9773c (diff)
parent4026baef19ba0d2320704fdbf876224da7223d24 (diff)
Merge pull request #120 from jdhao/firenvim
update conf related to firenvim
-rw-r--r--core/plugins.vim16
-rw-r--r--lua/plugins.lua15
2 files changed, 23 insertions, 8 deletions
diff --git a/core/plugins.vim b/core/plugins.vim
index 3d9dce3..89d792b 100644
--- a/core/plugins.vim
+++ b/core/plugins.vim
@@ -362,16 +362,20 @@ if exists('g:started_by_firenvim') && g:started_by_firenvim
\ }
\ }
- function! s:setup_firenvim() abort
- set noruler noshowcmd
- set laststatus=0 showtabline=0
+ function s:setup_firenvim() abort
+ set signcolumn=no
+ set noruler
+ set noshowcmd
+ set laststatus=0
+ set showtabline=0
endfunction
augroup firenvim
autocmd!
- autocmd FileType text call s:setup_firenvim()
- autocmd BufNewFile github.com_*.txt set filetype=markdown
- autocmd BufNewFile stackoverflow.com_*.txt set filetype=markdown
+ autocmd BufEnter * call s:setup_firenvim()
+ autocmd BufEnter sqlzoo*.txt set filetype=sql
+ autocmd BufEnter github.com_*.txt set filetype=markdown
+ autocmd BufEnter stackoverflow.com_*.txt set filetype=markdown
augroup END
endif
diff --git a/lua/plugins.lua b/lua/plugins.lua
index f09d6b9..c4f7dc3 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -28,6 +28,11 @@ vim.cmd("packadd packer.nvim")
local packer = require("packer")
local packer_util = require("packer.util")
+-- check if firenvim is active
+local firenvim_not_active = function()
+ return not vim.g.started_by_firenvim
+end
+
packer.startup {
function(use)
-- it is recommended to put impatient.nvim before any other plugins
@@ -130,13 +135,19 @@ packer.startup {
use {
"nvim-lualine/lualine.nvim",
event = "VimEnter",
+ cond = firenvim_not_active,
config = [[require('config.statusline')]],
}
- use { "akinsho/bufferline.nvim", event = "VimEnter", config = [[require('config.bufferline')]] }
+ use { "akinsho/bufferline.nvim", event = "VimEnter",
+ cond = firenvim_not_active,
+ config = [[require('config.bufferline')]] }
-- fancy start screen
- use { "glepnir/dashboard-nvim", event = "VimEnter", config = [[require('config.dashboard-nvim')]] }
+ use { "glepnir/dashboard-nvim", event = "VimEnter",
+ cond = firenvim_not_active,
+ config = [[require('config.dashboard-nvim')]]
+ }
use {
"lukas-reineke/indent-blankline.nvim",