From: Jannik ZANDER Date: Thu, 14 Dec 2017 14:48:23 +0000 (+0100) Subject: Rename dotfiles to cfg X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=8b0d8fd23b8c07035b29b2f6e0a7db411d9d33b9;p=dotfiles.git Rename dotfiles to cfg --- diff --git a/.bashrc b/.bashrc index a9eba35..4f1694e 100644 --- a/.bashrc +++ b/.bashrc @@ -13,6 +13,6 @@ done; # last line [ -f ~/.bashrc_local ] && . ~/.bashrc_local -#LS_COLORS="ow=01;36;40" && export LS_COLORS +LS_COLORS="ow=01;36;40" && export LS_COLORS [ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/.config/bash/aliases b/.config/bash/aliases index 8b37a4b..02c490a 100644 --- a/.config/bash/aliases +++ b/.config/bash/aliases @@ -23,7 +23,7 @@ alias fgrep='fgrep --color=auto' if [ -e /usr/bin/vimx ]; then alias vim='/usr/bin/vimx'; fi # Shortcuts -alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' +alias cfg='git --git-dir=$HOME/.cfg --work-tree=$HOME' alias g='git' alias h='history' alias j='jobs' diff --git a/.config/git/config_local b/.config/git/config_local index 20cf0c9..cc524e0 100644 --- a/.config/git/config_local +++ b/.config/git/config_local @@ -2,4 +2,4 @@ name = Jannik ZANDER email = jzander@grundfos.com [core] - autocrlf = true + autocrlf = input diff --git a/.vimrc b/.vimrc index eb83ef3..f02cd87 100644 --- a/.vimrc +++ b/.vimrc @@ -39,7 +39,7 @@ Plug 'brandonbloom/csearch.vim' Plug 'mileszs/ack.vim' Plug 'jeetsukumaran/vim-filesearch' Plug 'haya14busa/incsearch.vim' -"Plug 'altercation/vim-colors-solarized' +Plug 'altercation/vim-colors-solarized' Plug 'editorconfig/editorconfig-vim' Plug 'johnsyweb/vim-makeshift' Plug 'tfnico/vim-gradle' @@ -76,6 +76,9 @@ set fileformats=unix,dos,mac "set foldclose=all "set foldopen+=jump set guioptions+=a +set guioptions-=m "menu bar +set guioptions-=T "toolbar +set guioptions-=r "scroolbar set history=200 set incsearch " incremental search set laststatus=2 " always show status line diff --git a/README.md b/README.md index 432f8a6..471f7c3 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # dotfiles What you need to do on the new box is this: - + $ cd $HOME - $ git init --bare $HOME/.dotfiles - $ alias dot='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' - $ dot config --local status.showUntrackedFiles no - $ dot remote add origin git@bitbucket.org:jannikz/dotfiles.git - $ dot fetch - $ dot reset --hard origin/master - $ dot branch -u origin/master \ No newline at end of file + $ git init --bare $HOME/.cfg + $ alias cfg='git --git-dir=$HOME/.cfg --work-tree=$HOME' + $ cfg config --local status.showUntrackedFiles no + $ cfg remote add origin git@bitbucket.org:jannikz/dotfiles.git + $ cfg fetch + $ cfg reset --hard origin/master + $ cfg branch -u origin/master