Browse Source

Merge branch 'master' of github.com:10sr/dotfiles

pull/1/head
10sr 11 years ago
parent
commit
9664855231
4 changed files with 8 additions and 5 deletions
  1. +2
    -0
      bashrc
  2. +4
    -3
      setup.sh
  3. +1
    -1
      tmux.conf.pl
  4. +1
    -1
      vimrc

+ 2
- 0
bashrc View File

@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash


# TODO: use tput

# If not running interactively, don't do anything # If not running interactively, don't do anything
[[ $- != *i* ]] && return [[ $- != *i* ]] && return




+ 4
- 3
setup.sh View File

@@ -79,6 +79,7 @@ git_config(){
# $_gitconfig alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso" # $_gitconfig alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso"
$_gitconfig alias.addi "add -i" $_gitconfig alias.addi "add -i"
$_gitconfig alias.clean-p "!test -z \"\$(git status -s -uno)\"" $_gitconfig alias.clean-p "!test -z \"\$(git status -s -uno)\""
$_gitconfig alias.new "checkout -b"
#$_gitconfig alias.wc "!git ls-files -z | xargs -0 wc" #$_gitconfig alias.wc "!git ls-files -z | xargs -0 wc"
# $_gitconfig push.default "simple" # $_gitconfig push.default "simple"
if _iswindows; then if _iswindows; then
@@ -87,9 +88,9 @@ git_config(){
} }


install_files(){ install_files(){
src_hilite_src="`pwd`/conf/src-hilite.style"
src_hilite_dst="$HOME/.local/share/source-highlight/src_hilite.style"
install -D --backup "$src_hilite_src" "$src_hilite_dst"
src_hilite_src="`pwd`/conf/src-hilite.style"
src_hilite_dst="$HOME/.local/share/source-highlight/src_hilite.style"
#install -D --backup "$src_hilite_src" "$src_hilite_dst"
} }


mac_defaults(){ mac_defaults(){


+ 1
- 1
tmux.conf.pl View File

@@ -88,7 +88,7 @@ sub set_colors {


setw("window-status-current-bg", "white"); setw("window-status-current-bg", "white");
setw("window-status-current-fg", "black"); setw("window-status-current-fg", "black");
setw("window-status-current-attr", "bold");
#setw("window-status-current-attr", "bold");
} }


sub main { sub main {


+ 1
- 1
vimrc View File

@@ -1,4 +1,4 @@
" load external file
" "load external file
" if filereadable(expand('~/.dotfiles/vimrc')) " if filereadable(expand('~/.dotfiles/vimrc'))
" source ~/.dotfiles/vimrc " source ~/.dotfiles/vimrc
" endif " endif


Loading…
Cancel
Save