commit 76e0a77a96017081010d23e13689e4365c55c595
parent 67d2ed2278f618ada5560f7e9d9332a0fe93ed2c
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Sat, 8 Oct 2016 10:26:12 +0200
Merge branch 'master' of a3nm.net:git/myconfig
Diffstat:
15 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/apt/cd b/apt/cd
@@ -3,4 +3,5 @@ eject
abcde
flac
dvdbackup
-libdvdcss2
+# seems obsolete: libdvdcss2
+libdvd-pkg
diff --git a/apt/desktop b/apt/desktop
@@ -2,7 +2,6 @@
audacity
cheese
chromium
-chromium-inspector
diffpdf
dosbox
eog
@@ -21,7 +20,6 @@ okular
openbox
wireshark
xclip
-xfonts-terminus
xinit
xnest
xpdf
@@ -29,14 +27,17 @@ xterm
xtrlock
pulseaudio
transmission
+
ttf-lyx
ttf-mscorefonts-installer
-fonts-droid
+fonts-droid-fallback
fonts-freefont-otf
fonts-liberation
fonts-linuxlibertine
fonts-lyx
fonts-opensymbol
+xfonts-terminus
+
# flashplugin-nonfree
vim-gtk
scrot
@@ -104,3 +105,5 @@ fonts-roboto
redshift
openshot # simple video editing
+
+pinentry-gtk2 # for xpass
diff --git a/apt/fasd b/apt/fasd
@@ -1,3 +0,0 @@
-# https://github.com/clvv/fasd
-# installed with checkinstall
-fasd
diff --git a/apt/latex b/apt/latex
@@ -18,7 +18,7 @@ latexdiff
texlive-publishers
biber
cm-super
-latex-beamer
+# seems obsolete: latex-beamer
texlive-xetex
texlive-bibtex-extra
texlive-fonts-recommended
diff --git a/apt/minimal b/apt/minimal
@@ -47,7 +47,7 @@ tidy
qprint
make
unattended-upgrades
-netcat6
+netcat
fuse
at
rsyslog
@@ -116,3 +116,5 @@ systemd
gnupg2
apt-transport-https
+
+net-tools
diff --git a/apt/missing b/apt/missing
@@ -0,0 +1,6 @@
+fonts-droid
+gcc-doc
+sam2p
+libssl1.0.0:i386
+chromium-inspector
+netcat6
diff --git a/apt/nonfree b/apt/nonfree
@@ -1,4 +1,4 @@
# from the Debian non-free repository
# unrar
-gcc-doc
+# gcc-doc
tar-doc
diff --git a/apt/pdfopt b/apt/pdfopt
@@ -1,2 +1,2 @@
# packages required for pdfopt
-sam2p
+# sam2p
diff --git a/apt/skype b/apt/skype
@@ -5,5 +5,5 @@ libxss1:i386
libqtdbus4:i386
libqtwebkit4:i386
libqt4-dbus:i386
-libssl1.0.0:i386
+# libssl1.0.0:i386
libpulse0:i386
diff --git a/install.sh b/install.sh
@@ -5,9 +5,13 @@ mkdir -p ~/temp/{vim,mutt}
mkdir -p ~/temp/vim/{temp,backup}
mkdir -p ~/apps
touch ~/-@ # http://unix.stackexchange.com/a/77868
-# TODO install urlpicker
cd ~/apps
git clone 'https://github.com/clvv/fasd'
+git clone https://git.zx2c4.com/password-store
+# sudo make install
+git clone 'https://bitbucket.org/sterlingcamden/urlpicker/'
+# sudo mkdir -p '/usr/local/lib/urxvt/perl'
+# sudo cp urlpicker/url-picker /usr/local/lib/urxvt/perl
ln -s ~/apps/fasd/fasd ~/bin
cd ~/config
mkdir -p ~/config/private/zsh
@@ -22,8 +26,6 @@ ln -s ~/.mutt/muttrc ~/.muttrc
ln -s ~/.vim/vimrc ~/.vimrc
ln -s ~/.zsh/zshrc ~/.zshrc
ln -s ~/config/gtk/gtkrc-2.0 ~/.gtkrc-2.0
-mkdir -p ~/.w3m
-ln -s ~/config/w3m ~/.w3m/config
ln -s ~/config/gnupg/gpg-agent.conf ~/.gnupg/gpg-agent.conf
ln -s ~/config/gnupg/gpg.conf ~/.gnupg/gpg.conf
ln -s ~/config/i3/config ~/.i3/config
@@ -33,7 +35,6 @@ ln -s ~/config/xpdf ~/.xpdfrc
touch ~/.hushlogin
ln -s ~/config/i3/status ~/.i3status.conf
ln -s ~/config/lbdb ~/.lbdbrc
-ln -s ~/config/xinitrc ~/.xinitrc
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
diff --git a/mutt/aliases b/mutt/aliases
@@ -1 +0,0 @@
-../private/mutt/aliases-
\ No newline at end of file
diff --git a/mutt/imap b/mutt/imap
@@ -1 +0,0 @@
-/home/a3nm/config/private/mutt/imap-
\ No newline at end of file
diff --git a/mutt/local_email b/mutt/local_email
@@ -1 +0,0 @@
-/home/a3nm/config/private/mutt/local_email-
\ No newline at end of file
diff --git a/mutt/perso b/mutt/perso
@@ -1 +0,0 @@
-../private/mutt/perso-
\ No newline at end of file
diff --git a/vim/new_vim b/vim/new_vim
@@ -1 +0,0 @@
-../private/vim/new_vim-
\ No newline at end of file
