myconfig

commit 9ca6d4f5bd561d28ea70b65db91c8026e21df2a1
parent 9698e0f0a54a03e1910fcf028577c83aa793194c
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Wed,  2 Jul 2014 12:14:18 +0200

Merge branch 'master' of gitorious.org:myconfig/myconfig

Diffstat:
apt/desktop
 | 
6
++----
apt/devel
 | 
3
+++
apt/external
 | 
1
+
apt/games
 | 
3
++-
apt/minimal
 | 
4
++++
apt/misc
 | 
11
-----------
apt/old
 | 
4
----
apt/pdfopt
 | 
1
+
apt/server
 | 
3
++-
apt/webserver
 | 
1
-
apt_old
 | 
4
++++
i3/config
 | 
4
++--
zsh/alias
 | 
2
++

13 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/apt/desktop b/apt/desktop
@@ -1,6 +1,5 @@
 audacity
 baobab
-blender
 cheese
 chromium
 chromium-inspector
@@ -34,7 +33,6 @@ wireshark
 x11-common
 x11proto-xext-dev
 x2x
-xaos
 xbindkeys
 xclip
 xdotool
@@ -51,12 +49,11 @@ xterm
 xtightvncviewer
 xtrlock
 xvkbd
-zathura
 vlc
 praat
 pulseaudio
 totem
-transmission-gtk
+transmission
 ttf-lyx
 ttf-mscorefonts-installer
 system-config-printer
@@ -102,3 +99,4 @@ dvd+rw-tools
 wodim
 abcde
 feh
+x2x
diff --git a/apt/devel b/apt/devel
@@ -0,0 +1,3 @@
+javacc
+valgrind
+ltrace
diff --git a/apt/external b/apt/external
@@ -8,3 +8,4 @@ libboost-program-options-dev
 pdfedit
 logkeys
 dropbox
+google-talkplugin
diff --git a/apt/games b/apt/games
@@ -46,7 +46,8 @@ fortune-mod
 supertux
 quadrapassel
 minetest
-wine
 cowsay
 crawl
 winetricks
+xaos
+electricsheep
diff --git a/apt/minimal b/apt/minimal
@@ -37,3 +37,7 @@ gawk
 bc
 colordiff
 info
+num-utils
+time
+tidy
+zip
diff --git a/apt/misc b/apt/misc
@@ -1,14 +1,9 @@
 abcmidi
 ack-grep
-acl
 alsa-base
 alsa-firmware-loaders
 alsamixergui
-alsa-tools
-ant
-antlr
 apt-file
-apticron
 apt-xapian-index
 apvlv
 archmage
@@ -49,7 +44,6 @@ chkrootkit
 chm2pdf
 clisp
 clive
-cmake
 connect-proxy
 consolekit
 crda
@@ -59,7 +53,6 @@ cups
 cups-client
 curl
 curlftpfs
-dbacl
 dbconfig-common
 dbus
 dctrl-tools
@@ -283,7 +276,6 @@ python-vobject
 python-webkit
 python-xapian
 python-yaml
-python-zbar
 qemu
 qprint
 quilt
@@ -319,8 +311,6 @@ tmux
 trang
 twolame
 tzdata-java
-u-boot
-u-boot-tools
 unetbootin
 unicode
 units
@@ -343,7 +333,6 @@ xmlstarlet
 xmltoman
 xmorph
 xsltproc
-zbar-tools
 zenity
 python-cvxopt
 python-scipy
diff --git a/apt/old b/apt/old
@@ -1,4 +0,0 @@
-adobeair:i386
-jockey-common
-electricsheep
-freeglut3:i386
diff --git a/apt/pdfopt b/apt/pdfopt
@@ -0,0 +1 @@
+sam2p
diff --git a/apt/server b/apt/server
@@ -19,7 +19,6 @@ pigz
 make
 emacs
 surfraw
-valgrind
 vrms
 sqlite
 sqlite3
@@ -38,6 +37,8 @@ elinks
 fdupes
 debian-goodies
 smartmontools
+radicale
+qdbus
 tidy
 xmlstarlet
 python-pip
diff --git a/apt/webserver b/apt/webserver
@@ -1 +0,0 @@
-apache2
diff --git a/apt_old b/apt_old
@@ -0,0 +1,4 @@
+adobeair:i386
+jockey-common
+electricsheep
+freeglut3:i386
diff --git a/i3/config b/i3/config
@@ -32,8 +32,8 @@ bindsym $mod+i exec "urxvtcd -e irssi"
 bindsym $mod+Shift+c kill
 
 # start dmenu (a program launcher)
-bindsym $mod+e exec "exe=`dmenu < ~/temp/path` && exec $exe"
-bindsym $mod+shift+e exec "exe=`dmenu < ~/temp/path` && exec urxvtcd -e $exe"
+bindsym $mod+e exec dmenu_run
+bindsym $mod+shift+e exec ~/bin/dmenu_run_urxvtcd
 bindsym $mod+Shift+w exec "wen=`dmenu < /dev/null` && exec ~/bin/wwen $wen"
 
 # change focus
diff --git a/zsh/alias b/zsh/alias
@@ -53,3 +53,5 @@ alias sshn="ssh -o \"ControlPath=/nowhere\" -o ControlMaster=no"
 alias v='f -e vim'
 alias m='f -e mplayer'
 alias o='a -e xdg-open'
+alias sw="sr -browser=w3m"
+alias wen="sw wikipedia"