Преглед изворни кода

Add `dotfiles/bin` path

By placing the dotfiles `bin` folder in `PATH`, the setup script no
longer needs to do linking for executables, and scripts no longer have
to contain extended paths to thinks like rainbarf.

Also:
- Clean up zshenv. `MANPATH` is actually quite well handled by the OS,
  so there really is no need to source well known locations. OS-specific
locations can be sourced in `.zshlocal` if needed.
Weiyi Lou пре 10 година
родитељ
комит
7c93fd5e8f
5 измењених фајлова са 14 додато и 20 уклоњено
  1. 0 0
      bin/destroy-zfs-auto-snaps
  2. 1 0
      bin/rainbarf
  3. 2 3
      setup.sh
  4. 1 1
      tmux/tmuxcolours.conf
  5. 10 16
      zsh/zshenv

+ 0 - 0
zfs/destroy-zfs-auto-snaps → bin/destroy-zfs-auto-snaps


+ 1 - 0
bin/rainbarf

@@ -0,0 +1 @@
+../tmux/rainbarf/rainbarf

+ 2 - 3
setup.sh

@@ -33,7 +33,7 @@ install_vim_plugins() {
 
 # Prepare folders
 backup_dir=~/.dotfilesbackup/$(date)
-mkdir -p "$backup_dir" ~/bin ~/.ssh
+mkdir -p "$backup_dir" ~/.ssh
 echo "Prepared folders."
 
 # Make known_hosts file if none
@@ -53,8 +53,8 @@ git submodule update --init
 echo "Submodules done."
 
 # Zsh
-linkup ~/dotfiles/zsh/zshrc ~/.zshrc
 linkup ~/dotfiles/zsh/zshenv ~/.zshenv
+linkup ~/dotfiles/zsh/zshrc ~/.zshrc
 echo "Zsh linked."
 
 # Vimperator
@@ -76,7 +76,6 @@ echo "Irssi linked."
 
 # Ack
 linkup ~/dotfiles/ack/ackrc ~/.ackrc
-linkup ~/dotfiles/bin/ack ~/bin/ack
 echo "Ack linked."
 
 # Vim (and NeoVim)

+ 1 - 1
tmux/tmuxcolours.conf

@@ -21,7 +21,7 @@ set-option -g status-left '#[fg=colour189,bg=colour55] #S #[fg=colour55,bg=colou
 # Right status.
 # `#H:#M %d/%m/%y` = hours, minutes, day, month, year
 set-option -g status-right-length 90
-set-option -g status-right '#[fg=colour233]#[fg=colour166,bg=colour233] %H:%M #[fg=colour233,bg=colour166]%d/%m/%y #(~/dotfiles/tmux/rainbarf/rainbarf --remaining --rgb --width 10)'
+set-option -g status-right '#[fg=colour233]#[fg=colour166,bg=colour233] %H:%M #[fg=colour233,bg=colour166]%d/%m/%y #(rainbarf --remaining --rgb --width 10)'
 
 
 # Other colour defaults from Solarized 256 (https://github.com/seebi/tmux-colors-solarized)

+ 10 - 16
zsh/zshenv

@@ -1,23 +1,17 @@
+# The order in, and conditions of, which `zsh` config files are sourced:
 #
-# /etc/zshenv is sourced on all invocations of the
-# shell, unless the -f option is set.  It should
-# contain commands to set the command search path,
-# plus other important environment variables.
-# .zshenv should not contain commands that produce
-# output or assume the shell is attached to a tty.
+# .zshenv: (always)
+# .zprofile: [[ -o login ]]
+# .zshrc: [[ -o interactive ]]
+# .zlogin: [[ -o login ]]
 #
+# As seen, `zshenv` is sourced on all invocations of the shell. It is useful for
+# setting variables that should be available to other programs e.g. `PATH`,
+# `EDITOR`, `PAGER`, and generally not the place to put commands that produce
+# output or assume attachment to a tty/terminal.
 
 export EDITOR='vim'
 
 # Paths
-export PATH=$HOME/dotfiles/powerline/powerline/scripts:$PATH
+export PATH=$HOME/dotfiles/bin:$PATH
 export PATH=$HOME/.rvm/bin:$PATH
-
-# Add /usr/local manpages
-if [[ -d /usr/local/share/man ]];then
-    MANPATH=/usr/local/share/man:$MANPATH
-fi
-if [[ -d /usr/local/man ]];then
-    MANPATH=/usr/local/man:$MANPATH
-fi
-export MANPATH