cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into fedora_fixes

Browse source
This commit is contained in:
Cyryl Płotnicki 2016-10-08 09:16:12 +02:00
commit d0600cd657
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.kdiff3rc
View file

@ -98,7 +98,7 @@ Height 768=769
Height 900=901 Height 900=901
Height 975=976 Height 975=976
Height 985=986 Height 985=986
State=AAAA/wAAAAD9AAAAAAAAB4AAAAO8AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA State=AAAA/wAAAAD9AAAAAAAAB4AAAANTAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
ToolBarsMovable=Disabled ToolBarsMovable=Disabled
Width 1366=1367 Width 1366=1367
Width 1440=1441 Width 1440=1441

6
.travis.yml
View file

@ -5,10 +5,10 @@ script:
- ./test - ./test
env: env:
- DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base
- DETECTED_OS=debian:jessie DOCKER_IMAGE=cyplo/jessie_base - DETECTED_OS=debian:jessie DOCKER_IMAGE=cyplo/jessie_base
- DETECTED_OS=ubuntu:trusty - DETECTED_OS=ubuntu:trusty DOCKER_IMAGE=cyplo/trusty_base
- DETECTED_OS=ubuntu:xenial - DETECTED_OS=ubuntu:xenial DOCKER_IMAGE=cyplo/xenial_base
sudo: required sudo: required

10
common/configure_fresh_system
View file

@ -98,10 +98,12 @@ if [[ -z $NORUST ]]; then
git pull git pull
git submodule update --init --recursive git submodule update --init --recursive
fi fi
cargo install -j $jobs_count -f rustfmt set +e
cargo install -j $jobs_count -f racer cargo install rustfmt
cargo install -j $jobs_count -f rustsym cargo install racer
cargo install -j $jobs_count -f ripgrep cargo install rustsym
cargo install ripgrep
set -e
fi fi
if [[ -z $NORUBY ]]; then if [[ -z $NORUBY ]]; then

9
fedora/configure_fresh_system
View file

@ -5,12 +5,11 @@ set -e
if [[ -z $NOUPGRADE ]]; then if [[ -z $NOUPGRADE ]]; then
sudo dnf -y upgrade --best --allowerasing sudo dnf -y upgrade --best --allowerasing
fi fi
sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel zeal qt5-linguist qtkeychain-qt5-devel
FEDORA_VERSION=`rpm -E %fedora` sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel zeal qt5-linguist qtkeychain-qt5-devel archivemount keepass splix gutenprint-cups cups-bjnp
sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm
sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm
sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp mono-devel keepass mplayer golang ncurses-compat-libs kicad retext
sudo dnf -y groupinstall "C Development Tools and Libraries" sudo dnf -y groupinstall "C Development Tools and Libraries"
sudo dnf -y groupinstall "Development Tools"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"