Przeglądaj źródła

move user-specific config to extra-configs repo

Making dotfiles more generic, so that it can be used by others with less hassle.
TODO: write a readme, and specify what can be customized and where.
Weiyi Lou 13 lat temu
rodzic
commit
bae647181d

+ 3 - 0
.gitignore

@@ -4,3 +4,6 @@
 # Vim temp files
 *.swp
 .netrwhist
+
+# Vim custom snippets directory
+vim/snippets

+ 0 - 6
RUNME

@@ -62,10 +62,6 @@ ln -s dotfiles/vim ~/.vim
 ln -s dotfiles/vim/vimrc ~/.vimrc
 mkdir -p ~/.vimundo # persistent undo directory
 
-# SSH Config
-mv ~/.ssh/config "$BACKUP_DIR"
-ln -s ../dotfiles/ssh/config ~/.ssh/config
-
 # Pentadactyl
 mv ~/.pentadactylrc "$BACKUP_DIR"
 ln -s dotfiles/pentadactyl/pentadactylrc ~/.pentadactylrc
@@ -76,9 +72,7 @@ ln -s dotfiles/screen/screenrc ~/.screenrc
 
 # Tmux
 mv ~/.tmux.conf "$BACKUP_DIR"
-mv ~/.tmuxinator "$BACKUP_DIR"
 ln -s dotfiles/tmux/tmux.conf ~/.tmux.conf
-ln -s dotfiles/tmux/tmuxinator ~/.tmuxinator
 
 # Nethack
 mv ~/.nethackrc "$BACKUP_DIR"

+ 0 - 23
ssh/config

@@ -1,23 +0,0 @@
-## shortcuts to other machines
-#alias niles='ssh weiyi@nile-stage'
-#alias orinocos='ssh weiyi@orinoco-stage'
-
-Host ursa
-  User cinaeco
-  ForwardAgent yes
-
-Host fornax
-  User administrator
-
-Host parsleygardens.net
-  User cinaeco
-
-Host dev5
-  User root
-  ForwardAgent yes
-
-## Keep alive for all hosts
-Host *
-  User weiyi
-  ServerAliveCountMax 4
-  ServerAliveInterval 15

+ 0 - 27
tmux/tmuxinator/delivery.yml

@@ -1,27 +0,0 @@
-# ~/.tmuxinator/delivery.yml
-# ACER OARS Delivery Component Development Environment
-
-project_name: DELIVERY
-project_root: /jails/alcatraz/usr/local/www/delivery/
-tabs:
-  - home:
-      layout: main-horizontal
-      panes:
-        - gs
-        - deliverylog
-        - tail -F ../../www-conf/logs/error_log | grep delivery
-  - tests: cd tests && vim
-  - controllers: cd controllers && vim
-  - models: cd models && vim
-  - views:
-      layout: even-horizontal
-      panes:
-        - cd views && vim
-        - cd views/elements && vim
-  - webroot:
-      layout: even-horizontal
-      panes:
-        - cd webroot/js && vim
-        - cd webroot/css && vim
-  - routes: vim config/routes.php
-  - db: mongo delivery

+ 0 - 12
tmux/tmuxinator/dev.yml

@@ -1,12 +0,0 @@
-# ~/.tmuxinator/dev.yml
-# you can make as many tabs as you wish...
-
-project_name: Tmuxinator
-project_root: ~/
-tabs:
-  - editor:
-      layout: main-vertical
-      panes:
-        - vim
-        - 
-        - top

+ 0 - 14
tmux/tmuxinator/home.yml

@@ -1,14 +0,0 @@
-# ~/.tmuxinator/home.yml
-# some windows I tend to use at home
-project_name: Home
-project_root: ~/
-tabs:
-  - home:
-  - dotfiles: cd. && gs
-  - brew: brew update
-  - howto: cd Dropbox/HowTo && vim
-  - servers:
-      layout: even-horizontal
-      panes:
-        - ursa
-        - fornax

+ 0 - 27
tmux/tmuxinator/schools.yml

@@ -1,27 +0,0 @@
-# ~/.tmuxinator/schools.yml
-# ACER OARS Schools Component Development Environment
-
-project_name: SCHOOLS
-project_root: /jails/alcatraz/usr/local/www/schools/
-tabs:
-  - home:
-      layout: main-horizontal
-      panes:
-        - gs
-        - schoolslog
-        - tail -F ../../www-conf/logs/error_log | grep schools
-  - tests: cd tests && vim
-  - controllers: cd controllers && vim
-  - models: cd models && vim
-  - views:
-      layout: even-horizontal
-      panes:
-        - cd views && vim
-        - cd views/elements && vim
-  - webroot:
-      layout: even-horizontal
-      panes:
-        - cd webroot/js && vim
-        - cd webroot/css && vim
-  - routes: vim config/routes.php
-  - db: mongo schools

+ 0 - 2
zsh/omz-custom/ack.zsh

@@ -1,2 +0,0 @@
-# Useful for searching in lithium applications
-alias ackl='ack -a --ignore-dir=webroot'

+ 0 - 51
zsh/omz-custom/dev-acer.zsh

@@ -1,51 +0,0 @@
-#
-# shortcuts for development of ACER projects
-#
-
-# logs
-alias authlog='tail -F /jails/alcatraz/usr/local/www-conf/logs/auth-phplog'
-alias deliverylog='tail -F /jails/alcatraz/usr/local/www-conf/logs/delivery-phplog'
-alias oarslog='tail -F /jails/alcatraz/usr/local/www-conf/logs/oars-phplog'
-alias schoolslog='tail -F /jails/alcatraz/usr/local/www-conf/logs/schools-phplog'
-
-# apps
-alias cda='cd /jails/alcatraz/usr/local/www/auth'
-alias cdd='cd /jails/alcatraz/usr/local/www/delivery'
-alias cdo='cd /jails/alcatraz/usr/local/www/oars'
-alias cds='cd /jails/alcatraz/usr/local/www/schools'
-
-# db
-alias migrate='li3 migration db:migrate'
-alias sqlo='mysql -u oars -p'
-
-# git log made to be a kind-of helpful kali summary in git repositories
-alias kali='git log --author=eiyi --date=short --pretty="format:%C(yellow)[%ad] %Cblue%s %Creset -- %an %h"'
-
-## shortcuts for Jails setup
-#alias guantanamo-start='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k start'
-#alias guantanamo-graceful='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k graceful'
-#alias guantanamo-stop='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k stop'
-#alias guantanamo-check='chroot /jails/guantanamo /usr/local/apache2/bin/apachectl -t'
-
-#alias woomera-start='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k start'
-#alias woomera-graceful='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k graceful'
-#alias woomera-stop='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k stop'
-#alias woomera-check='chroot /jails/woomera /usr/local/apache2/bin/apachectl -t'
-
-#alias littlehey-start='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k start'
-#alias littlehey-graceful='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k graceful'
-#alias littlehey-stop='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k stop'
-#alias littlehey-check='chroot /jails/littlehey /usr/local/apache2/bin/apachectl -t'
-
-#alias alcatraz-start='env -i /usr/sbin/chroot /jails/alcatraz /usr/local/apache2/bin/httpd -k start'
-#alias alcatraz-graceful='env -i /usr/sbin/chroot /jails/alcatraz /usr/local/apache2/bin/httpd -k graceful'
-#alias alcatraz-stop='env -i /usr/sbin/chroot /jails/alcatraz /usr/local/apache2/bin/httpd -k stop'
-#alias alcatraz-check='chroot /jails/alcatraz /usr/local/apache2/bin/apachectl -t'
-
-#alias kerobokan-start='env -i /usr/sbin/chroot /jails/kerobokan /usr/local/apache2/bin/httpd -k start'
-#alias kerobokan-graceful='env -i /usr/sbin/chroot /jails/kerobokan /usr/local/apache2/bin/httpd -k graceful'
-#alias kerobokan-stop='env -i /usr/sbin/chroot /jails/kerobokan /usr/local/apache2/bin/httpd -k stop'
-#alias kerobokan-check='chroot /jails/kerobokan /usr/local/apache2/bin/apachectl -t'
-
-#alias changi-start='/etc/init.d/tc-chroot start'
-#alias changi-stop='/etc/init.d/tc-chroot stop'

+ 0 - 2
zsh/omz-custom/typos.zsh

@@ -1,2 +0,0 @@
-## typos
-alias scren='screen'

+ 0 - 7
zsh/zshenv

@@ -20,7 +20,6 @@ export PATH=/usr/local/apache2/bin:$PATH
 export PATH=/usr/local/mysql/bin:$PATH
 export PATH=/opt/local/bin:/opt/local/sbin:$PATH
 export PATH=$HOME/.rvm/bin:$PATH
-export PATH=/jails/alcatraz/usr/local/www/oars/libraries/lithium/console:$PATH
 
 # Add /usr/local manpages
 if [[ -d /usr/local/share/man ]];then
@@ -31,11 +30,5 @@ if [[ -d /usr/local/man ]];then
 fi
 export MANPATH
 
-## csv login
-export CVSROOT=:pserver:weiyi@cvs:/usr/cvsroot
-
 # for esxi perl stuff to not fail
 export PERL_LWP_SSL_VERIFY_HOSTNAME=0
-
-# Homebrew for Mac: move temp files to ramdisk (build directory)
-#export HOMEBREW_TEMP=/Volumes/RamDisk