From 6dcaf53c2f3dad1c3b502dcb4042255bacab7742 Mon Sep 17 00:00:00 2001
From: Ekaitz Zárraga <ekaitz.zarraga@gmail.com>
Date: Thu, 4 Aug 2016 10:22:44 +0200
Subject: Default tabulation in Vim and NeoVim and remove tab-bar when not
 necessary

---
 nvim/nvim/ftplugin/c.vim      | 3 ---
 nvim/nvim/ftplugin/groovy.vim | 2 --
 nvim/nvim/ftplugin/java.vim   | 2 --
 nvim/nvim/ftplugin/perl.vim   | 2 --
 nvim/nvim/ftplugin/python.vim | 2 --
 nvim/nvim/ftplugin/sh.vim     | 2 --
 nvim/nvim/ftplugin/sql.vim    | 2 --
 nvim/nvim/ftplugin/vim.vim    | 2 --
 nvim/nvim/init.vim            | 6 +++++-
 9 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 nvim/nvim/ftplugin/groovy.vim
 delete mode 100644 nvim/nvim/ftplugin/java.vim
 delete mode 100644 nvim/nvim/ftplugin/perl.vim
 delete mode 100644 nvim/nvim/ftplugin/python.vim
 delete mode 100644 nvim/nvim/ftplugin/sh.vim
 delete mode 100644 nvim/nvim/ftplugin/sql.vim
 delete mode 100644 nvim/nvim/ftplugin/vim.vim

(limited to 'nvim')

diff --git a/nvim/nvim/ftplugin/c.vim b/nvim/nvim/ftplugin/c.vim
index e4d4ca1..26ceca4 100644
--- a/nvim/nvim/ftplugin/c.vim
+++ b/nvim/nvim/ftplugin/c.vim
@@ -1,4 +1 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
-
 set syntax=c.doxygen
diff --git a/nvim/nvim/ftplugin/groovy.vim b/nvim/nvim/ftplugin/groovy.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/nvim/nvim/ftplugin/groovy.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/nvim/nvim/ftplugin/java.vim b/nvim/nvim/ftplugin/java.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/nvim/nvim/ftplugin/java.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/nvim/nvim/ftplugin/perl.vim b/nvim/nvim/ftplugin/perl.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/nvim/nvim/ftplugin/perl.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/nvim/nvim/ftplugin/python.vim b/nvim/nvim/ftplugin/python.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/nvim/nvim/ftplugin/python.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/nvim/nvim/ftplugin/sh.vim b/nvim/nvim/ftplugin/sh.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/nvim/nvim/ftplugin/sh.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/nvim/nvim/ftplugin/sql.vim b/nvim/nvim/ftplugin/sql.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/nvim/nvim/ftplugin/sql.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/nvim/nvim/ftplugin/vim.vim b/nvim/nvim/ftplugin/vim.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/nvim/nvim/ftplugin/vim.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/nvim/nvim/init.vim b/nvim/nvim/init.vim
index 22315c9..4bbcbea 100644
--- a/nvim/nvim/init.vim
+++ b/nvim/nvim/init.vim
@@ -47,7 +47,7 @@ set ignorecase
 set smartcase
 
 " Always show tabline (0=never, 1=when there are at least 2 tabs, 2=always)
-set showtabline=2
+set showtabline=1
 
 " Mouse support
 set mouse=a
@@ -57,3 +57,7 @@ let $NVIM_TUI_ENABLE_TRUE_COLOR=1
 
 " Set default colorscheme but dark comments -> Torte
 colorscheme torte
+
+" Default tabs
+set tabstop=4 softtabstop=0 expandtab shiftwidth=4
+set autoindent
-- 
cgit v1.2.3