saving uncommitted changes in /etc prior to apt run

diff --git a/resolv.conf b/resolv.conf
index 7ddac4ce591416e811112d0dffd4ceb93da824ba..5642c06673437cc2be9eba1f3b9df8098c75b265 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,5 +1,6 @@
 domain         uhu-banane.de
 search         uhu-banane.de brehm-online.com hennig-berlin.org
 nameserver     127.0.0.1
+nameserver     10.12.20.2
 nameserver     185.48.118.6
 nameserver     185.48.116.10

diff --git a/vim/vimrc.local b/vim/vimrc.local
index c37139daf3b09f79a473a0d33a0118fe2448a856..3df6028e41ece75717d862b4d866829021d5252d 100644 (file)
--- a/vim/vimrc.local
+++ b/vim/vimrc.local
@@ -2,8 +2,14 @@ set noai
 set nohlsearch
 set fo="tcq"
 set modeline
-set showmatch
-set ignorecase
+
+set showcmd             " Show (partial) command in status line.
+set showmatch           " Show matching brackets.
+set ignorecase          " Do case insensitive matching
+set smartcase           " Do smart case matching
+set incsearch           " Incremental search
+set autowrite           " Automatically save before commands like :next and :make
+set hidden              " Hide buffers when they are abandoned
 
 autocmd FileType sls set tabstop=2 expandtab shiftwidth=2 softtabstop=2
 autocmd FileType python set tabstop=4 expandtab shiftwidth=4 softtabstop=4
@@ -14,10 +20,10 @@ set listchars=tab:»·,trail:·
 " set list
 
 if has("multi_byte")
-       set encoding=utf-8
-       setglobal fileencoding=utf-8
+        set encoding=utf-8
+        setglobal fileencoding=utf-8
 else
-       echoerr "Sorry, this version of (g)vim was not compiled with +multi_byte"
+        echoerr "Sorry, this version of (g)vim was not compiled with +multi_byte"
 endif
 
 if has("autocmd")
@@ -28,6 +34,7 @@ if has("autocmd")
         \         exe "normal g'\"" |
         \     endif |
         \ endif
+        filetype plugin indent off
 endif " has("autocmd")