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

This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-04-19 22:12:10 +02:00
commit e187977ac7
6 changed files with 15 additions and 2 deletions

View file

@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
Exec=sh "/home/cyryl/.conky/conky-startup.sh"
Hidden=false
NoDisplay=false
X-GNOME-Autostart-enabled=true
Name[en_IN]=Conky
Name=Conky
Comment[en_IN]=
Comment=

@ -1 +1 @@
Subproject commit e55c715508a2f652fed741f2047c66dda2c6e5b0 Subproject commit 75b9030f48a55a42849cc68b0fc5b92d66d236ac

View file

@ -24,7 +24,10 @@ ln -vfs "$DIR/.Slic3r" ~/.
ln -vfs "$DIR/.ghci" ~/. ln -vfs "$DIR/.ghci" ~/.
mkdir -p ~/.kde/share/config/ mkdir -p ~/.kde/share/config/
ln -vfs "$DIR/.kdiff3rc" ~/.kde/share/config/kdiff3rc ln -vfs "$DIR/.kdiff3rc" ~/.kde/share/config/kdiff3rc
ln -vfs "$DIR/.conky" ~/.
ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig
mkdir -p ~/.config/autostart/
ln -vfs "$DIR/.config/autostart/conky.desktop" ~/.config/autostart/
# tools # tools
ln -vfs "$DIR/tools" ~/ ln -vfs "$DIR/tools" ~/

0
common/install_nikola Normal file → Executable file
View file

View file

@ -4,7 +4,7 @@
FEDORA_VERSION=`rpm -E %fedora` FEDORA_VERSION=`rpm -E %fedora`
sudo yum install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm sudo yum install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm
sudo yum install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm sudo yum install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm
sudo yum 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 sudo yum 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
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../" DIR="$DIR/../"

0
fedora/install_optimus Normal file → Executable file
View file