commit bc888e1404b4a425f18d0c1b8b50f9c8bfdaec0b
parent 75369ee0c86d272e2e8e0821eea8e6c0d8483039
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Sat, 3 Jan 2015 23:28:01 +0100
Merge branch 'master' of gitorious.org:myconfig/myconfig
Conflicts:
apt/desktop
apt/laptop
apt/latex
apt/server
Diffstat:
16 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/apt/audio b/apt/audio
@@ -1,5 +1,8 @@
lame
timidity
freepats
+fluid-soundfont-gm
+fluid-soundfont-gs
sox
speex
+alsa-utils
diff --git a/apt/camllight b/apt/camllight
@@ -0,0 +1 @@
+camllight
diff --git a/apt/desktop b/apt/desktop
@@ -53,21 +53,23 @@ mumble
gtk-recordmydesktop
linphone
lm-sensors
-slim
-tor
xdot
gnome-terminal
android-tools-adb
android-tools-fastboot
wodim
-abcde
feh
x2x
rxvt-unicode
-eject
x11-apps
x11-xserver-utils
zenity
gucharmap
pavucontrol
unetbootin
+gstreamer0.10-plugins-good
+gstreamer0.10-plugins-bad
+gstreamer0.10-plugins-ugly
+xorg
+sysvinit # just in case
+logkeys
diff --git a/apt/external b/apt/external
@@ -1,5 +1,2 @@
-logkeys
dropbox
-google-talkplugin
-notmuch
-fasd
+skype:i386
diff --git a/apt/fasd b/apt/fasd
@@ -0,0 +1 @@
+fasd
diff --git a/apt/games b/apt/games
@@ -48,5 +48,4 @@ crawl
winetricks
xaos
robotfindskitten
-gens:i386
caca-utils
diff --git a/apt/google-talkplugin b/apt/google-talkplugin
@@ -0,0 +1 @@
+google-talkplugin
diff --git a/apt/laptop b/apt/laptop
@@ -7,3 +7,11 @@ cups-client
xsane
rfkill
network-manager
+aircrack-ng
+bluetooth
+pulseaudio-module-bluetooth
+bluez
+cups-filters
+task-laptop
+abcde
+eject
diff --git a/apt/latex b/apt/latex
@@ -20,4 +20,5 @@ latex-beamer
texlive-xetex
texlive-bibtex-extra
texlive-fonts-recommended
+texlive-lang-european
dot2tex
diff --git a/apt/minimal b/apt/minimal
@@ -47,3 +47,32 @@ fuse
at
rsyslog
curl
+apg
+cryptsetup-bin
+dfc
+w3m
+task-english
+task-ssh-server
+tcplay
+cron
+file
+ftp
+gzip
+hostname
+ifupdown
+grep
+findutils
+login
+perl
+logrotate
+tar
+lsof
+mount
+openssh-client
+openssh-server
+passwd
+patch
+diffutils
+procmail
+dovecot-sieve
+gnupg-agent
diff --git a/apt/misc b/apt/misc
@@ -5,9 +5,7 @@ bsdiff
build-essential
checkinstall
chkrootkit
-chm2pdf
curlftpfs
-debtree
default-jdk
default-jre
default-jre-headless
@@ -21,7 +19,6 @@ ed
exif
expect
exuberant-ctags
-ffmpeg
file-roller
filters
fuseiso
@@ -33,7 +30,6 @@ gddrescue
genisoimage
gettext
git-annex
-gnupg-agent
graphviz
gsfonts
gsfonts-other
diff --git a/apt/python b/apt/python
@@ -15,7 +15,7 @@ python3-tornado # for selvage
python-tornado # for selvage
python-gdata # for videotop
-python-wxgtk2.8 # for groove-dl
+python-wxgtk3.0 # for groove-dl, was 2.8
python-beautifulsoup
python-debian
diff --git a/apt/server b/apt/server
@@ -3,7 +3,6 @@ acpi
acpid
command-not-found
autoconf-archive
-dovecot-sieve
nethogs
par
pngcrush
@@ -28,7 +27,6 @@ fdupes
debian-goodies
smartmontools
radicale
-qdbus
mitmproxy
tig
xmlstarlet
@@ -39,12 +37,11 @@ apt-file
reportbug
tnef # needed once for strange email
youtube-dl
+cclive
verbiste # for french-conjugator and french-deconjugator
transmission-cli
nfs-kernel-server
ircd-hybrid
-bitcoind
-camllight
dnsutils
lbdb
iputils-ping
@@ -56,3 +53,10 @@ libpam-mount # required to handle /etc/security/pam_mount.conf.xml
libssl-dev # to build libircclient
libtool # for libtoolize, for builds
irssi
+archivemount
+autoconf
+automake
+easy-rsa
+pdfgrep
+tinyproxy
+tor
diff --git a/apt/server_recent b/apt/server_recent
@@ -0,0 +1 @@
+bitcoind
diff --git a/apt/wesnoth b/apt/wesnoth
@@ -1,6 +1,7 @@
+wesnoth
libsdl-ttf2.0-dev
libsdl-net1.2-dev
libsdl-image1.2-dev
-libboost-regex1.46-dev
-libboost-program-options1.46-dev
+libboost-regex-dev
+libboost-program-options-dev
libboost-iostreams-dev
diff --git a/install.sh b/install.sh
@@ -28,3 +28,4 @@ mkdir -p ~/.vim/autoload ~/.vim/bundle
curl -LSso ~/.vim/autoload/pathogen.vim 'https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim'
cd ~/.vim/bundle
git clone git://github.com/vim-scripts/vimwiki.git
+mkdir -p ~/scratch
