diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | README.org | 4 | ||||
| -rw-r--r-- | aliases | 3 | ||||
| -rw-r--r-- | bash_login | 1 | ||||
| -rw-r--r-- | bash_logout | 3 | ||||
| -rw-r--r-- | bashrc | 76 | ||||
| -rw-r--r-- | docs/bash.org | 4 | ||||
| -rw-r--r-- | docs/zsh.org | 18 | ||||
| -rw-r--r-- | env | 9 | ||||
| -rw-r--r-- | tmux.conf | 15 | ||||
| -rw-r--r-- | zshenv | 25 | ||||
| -rw-r--r-- | zshrc | 5 |
12 files changed, 58 insertions, 108 deletions
diff --git a/Makefile b/Makefile index 3b2f381..bc9b2be 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,6 @@ INTO = $(HOME) INSTALL = \ aliases \ aspell.en.pws \ - bash_login \ - bash_logout \ - bashrc \ emacs.d \ env \ gitconfig \ diff --git a/README.org b/README.org index 0282278..19b6b8c 100644 --- a/README.org +++ b/README.org @@ -5,7 +5,7 @@ * Home -My personal configuration files for [[https://www.gnu.org/software/emacs/][emacs]], [[https://www.gnu.org/software/bash/][bash]] and [[https://git-scm.com/][git]]. +My personal configuration files for [[file:docs/emacs.org][emacs]], [[file:docs/zsh.org][zsh]] and [[file:docs/git.org][git]]. ** Installation @@ -30,7 +30,7 @@ make clean-dead #+END_SRC ** Tasks -*** TODO Run magit in fullscreen ? +*** TODO Run magit in full screen ? *** TODO Add word / sign / sentence count for markdown in the status line *** TODO Take a look at "highlight-indent-guides" for emacs *** TODO How to update Emacs on OSX ? diff --git a/aliases b/aliases index eedc47a..005d856 100644 --- a/aliases +++ b/aliases @@ -20,7 +20,7 @@ alias rm="rm -i" alias utc="date -u" # tools -alias tmux="tmux new-session -A -s work" +alias tmuxa="tmux new-session -A -s work" alias gerp="grep --color=auto" alias grep="grep --color=auto" alias pjson="python -mjson.tool" @@ -35,6 +35,7 @@ alias s="cd ~/src/source" alias eb="cd ~/src/source/eventbus" alias ops="cd ~/src/twitter-ops" alias science="cd ~/src/source/science/" +alias gcode="cd ~/gocode/src" # zsh stuff alias zshrc="source ~/.zshrc" diff --git a/bash_login b/bash_login deleted file mode 100644 index 4b18bd1..0000000 --- a/bash_login +++ /dev/null @@ -1 +0,0 @@ -source $HOME/.bashrc diff --git a/bash_logout b/bash_logout deleted file mode 100644 index 3aa4f01..0000000 --- a/bash_logout +++ /dev/null @@ -1,3 +0,0 @@ -sudo -k -clear - diff --git a/bashrc b/bashrc deleted file mode 100644 index 224d286..0000000 --- a/bashrc +++ /dev/null @@ -1,76 +0,0 @@ -export EDITOR="emacsclient -a ''" -export HISTFILE= -export LANG="en_US.UTF-8" -export LC_ALL="$LANG" -export LC_CTYPE="$LANG" -export PAGER="less" -export TMPDIR="${HOME}/tmp" -export TZ=America/Los_Angeles -export GOPATH="${HOME}" - -export PATH="${HOME}/bin:${HOME}/src/bin:/opt/twitter/bin:~/src/source/dist:/opt/twitter/opt/go/libexec/bin:${PATH}" - -[ -z "$PS1" ] && return - -# prompts -export PS1="\W % " - -# limits -ulimit -S -c 0 - -# Set up ssh-agent -SSH_ENV="$HOME/.ssh/environment" - -function start_agent { - if [[ -f "${HOME}/.ssh/id_rsa" ]]; then - echo "Initializing new GPG agent..." - touch $SSH_ENV - chmod 600 "${SSH_ENV}" - /usr/bin/ssh-agent | sed 's/^echo/#echo/' >> "${SSH_ENV}" - . "${SSH_ENV}" > /dev/null - /usr/bin/ssh-add - fi -} - -# Source SSH settings, if applicable -if [ -f "${SSH_ENV}" ]; then - . "${SSH_ENV}" > /dev/null - kill -0 $SSH_AGENT_PID 2>/dev/null || { - start_agent - } -else - start_agent -fi - -# some aliases -if [[ "${OSTYPE}" =~ "darwin" ]]; then - alias ls='ls -G' -else - alias ls='ls --color' -fi - -# editor -alias e="$EDITOR" -alias et="TERM=xterm-256color emacsclient -nw" - -# generic commands -alias cp="cp -i" -alias l="ls" -alias la="ls -a" -alias ll="ls -lh" -alias lt="ls -lhtr" -alias mv="mv -i" -alias rm="rm -i" - -# tools -alias gerp="grep --color=auto" -alias grep="grep --color=auto" -alias pjson="python -mjson.tool" - -# git -alias g="git" -alias gclean="git clean -dfx" -alias gst="git status" - -# local stuff -[ -f "${HOME}/.bash_local" ] && source "${HOME}/.bash_local" diff --git a/docs/bash.org b/docs/bash.org deleted file mode 100644 index 2e2154a..0000000 --- a/docs/bash.org +++ /dev/null @@ -1,4 +0,0 @@ -#+AUTHOR: Franck Cuny -#+TITLE: bash documentation -#+STARTUP: indent -#+STARTUP: hidestars diff --git a/docs/zsh.org b/docs/zsh.org new file mode 100644 index 0000000..1f4afb7 --- /dev/null +++ b/docs/zsh.org @@ -0,0 +1,18 @@ +#+AUTHOR: Franck Cuny +#+TITLE: zsh documentation +#+STARTUP: indent +#+STARTUP: hidestars + +The configuration files are loaded in that order: + ++ /etc/zshenc ++ $HOME/.zshenv ++ /etc/zprofile ++ $HOME/.zprofile ++ /etc/zshrc ++ $HOME/.zshrc ++ /etc/zlogin (if logging shell) ++ $HOME/.zlogin (if logging shell) + +** Tips +/etc/zshenv is run for all instances of zsh, it is important that it be kept as small as possible. diff --git a/env b/env deleted file mode 100644 index c840045..0000000 --- a/env +++ /dev/null @@ -1,9 +0,0 @@ -export EDITOR="emacsclient -a ''" -export HISTFILE= -export LANG="en_US.UTF-8" -export LC_ALL="$LANG" -export LC_CTYPE="$LANG" -export PAGER="less" -export TMPDIR="${HOME}/tmp" -export TZ=America/Los_Angeles -export GOPATH="${HOME}" diff --git a/tmux.conf b/tmux.conf index 4ac1b66..393c7bc 100644 --- a/tmux.conf +++ b/tmux.conf @@ -10,7 +10,16 @@ set -gw mode-keys emacs # status set -g status on -set-option -g status-left-length 25 -set-option -g status-left '#h:#S |' -set-option -g status-right ' | %Y-%m-%d %H:%M' +set -g status-left-length 50 +set -g status-right-length 50 +set-option -g status-left '#h:[#S]' +set -g status-right "%H:%M %d-%h-%Y" +setw -g window-status-current-format "|#I:#W|" +set-window-option -g automatic-rename off + +# listen to alerts from all windows +set -g bell-action any + +new-session -s work +new-session -s personal diff --git a/zshenv b/zshenv index f387203..0d7c3aa 100644 --- a/zshenv +++ b/zshenv @@ -1,7 +1,26 @@ -source ~/.env +export EDITOR="emacsclient -a ''" +export HISTFILE= +export LANG="en_US.UTF-8" +export LC_ALL="$LANG" +export LC_CTYPE="$LANG" +export PAGER="less" +export TZ=America/Los_Angeles +export GOPATH="${HOME}/gocode" -# enable auto completion - This is stupid, this should be in .zshrc +# FIXME enable auto completion - This is stupid, this should be in .zshrc autoload -U compinit compinit -C -source ~/.bash_local +# this is for local stuff +[ -f ~/.zshenv_local ] && source ~/.zshenv_local + +# build the PATH +path=( + "$HOME/bin" + "$HOME/gocode/bin" + "$HOME/src/source/dist" + "/opt/twitter/bin" + "/opt/twitter/opt/go/libexec/bin" + "/Applications/Racket v6.3/bin/" + $path +) diff --git a/zshrc b/zshrc index 04000f3..52f9a1f 100644 --- a/zshrc +++ b/zshrc @@ -8,9 +8,8 @@ colors autoload -U select-word-style select-word-style bash -# local ret_status="%{$reset_color%}[%(?:%{$fg_bold[green]%}$?:%{$fg_bold[red]%}$?)%{$reset_color%}]" -PROMPT="%1~ %# " -# RPROMPT="${ret_status}" +local ret_status="%{$reset_color%}%(?:%{$fg_bold[green]%}➜:%{$fg_bold[red]%}➜)%{$reset_color%}" +PROMPT="${ret_status} %1~ %# " # load custom aliases source ~/.aliases |