18 files changed, 10 insertions, 36 deletions

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
diff --git a/vim/.vim/ftplugin/c.vim b/vim/.vim/ftplugin/c.vim
index e4d4ca1..26ceca4 100644
--- a/vim/.vim/ftplugin/c.vim
+++ b/vim/.vim/ftplugin/c.vim
@@ -1,4 +1 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
-
 set syntax=c.doxygen
diff --git a/vim/.vim/ftplugin/groovy.vim b/vim/.vim/ftplugin/groovy.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/vim/.vim/ftplugin/groovy.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/vim/.vim/ftplugin/java.vim b/vim/.vim/ftplugin/java.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/vim/.vim/ftplugin/java.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/vim/.vim/ftplugin/perl.vim b/vim/.vim/ftplugin/perl.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/vim/.vim/ftplugin/perl.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/vim/.vim/ftplugin/python.vim b/vim/.vim/ftplugin/python.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/vim/.vim/ftplugin/python.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/vim/.vim/ftplugin/sh.vim b/vim/.vim/ftplugin/sh.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/vim/.vim/ftplugin/sh.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/vim/.vim/ftplugin/sql.vim b/vim/.vim/ftplugin/sql.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/vim/.vim/ftplugin/sql.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/vim/.vim/ftplugin/vim.vim b/vim/.vim/ftplugin/vim.vim
deleted file mode 100644
index f41f3bf..0000000
--- a/vim/.vim/ftplugin/vim.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4
-set autoindent
diff --git a/vim/.vimrc b/vim/.vimrc
index 02afaee..3f8afce 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -55,10 +55,14 @@ 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
 
 " Set default colorscheme but dark comments -> Torte
 colorscheme torte
+
+" Default tabs
+set tabstop=4 softtabstop=0 expandtab shiftwidth=4
+set autoindent