From e9e3805205027c5c95f5a5763e5c01c32e08efe6 Mon Sep 17 00:00:00 2001
From: Adam <56338480+adastx@users.noreply.github.com>
Date: Mon, 18 Oct 2021 18:29:32 +0200
Subject: Some vim+nvim config cleanup + simple vim statusbar

---
 .config/nvim/lua/opts.lua  |  9 ++++-----
 .config/nvim/lua/setup.lua | 21 +++++----------------
 .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
diff --git a/.vimrc b/.vimrc
index ca00af5..740c327 100644
--- a/.vimrc
+++ b/.vimrc
@@ -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
-- 
cgit v1.2.3-70-g09d2