Merge branch 'master' of github.com:cyplo/dotfiles

This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-08-15 08:19:22 +02:00
commit 8511a89575
6 changed files with 34 additions and 20 deletions

3
.gitmodules vendored
View file

@ -50,9 +50,6 @@
[submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"] [submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"]
path = .oh-my-zsh-plugins/zsh-syntax-highlighting path = .oh-my-zsh-plugins/zsh-syntax-highlighting
url = git://github.com/zsh-users/zsh-syntax-highlighting.git url = git://github.com/zsh-users/zsh-syntax-highlighting.git
[submodule "common/todoman"]
path = common/todoman
url = https://git.barrera.io/hobarrera/todoman.git
[submodule ".vim/bundle/rust.vim"] [submodule ".vim/bundle/rust.vim"]
path = .vim/bundle/rust.vim path = .vim/bundle/rust.vim
url = https://github.com/rust-lang/rust.vim.git url = https://github.com/rust-lang/rust.vim.git

3
.zshrc
View file

@ -54,3 +54,6 @@ export RUST_SRC_PATH=$HOME/dev/rust/src
export EDITOR="vim" export EDITOR="vim"
export KEYTIMEOUT=1 export KEYTIMEOUT=1
#temporary fix for rustc [https://github.com/rust-lang/rust-installer/issues/30], for Fedora only
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

View file

@ -34,11 +34,15 @@ ln -vfs "$DIR/.conky" ~/.
ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig
mkdir -p ~/.config/autostart/ mkdir -p ~/.config/autostart/
ln -vfs "$DIR/.config/autostart/conky.desktop" ~/.config/autostart/ ln -vfs "$DIR/.config/autostart/conky.desktop" ~/.config/autostart/
mkdir -p ~/.config/todoman/
ln -vfs "$DIR/.config/todoman/todoman.conf" ~/.config/todoman/
mkdir -p ~/.config/vdirsyncer/ mkdir -p ~/.config/vdirsyncer/
ln -vfs "$DIR/.config/vdirsyncer/config" ~/.config/vdirsyncer/ ln -vfs "$DIR/.config/vdirsyncer/config" ~/.config/vdirsyncer/
# symlink 'nodejs' as node on some systems
# will replace symlink if it exists, but won't replace regular file
if [[ ! -f /usr/bin/node ]]; then
sudo ln -vfs /usr/bin/nodejs /usr/bin/node
fi
# tools # tools
ln -vfs "$DIR/tools" ~/ ln -vfs "$DIR/tools" ~/
@ -48,31 +52,36 @@ rm -f ~/.config/terminator/config
ln "$DIR/.config/terminator/config" ~/.config/terminator/config ln "$DIR/.config/terminator/config" ~/.config/terminator/config
#install fonts #install fonts
mkdir ~/.fonts mkdir -p ~/.fonts
cp -rv "$DIR/fonts" ~/.fonts cp -rv "$DIR/fonts" ~/.fonts
fc-cache fc-cache
#rust #rust
echo "installing rust"
curl -sSf https://static.rust-lang.org/rustup.sh | bash -s -- -y curl -sSf https://static.rust-lang.org/rustup.sh | bash -s -- -y
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
cd "$DIR/.vim/bundle/racer/" cd "$DIR/.vim/bundle/racer/"
cargo build cargo build
cd "$DIR/../" cd "$DIR/../"
echo "getting rust sources..."
if [[ ! -d rust ]]; then
git clone https://github.com/rust-lang/rust.git git clone https://github.com/rust-lang/rust.git
else
cd rust
git pull
fi
#rvm #rvm
gpg --recv-keys BF04FF17 gpg --recv-keys BF04FF17
gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
curl -sSL https://get.rvm.io | bash -s stable curl -sSL https://get.rvm.io | bash -s stable
source $HOME/.rvm/scripts/rvm source $HOME/.rvm/scripts/rvm
rvm install ruby rvm install ruby
# talks: reveal-md # talks: reveal-md
sudo ln -vfs /usr/bin/nodejs /usr/bin/node
sudo npm install -g reveal-md sudo npm install -g reveal-md
# TODOs + sync # vdir syncer
echo "installing todoman"
cd "$DIR/common/todoman/"
sudo python3 setup.py install
echo "installing vdirsyncer" echo "installing vdirsyncer"
sudo pip install vdirsyncer sudo pip install vdirsyncer

@ -1 +0,0 @@
Subproject commit a7c327be6f84c3585028a48b46743ce94afaf5ef

View file

@ -7,6 +7,9 @@ sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonf
sudo dnf -y install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors vlc freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager sudo dnf -y install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors vlc freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager
sudo dnf -y groupinstall "C Development Tools and Libraries" sudo dnf -y groupinstall "C Development Tools and Libraries"
sudo systemctl enable tor
sudo systemctl start tor
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../" DIR="$DIR/../"
DIR="$DIR" $DIR/common/configure_fresh_system DIR="$DIR" $DIR/common/configure_fresh_system

View file

@ -1,9 +1,12 @@
#!/bin/bash #!/bin/bash
sudo yum install -y libbsd-devel libbsd glibc-devel libX11-devel help2man autoconf git tar glib2 glib2-devel kernel-devel kernel-headers automake gcc gtk2-devel FEDORA_VERSION=`rpm -E %fedora`
sudo yum install -y VirtualGL VirtualGL.i686 sudo dnf install -y libbsd-devel libbsd glibc-devel libX11-devel help2man autoconf git tar glib2 glib2-devel kernel-devel kernel-headers automake gcc gtk2-devel
sudo yum install -y http://install.linux.ncsu.edu/pub/yum/itecs/public/bumblebee/fedora21/noarch/bumblebee-release-1.2-1.noarch.rpm sudo dnf install -y VirtualGL VirtualGL.i686
sudo yum install -y bbswitch bumblebee sudo dnf install -y http://install.linux.ncsu.edu/pub/yum/itecs/public/bumblebee/fedora$FEDORA_VERSION/noarch/bumblebee-release-1.2-1.noarch.rpm
sudo yum install -y http://install.linux.ncsu.edu/pub/yum/itecs/public/bumblebee-nonfree/fedora21/noarch/bumblebee-nonfree-release-1.2-1.noarch.rpm sudo dnf install -y bbswitch bumblebee
sudo yum install -y bumblebee-nvidia sudo dnf install -y http://install.linux.ncsu.edu/pub/yum/itecs/public/bumblebee-nonfree/fedora$FEDORA_VERSION/noarch/bumblebee-nonfree-release-1.2-1.noarch.rpm
sudo yum install -y primus primus.i686 sudo dnf install -y bumblebee-nvidia
sudo dnf install -y primus primus.i686
sudo systemctl enable bumblebeed.service
sudo systemctl start bumblebeed.service