Explorar el Código

fix RUNME for tmuxinator, update setups for schools and delivery

Weiyi Lou hace 13 años
padre
commit
c54d101847
Se han modificado 4 ficheros con 22 adiciones y 20 borrados
  1. 3 2
      RUNME
  2. 3 0
      ssh/config
  3. 8 9
      tmux/tmuxinator/delivery.yml
  4. 8 9
      tmux/tmuxinator/schools.yml

+ 3 - 2
RUNME

@@ -51,14 +51,14 @@ mkdir "$BACKUP_DIR"
 
 
 # Zsh
 # Zsh
 mv ~/.zshrc "$BACKUP_DIR"
 mv ~/.zshrc "$BACKUP_DIR"
-ln -s dotfiles/zsh/zshrc ~/.zshrc
 mv ~/.zshenv "$BACKUP_DIR"
 mv ~/.zshenv "$BACKUP_DIR"
+ln -s dotfiles/zsh/zshrc ~/.zshrc
 ln -s dotfiles/zsh/zshenv ~/.zshenv
 ln -s dotfiles/zsh/zshenv ~/.zshenv
 
 
 # Vim
 # Vim
 mv ~/.vim "$BACKUP_DIR"
 mv ~/.vim "$BACKUP_DIR"
-ln -s dotfiles/vim ~/.vim
 mv ~/.vimrc "$BACKUP_DIR"
 mv ~/.vimrc "$BACKUP_DIR"
+ln -s dotfiles/vim ~/.vim
 ln -s dotfiles/vim/vimrc ~/.vimrc
 ln -s dotfiles/vim/vimrc ~/.vimrc
 mkdir -p ~/.vimundo # persistent undo directory
 mkdir -p ~/.vimundo # persistent undo directory
 
 
@@ -76,6 +76,7 @@ ln -s dotfiles/screen/screenrc ~/.screenrc
 
 
 # Tmux
 # Tmux
 mv ~/.tmux.conf "$BACKUP_DIR"
 mv ~/.tmux.conf "$BACKUP_DIR"
+mv ~/.tmuxinator "$BACKUP_DIR"
 ln -s dotfiles/tmux/tmux.conf ~/.tmux.conf
 ln -s dotfiles/tmux/tmux.conf ~/.tmux.conf
 ln -s dotfiles/tmux/tmuxinator ~/.tmuxinator
 ln -s dotfiles/tmux/tmuxinator ~/.tmuxinator
 
 

+ 3 - 0
ssh/config

@@ -15,6 +15,9 @@ Host parsleygardens.net
 Host dev5
 Host dev5
   ForwardAgent yes
   ForwardAgent yes
 
 
+Host song
+  User weiyi
+
 ## Keep alive for all hosts
 ## Keep alive for all hosts
 Host *
 Host *
   User root
   User root

+ 8 - 9
tmux/tmuxinator/delivery.yml

@@ -5,24 +5,23 @@ project_name: DELIVERY
 project_root: /jails/alcatraz/usr/local/www/delivery/
 project_root: /jails/alcatraz/usr/local/www/delivery/
 tabs:
 tabs:
   - home:
   - home:
-      layout: even-horizontal
+      layout: main-horizontal
       panes:
       panes:
         - gs
         - gs
         - deliverylog
         - deliverylog
-  - controllers & models:
-      layout: even-horizontal
-      panes:
-        - cd controllers && vim
-        - cd models && vim
+        - tail -F ../../www-conf/logs/error_log | grep delivery
+  - tests: cd tests && vim
+  - controllers: cd controllers && vim
+  - models: cd models && vim
   - views:
   - views:
-      layout: main-vertical
+      layout: even-horizontal
       panes:
       panes:
         - cd views && vim
         - cd views && vim
         - cd views/elements && vim
         - cd views/elements && vim
   - webroot:
   - webroot:
-      layout: main-vertical
+      layout: even-horizontal
       panes:
       panes:
         - cd webroot/js && vim
         - cd webroot/js && vim
         - cd webroot/css && vim
         - cd webroot/css && vim
   - routes: vim config/routes.php
   - routes: vim config/routes.php
-  - db: mongo
+  - db: mongo delivery

+ 8 - 9
tmux/tmuxinator/schools.yml

@@ -5,24 +5,23 @@ project_name: SCHOOLS
 project_root: /jails/alcatraz/usr/local/www/schools/
 project_root: /jails/alcatraz/usr/local/www/schools/
 tabs:
 tabs:
   - home:
   - home:
-      layout: even-horizontal
+      layout: main-horizontal
       panes:
       panes:
         - gs
         - gs
         - schoolslog
         - schoolslog
-  - controllers & models:
-      layout: even-horizontal
-      panes:
-        - cd controllers && vim
-        - cd models && vim
+        - tail -F ../../www-conf/logs/error_log | grep schools
+  - tests: cd tests && vim
+  - controllers: cd controllers && vim
+  - models: cd models && vim
   - views:
   - views:
-      layout: main-vertical
+      layout: even-horizontal
       panes:
       panes:
         - cd views && vim
         - cd views && vim
         - cd views/elements && vim
         - cd views/elements && vim
   - webroot:
   - webroot:
-      layout: main-vertical
+      layout: even-horizontal
       panes:
       panes:
         - cd webroot/js && vim
         - cd webroot/js && vim
         - cd webroot/css && vim
         - cd webroot/css && vim
   - routes: vim config/routes.php
   - routes: vim config/routes.php
-  - db: mongo
+  - db: mongo schools