From 765c0569da6593e68b8a5b0ea404d1fb391fbd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 2 Aug 2017 20:32:59 +0200 Subject: [PATCH] general makeover --- setup_scripts/fedora.sh | 62 +++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/setup_scripts/fedora.sh b/setup_scripts/fedora.sh index 0ab0b8c..3298edd 100755 --- a/setup_scripts/fedora.sh +++ b/setup_scripts/fedora.sh @@ -15,59 +15,59 @@ function config_git { git config --list } function install_rpms { - #Google Play Music Desktop Player - export rpm_links=$(curl -s \ - https://api.github.com/repos/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases \ - | grep browser_download_url | grep '64[.]rpm' | head -n 1 | cut -d '"' -f 4) - #Keybase - export rpm_links="$rpm_links https://prerelease.keybase.io/keybase_amd64.rpm" + export rpm_links="https://prerelease.keybase.io/keybase_amd64.rpm" #Install RPMs specified above. sudo dnf install -y $rpm_links } function install_pip_packages { sudo pip install --upgrade pip - sudo pip install --upgrade borgmatic -} -function install_omz { - sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)" - sudo sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)" + sudo pip install powerline-status } function install_dnf_packages { export packages="vlc ffmpeg" #Multimedia Stuff - export packages="$packages hexchat gajim" #Messaging - export packages="$packages pcsc-lite" #Libraries + export packages="$packages pcsc-lite pinentry-gtk" #Smartcard/Crypto export packages="$packages chromium" #Browsers export packages="$packages nextcloud-client" #Nextcloud Client - export packages="$packages menulibre shutter deluge syncthing* yubi*" #GUI Tools + export packages="$packages menulibre deluge syncthing* yubi*" #GUI Tools export packages="$packages htop vim pass heimdall borgbackup" #Command Line Tools export packages="$packages gimp digikam" #Photography - export packages="$packages gnome-tweak-tool" #Gnome export packages="$packages xournal" #Stylusstuff export packages="$packages latexila texlive-scheme-medium" #LaTeX - export packages="$packages zsh powerline powerline-fonts" #SDKs + export packages="$packages zsh hack-fonts antigen" #Shellstuff export packages="$packages java-1.8.0-openjdk* golang" #SDKs export packages="$packages exfat-utils fuse-exfat" #ExFAT #Android SDK Dependencies export packages="$packages compat-libstdc++-296.i686 compat-libstdc++-33.i686 compat-libstdc++-33.x86_64 ncurses-libs.i686" + export packages="$packages libxcb-devel libXft-devel" #Libraries sudo dnf install -y $packages --best --allowerasing sudo dnf upgrade -y } -function install_source_packages { - git clone https://github.com/vibou/vibou.gTile.git ~/.local/share/gnome-shell/extensions/gTile@vibou -} function install_software { add_repos install_rpms install_dnf_packages install_pip_packages - install_source_packages - install_omz + install_other +} +function install_other { + #Rust + curl https://sh.rustup.rs -sSf | sh + install_lemonbar +} +function install_lemonbar { + cd ~/dev + git clone https://github.com/krypt-n/bar lemonbar-xft + cd lemonbar-xft + make + sudo cp lemonbar /usr/local/bin } function add_repos { #Negativo17 Fedora Multimedia sudo dnf config-manager --add-repo=http://negativo17.org/repos/fedora-multimedia.repo + #Antigen + sudo dnf config-manager --add-repo http://download.opensuse.org/repositories/shells:zsh-users:antigen/Fedora_26/shells:zsh-users:antigen.repo #RPM-Fusion Free sudo dnf install -y http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm #RPM-Fusion Non Free @@ -76,6 +76,8 @@ function add_repos { sudo dnf copr enable -y decathorpe/syncthing #Nextcloud Client sudo dnf copr enable -y tpokorra/nextcloud + #Hack font + sudo dnf copr enable -y heliocastro/hack-fonts } function setup_gpg_ssh { gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 816054803C0F5F14C462398B3D512CA0D8E8352E @@ -91,13 +93,12 @@ function clone_git_repos { git clone ssh://git@jcg.re:10022/jcgruenhage/scripts.git git clone ssh://git@jcg.re:10022/jcgruenhage/prog16_17.git git clone ssh://git@jcg.re:10022/jcgruenhage/homepage.git - git clone ssh://git@jcg.re:10022/klug-O-soft/kOs_Timer.git git clone ssh://git@jcg.re:10022/jcgruenhage/config-files.git mkcdir gopath/src/git.jcg.re/jcgruenhage/ git clone ssh://git@jcg.re:10022/jcgruenhage/go_helloworld.git - cd ../../../.. + cd ~/dev git clone ssh://git@github.com/jcgruenhage/freeotp-android.git git clone ssh://git@github.com/jcgruenhage/nextcloud-android.git git clone ssh://git@github.com/jcgruenhage/PlayMusicExporter.git @@ -107,21 +108,14 @@ function mkcdir { cd -P -- "$1" } function configure { - pushd cd ~/dev/config-files - #Copy run command files - cp -f .*rc ~ - sudo cp -f .*rc /root/ - sudo cp -f borgmatic.* /etc/systemd/system/ - sudo cp -rf borgmatic /etc/ - sudo systemctl enable borgmatic.timer - sudo systemctl start borgmatic.timer - popd + cp .zshrc ~ + cp .config/i3/config ~/.config/i3 + cp .Xdefaults ~ + cp .xinitrc ~ } - # Execution: install_software setup_gpg_ssh config_git clone_git_repos -configure