From 3574e2e515ed436c549021301b44aacbe2d16142 Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 5 Dec 2017 20:56:54 +0100 Subject: [PATCH] minor changes --- .bash_aliases | 8 ++++---- .bash_profile | 2 +- .bashrc | 3 +-- .bashrc_local | 4 ++++ .tmux.conf | 4 ++++ .vimrc | 16 +++++++++++----- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index 0817038..c35cc88 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -1,6 +1,6 @@ ############################################################################### # File .bash_aliases -# Jonas Mitschang - jonen@mitschang.net +# jul.io ############################################################################### # ssh connections to servers @@ -9,7 +9,7 @@ alias picosrv='ssh jscharrenbach@picosrv1' # ls aliases alias l='ls -l' alias lla='ls -htlr -A' -alias ll='ls -la' +alias la='ls -la' # change directory alias ..='cd ..' @@ -27,8 +27,8 @@ go(){ } #start tmux with 256 colors every time -alias tmux="tmux -2" -alias tmxa="tmux attach" +#alias tmux="tmux -2" +#alias tmxa="tmux attach" # misc alias px="ps auxf" diff --git a/.bash_profile b/.bash_profile index 01cded9..733458e 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,7 +1,7 @@ ############################################################################### # File .bash_profile # ~/.bash_profile: executed by bash for login shells -# Jonas Mitschang - jonen@mitschang.net +# jul.io ############################################################################### # set variable identifying the chroot you work in diff --git a/.bashrc b/.bashrc index 986423e..bb48075 100644 --- a/.bashrc +++ b/.bashrc @@ -1,6 +1,6 @@ ############################################################################### # File .bashrc -# Jonas Mitschang - jonen@mitschang.net +# jul.io ############################################################################### umask 022 @@ -24,7 +24,6 @@ if [ -d ~/.dot ]; then fi export COLORTERM=1 -#export GREP_OPTIONS='--color=auto' # prefered editor export EDITOR=vi diff --git a/.bashrc_local b/.bashrc_local index 57122fe..5aad5c2 100644 --- a/.bashrc_local +++ b/.bashrc_local @@ -1,3 +1,7 @@ +############################################################### +# File: .bashrc_local +# jul.io +############################################################### # Some settings stolen from sensible.bash # Automatically trim long paths in the prompt (requires Bash 4.x) #PROMPT_DIRTRIM=2 diff --git a/.tmux.conf b/.tmux.conf index f048629..f9fde42 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,3 +1,7 @@ +############################################################### +# File: .bashrc_local +# jul.io +############################################################### # I want 256 colors everywhere # set -g default-terminal "screen-256-color" diff --git a/.vimrc b/.vimrc index 45ab167..6603745 100644 --- a/.vimrc +++ b/.vimrc @@ -1,16 +1,19 @@ "------------------------------------------------------------------------------ " File .vimrc -" Jonas Mitschang - jonen@mitschang.net +" jul.io "------------------------------------------------------------------------------ set nocompatible " use vim defaults syntax on " use syntax highlighting set background=dark " when using black background terminal -set relativenumber " relative line numbers! How cool is that?! + set number " line numbers +set relativenumber " relative line numbers! How cool is that?! + set clipboard=unnamed set backspace=indent,eol,start " more powerful backspacing set autoindent " always set autoindenting on set formatoptions+=t + set nobackup " Don't keep a backup file set viminfo='20,\"50 " read/write a .viminfo file, don't store more than " 50 lines of registers @@ -21,14 +24,19 @@ set ignorecase " Do case insensitive matching set smartcase " When searching with Uppercase Letters be Case-Sensitive, otherwise don't be set incsearch " Incremental search set hlsearch " Search highlight + set noexpandtab + set tabstop=2 set sw=2 + set smarttab set smartindent + set enc=utf-8 " default UTF8 encoding set fileencoding=utf-8 " default UTF8 encoding -set ruler " show the cursor position all the time +set ruler " show the cursor position all the time + set directory=~/.vim/swap/ set lazyredraw "to speed up vim a bit @@ -37,8 +45,6 @@ set lazyredraw "to speed up vim a bit set laststatus=2 set statusline+=%F -" set mouse=a - filetype plugin on filetype indent on filetype on