zsh theme is now a modefied version of agnoster (dx2) also cleaned up tmux.conf and fixed install.sh

This commit is contained in:
Dreaded_X 2014-09-06 18:25:07 +02:00
parent 7d1b705952
commit 0da0a45c7c
3 changed files with 35 additions and 36 deletions

View File

@ -1,10 +1,5 @@
#!/bin/bash #!/bin/bash
# TODO: Add eclim/eclipse installer # TODO: Add eclim/eclipse installer
if [ $EUID != 0 ]; then
sudo "$0" "$@"
exit $?
fi
while true; do while true; do
read -p "Do you want to make symlinks? " yn read -p "Do you want to make symlinks? " yn
case $yn in case $yn in
@ -23,11 +18,13 @@ done
while true; do while true; do
read -p "Do you wish to install gnome-terminal-colors-solarized? (requires dconf-cli) " yn read -p "Do you wish to install gnome-terminal-colors-solarized? (requires dconf-cli) " yn
case $yn in case $yn in
[Yy]* ) git clone https://github.com/Anthony25/gnome-terminal-colors-solarized.git; [Yy]* ) cd ..;
git clone https://github.com/Anthony25/gnome-terminal-colors-solarized.git;
cd gnome-terminal-colors-solarized; cd gnome-terminal-colors-solarized;
./install.sh -s 1; ./install.sh;
cd ..; cd ..;
rm -rf gnome-terminal-colors-solarized; rm -rf gnome-terminal-colors-solarized;
cd .dotfiles;
echo "Done..."; echo "Done...";
break;; break;;
[Nn]* ) break;; [Nn]* ) break;;
@ -57,25 +54,16 @@ while true; do
esac esac
done done
while true; do
read -p "Do you wish to install CTags? " yn
case $yn in
[Yy]* ) sudo apt-get install exuberant-ctags;
echo "Done...";
break;;
[Nn]* ) break;;
* ) echo "Please answer yes or no.";;
esac
done
while true; do while true; do
read -p "Do you wish to install powerline? " yn read -p "Do you wish to install powerline? " yn
case $yn in case $yn in
[Yy]* ) pip install --user git+git://github.com/Lokaltog/powerline; [Yy]* ) pip install --user git+git://github.com/Lokaltog/powerline;
cd ..
wget https://github.com/Lokaltog/powerline/raw/develop/font/PowerlineSymbols.otf https://github.com/Lokaltog/powerline/raw/develop/font/10-powerline-symbols.conf; wget https://github.com/Lokaltog/powerline/raw/develop/font/PowerlineSymbols.otf https://github.com/Lokaltog/powerline/raw/develop/font/10-powerline-symbols.conf;
mkdir -p ~/.fonts/ && mv PowerlineSymbols.otf ~/.fonts/; mkdir -p ~/.fonts/ && mv PowerlineSymbols.otf ~/.fonts/;
fc-cache -vf ~/.fonts; fc-cache -vf ~/.fonts;
mkdir -p ~/.config/fontconfig/conf.d/ && mv 10-powerline-symbols.conf ~/.config/fontconfig/conf.d/; mkdir -p ~/.config/fontconfig/conf.d/ && mv 10-powerline-symbols.conf ~/.config/fontconfig/conf.d/;
cd .dotfiles
echo "Done..."; echo "Done...";
break;; break;;
[Nn]* ) break;; [Nn]* ) break;;
@ -86,8 +74,19 @@ done
while true; do while true; do
read -p "Do you wish to install tmux-vim-select-pane? " yn read -p "Do you wish to install tmux-vim-select-pane? " yn
case $yn in case $yn in
[Yy]* ) curl -fsSL https://raw.github.com/mislav/dotfiles/1500cd2/bin/tmux-vim-select-pane -o /usr/local/bin/tmux-vim-select-pane; [Yy]* ) sudo curl -fsSL https://raw.github.com/mislav/dotfiles/1500cd2/bin/tmux-vim-select-pane -o /usr/local/bin/tmux-vim-select-pane;
chmod +x /usr/local/bin/tmux-vim-select-pane; sudo chmod +x /usr/local/bin/tmux-vim-select-pane;
echo "Done...";
break;;
[Nn]* ) break;;
* ) echo "Please answer yes or no.";;
esac
done
while true; do
read -p "Do you wish to install CTags? " yn
case $yn in
[Yy]* ) sudo apt-get install exuberant-ctags;
echo "Done..."; echo "Done...";
break;; break;;
[Nn]* ) break;; [Nn]* ) break;;

View File

@ -3,9 +3,8 @@
run-shell "powerline-daemon -q" run-shell "powerline-daemon -q"
source-file "$HOME/.local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf" source-file "$HOME/.local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf"
send-keys C-c send-keys C-c
# run-shell "clear"
set-option -g default-terminal screen-256color-bce set -g default-terminal "screen-256color"
#use ctrl-a instead of ctrl-b #use ctrl-a instead of ctrl-b
unbind C-b unbind C-b
@ -19,7 +18,7 @@ bind -n M-l run-shell 'tmux-vim-select-pane -R'
#notify when something happens in another windows #notify when something happens in another windows
setw -g monitor-activity on setw -g monitor-activity on
set -g visual-activity on # set -g visual-activity on
#load tmux setup #load tmux setup
bind D source-file ~/.dotfiles/tmux/dev bind D source-file ~/.dotfiles/tmux/dev
@ -28,8 +27,8 @@ bind D source-file ~/.dotfiles/tmux/dev
bind X kill-window bind X kill-window
#setup kill comnmand #setup kill comnmand
bind k confirm kill-window # bind k confirm kill-window
bind K confirm kill-server # bind K confirm kill-server
#title stuff #title stuff
set -g set-titles-string '#T' set -g set-titles-string '#T'
@ -40,18 +39,18 @@ bind -n C-j new-window
bind -n C-h prev bind -n C-h prev
bind -n C-l next bind -n C-l next
bind -n C-M-l swap-window -t +1 bind -n C-M-l swap-window -t +1
bind -n C-M-h swap-window -t +1 bind -n C-M-h swap-window -t -1
#enable aggressive-resize #enable aggressive-resize
setw -g aggressive-resize on setw -g aggressive-resize on
#change statusbar #change statusbar
set -g status-bg black # set -g status-bg black
set -g status-fg white # set -g status-fg white
set-window-option -g window-status-current-bg white # set-window-option -g window-status-current-bg white
set-window-option -g window-status-current-fg black # set-window-option -g window-status-current-fg black
set-option -g display-panes-colour black # set-option -g display-panes-colour black
set-option -g display-panes-active-colour white # set-option -g display-panes-active-colour white
#autorename #autorename
setw -g automatic-rename on setw -g automatic-rename on

9
zshrc
View File

@ -6,8 +6,8 @@ ZSH=~/.dotfiles/oh-my-zsh
# Optionally, if you set this to "random", it'll load a random theme each # Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded. # time that oh-my-zsh is loaded.
ZSH_THEME="../../dx" # ZSH_THEME="../../dx"
# ZSH_THEME="../../dx2" ZSH_THEME="../../dx2"
# Example aliases # Example aliases
# alias zshconfig="mate ~/.zshrc" # alias zshconfig="mate ~/.zshrc"
@ -76,10 +76,11 @@ alias attach="tmux a"
DISABLE_AUTO_TITLE=true DISABLE_AUTO_TITLE=true
export TERM=screen-256color-bce export TERM="screen-256color"
alias tmux="tmux -2"
if [ -d "$HOME/.local/bin" ]; then if [ -d "$HOME/.local/bin" ]; then
PATH="$HOME/.local/bin:$PATH" PATH="$HOME/.local/bin:$PATH"
fi fi
. ~/.local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh # . ~/.local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh