diff options
| author | Adam <adam.moloney.stuck@gmail.com> | 2021-10-18 18:29:32 +0200 |
|---|---|---|
| committer | adamstuck <adam.moloney.stuck@gmail.com> | 2021-10-18 19:09:26 +0200 |
| commit | 4591fc8a8bade0ea12338b1751f3fb273db163a9 (patch) | |
| tree | 1aa74f846ffcc5c289ff5fd08490879e0918af5f | |
| parent | e41b15d98a4a789531cd020f183c1c91f495493f (diff) | |
Some vim+nvim config cleanup + simple vim statusbar
| -rw-r--r-- | .config/nvim/lua/opts.lua | 9 | ||||
| -rw-r--r-- | .config/nvim/lua/setup.lua | 21 | ||||
| -rw-r--r-- | .vimrc | 33 |
3 files changed, 26 insertions, 37 deletions
diff --git a/.config/nvim/lua/opts.lua b/.config/nvim/lua/opts.lua index 157c899..56f066a 100644 --- a/.config/nvim/lua/opts.lua +++ b/.config/nvim/lua/opts.lua @@ -127,13 +127,12 @@ require'nvim-treesitter.configs'.setup { } require("toggleterm").setup{ - -- size can be a number or function which is passed the current terminal - size = 65, + size = 15, open_mapping = [[<c-\>]], - hide_numbers = true, -- hide the number column in toggleterm buffers + hide_numbers = true, persist_size = true, - direction = 'vertical', - close_on_exit = true, -- close the terminal window when the process exits + direction = 'horizontal', + close_on_exit = true, } require('kommentary.config').use_extended_mappings() diff --git a/.config/nvim/lua/setup.lua b/.config/nvim/lua/setup.lua index 5d71554..8c59b41 100644 --- a/.config/nvim/lua/setup.lua +++ b/.config/nvim/lua/setup.lua @@ -1,22 +1,11 @@ local set = vim.opt -if vim.fn.has('mouse') then - set.mouse = "a" -end - -if vim.fn.has('filetype') then - vim.cmd('filetype indent plugin on') -end - -if vim.fn.has('syntax') then - vim.cmd('syntax on') -end - -if vim.fn.has('persistent_undo') then - vim.cmd('set undodir=$HOME/.vim/undo') - vim.cmd('set undofile') -end +vim.cmd('filetype indent plugin on') +vim.cmd('syntax enable') +vim.cmd('set undodir=$HOME/.vim/undo') +vim.cmd('set undofile') +set.mouse = "a" set.termguicolors = true set.hidden = true set.wildmenu = true @@ -6,18 +6,9 @@ call plug#begin('~/.vim/plugged') Plug 'mhinz/vim-startify' call plug#end() -if has('filetype') - filetype indent plugin on -endif - -if has('syntax') - syntax on -endif - -if has('mouse') - set mouse=a -endif - +filetype indent plugin on +syntax enable +set mouse=a set nocompatible set hidden set wildmenu @@ -31,12 +22,9 @@ set smartcase set backspace=indent,eol,start set autoindent set ruler -set laststatus=0 set confirm set visualbell -set cmdheight=2 -set number -set relativenumber +set number relativenumber set notimeout ttimeout ttimeoutlen=200 set pastetoggle=<F11> set shiftwidth=4 @@ -46,6 +34,19 @@ set noswapfile set nowrap set background=dark +set laststatus=2 +set statusline= +set statusline+=%#Directory# +set statusline=\ %f\ +set statusline+=%#LineNr# +set statusline+=%= +set statusline+=%#Normal# +set statusline+=\ Lines: +set statusline+=%L\ +set statusline+=\ %p%%\ +set statusline+=%#Constant# +set statusline+=%y + map Y y$ nnoremap <C-L> :nohl<CR><C-L> nnoremap n nzzzv |