commit 03a50677523785bf019ce3fca2d1b852cf27401f
parent 6b11e085972bf83aad6a3125f62ea075c85aff74
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Fri, 17 Apr 2020 13:11:01 +0200
Merge branch 'master' of a3nm.net:git/myconfig
Diffstat:
23 files changed, 96 insertions(+), 40 deletions(-)
diff --git a/apt/audacity b/apt/audacity
@@ -0,0 +1,13 @@
+# audacity unusable on wayland with Debian as per https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948364
+libsndfile1
+libasound2-dev
+libgtk2.0-dev
+gettext
+libid3tag0-dev
+libmad0-dev
+libsoundtouch-dev
+libogg-dev
+libvorbis-dev
+libflac-dev
+libmp3lame0
+libgtk-3-dev
diff --git a/apt/cd b/apt/cd
@@ -5,6 +5,9 @@ abcde
glyrc
flac
-dvdbackup
-handbrake # rip DVDs easily (but lossily)
+
+# to backup DVDs, open them in VLC first, then simply use cp
+# dvdbackup
+# handbrake # rip DVDs easily (but lossily)
+
# seems obsolete: libdvdcss2
diff --git a/apt/desktop b/apt/desktop
@@ -26,6 +26,7 @@ libreoffice
okular
openbox
xclip
+wl-clipboard
xinit
xpdf
xterm
@@ -66,9 +67,6 @@ lmodern
scrot
gtk-recordmydesktop
-rosegarden
-musescore
-lilypond
solfege
# linphone
@@ -129,7 +127,7 @@ fonts-roboto
redshift
-openshot # simple video editing
+# openshot # simple video editing, but large...
# frei0r-plugins # openshot recommendation, but large...
gstreamer1.0-libav
@@ -146,8 +144,6 @@ geeqie
xournal # draw on PDF
-josm # don't bother having a more recent version
-
gnome-clocks # measure time
rofi
@@ -180,7 +176,7 @@ rtkit # realtime?
acpi-support # only for laptops, because it depends on X
-gitit # playing with this wiki engine
+# gitit # playing with this wiki engine
# blender # too large
@@ -190,3 +186,4 @@ libsecp256k1-0 # for electrum
vainfo # info about hardware acceleration
+jmtpfs # retrieve photo from weird stuff
diff --git a/apt/devel b/apt/devel
@@ -3,9 +3,12 @@ javacc
ltrace
g++
gdb
+gdb-doc
cppreference-doc-en-html
python3-doc
python-doc
valgrind
valgrind-dbg
+
+gcc-doc
diff --git a/apt/devel_recent b/apt/devel_recent
@@ -1,3 +1,3 @@
# openjdk-9-doc
# openjdk-9-jdk
-libstdc++-6-doc
+libstdc++-9-doc
diff --git a/apt/dvd_create b/apt/dvd_create
@@ -1,3 +1,2 @@
-# create video dvds
-devede
+# devede # create video dvds
dvd+rw-tools
diff --git a/apt/enum_spanner_rs b/apt/enum_spanner_rs
@@ -1 +1,2 @@
cargo
+python3-venv
diff --git a/apt/games b/apt/games
@@ -16,8 +16,8 @@ excellent-bifurcation
# gnome-sudoku
# gnomine
#
-gnuchess
-gnuchess-book
+#gnuchess
+#gnuchess-book
gravitation
# gtetrinet
@@ -42,7 +42,7 @@ fortunes-bofh-excuses
fortunes-debian-hints
fortunes-off
fortune-mod
-supertux
+#supertux
cowsay
cowsay-off
crawl
diff --git a/apt/headless b/apt/headless
@@ -42,11 +42,11 @@ colortest # test terminal colors
pypy
csstidy
unrar # non-free version
-transmission-daemon
+# transmission-daemon # often goes at 100% CPU for no reason...
transmission-remote-cli
localepurge # save space
whois
-mitmproxy
+#mitmproxy
bzip2-doc
uuid-runtime # generate uuids
@@ -57,7 +57,7 @@ ufraw-batch # convert RAW images
convlit # converts ebook formats
djvulibre-bin # converts djvu files
-docbook-dsssl # converts docbook to other formats
+# docbook-dsssl # converts docbook to other formats
dvipng # convert from dvi to png
fig2dev # convert xfig files
libwmf-bin # convert WMF files
@@ -80,3 +80,6 @@ binwalk # find files in binary stream; lots of graphic dependencies
toot # mastodon
apparmor # security
+
+# saxonb-xslt for saxonb-xslt for SWERC XSL stylesheets
+
diff --git a/apt/music b/apt/music
@@ -0,0 +1,3 @@
+#rosegarden
+musescore3
+#lilypond
diff --git a/apt/osm b/apt/osm
@@ -0,0 +1,2 @@
+josm # don't bother having a more recent version
+
diff --git a/apt/python b/apt/python
@@ -2,7 +2,7 @@
libpython2.7-stdlib
-python-pip
+#python-pip
python3-pip
python-pygments
@@ -13,7 +13,7 @@ python3-tornado # for selvage
python-tornado # for selvage
python-gdata # for videotop
-python-wxgtk3.0 # for groove-dl, was 2.8
+# python-wxgtk3.0 # for groove-dl, was 2.8
python-beautifulsoup
python-debian
@@ -21,7 +21,7 @@ python-dev
python-flask
python-fuse
#python-matplotlib
-python-pyglet
+# python-pyglet
python-pyquery
# python-statsmodels
@@ -74,3 +74,7 @@ python3-pytest # for plint
python3-imageio # for image processing for misc/melodia
pypy3
+
+jupyter
+
+libjpeg-dev # for python-imageio for songflower
diff --git a/apt/server b/apt/server
@@ -107,3 +107,10 @@ tcplay # truecrypt alternative
syncthing # used on the phone
+magic-wormhole # securely transfer files
+
+parallel # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597050 but I think it's fine, with a diversion
+
+sshpass # for SWERC
+
+stuntman-client # test STUN stuff
diff --git a/apt/steam b/apt/steam
@@ -1,12 +1,13 @@
# steam and other blobby games
# libcurl3:i386 # now obsolete and incompatible with other packages
-libegl1-mesa:i386
# looks obsolete: libtinfo:i386
-libgl1-mesa-dri:i386
-libglu1-mesa:i386 # amnesia the dark descent
# looks obsolete: libmikmod2:i386 # crayon physics
# so let's also give up on:
# libvorbisfile3:i386 # crayon physics
# libsmpeg0:i386 # crayon physics
# libtiff4:i386 # crayon physics
+
+# libegl1-mesa:i386
+# libgl1-mesa-dri:i386
+# libglu1-mesa:i386 # amnesia the dark descent
diff --git a/apt/toadd b/apt/toadd
@@ -1,2 +0,0 @@
-# would be useful to have, but cannot be installed...
-parallel # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597050
diff --git a/apt/wine b/apt/wine
@@ -1,11 +1,13 @@
# wine and useful related packages
-playonlinux
-wine32:i386
-libasound2:i386
-libasound2-plugins:i386
-libc6-i386
-libcurl3-gnutls:i386 # for don't starve
+# playonlinux
winetricks
wine-development
wine64-development
wine
+
+
+# wine32:i386
+#libasound2:i386
+#libasound2-plugins:i386
+libc6-i386
+#libcurl3-gnutls:i386 # for don't starve
diff --git a/install.sh b/install.sh
@@ -94,4 +94,5 @@ mkdir -p ~/.config
mkdir -p ~/.local/share/applications/
ln -s ~/config/mimeapps.list ~/.config
ln -s ~/config/mimeapps.list ~/.local/share/applications/defaults.list
+ln -s ~/config/firefox/sandboxed_browser.desktop ~/.local/share/applications/
diff --git a/mimeapps.list b/mimeapps.list
@@ -4,3 +4,9 @@ application/pdf=org.gnome.Evince.desktop
[Added Associations]
image/jpeg=eog.desktop;geeqie.desktop;
video/mp4=vlc.desktop;
+
+text/html=sandboxed_browser.desktop
+x-scheme-handler/http=sandboxed_browser.desktop
+x-scheme-handler/https=sandboxed_browser.desktop
+x-scheme-handler/about=sandboxed_browser.desktop
+x-scheme-handler/unknown=sandboxed_browser.desktop
diff --git a/mutt/muttrc b/mutt/muttrc
@@ -14,6 +14,7 @@ set reverse_alias
set use_domain=no
set query_command="lbdbq '%s'"
bind editor \cn complete-query
+my_hdr User-Agent: Mutt
# == Editor ==
set editor="vim -c ':so ~/config/vim/vimrc_mail' +1 +/^$/"
@@ -162,7 +163,7 @@ macro index,pager R \
set noabort_unmodified
# keep old mail around to complete threads
-set maildir_trash
+# set maildir_trash
# reset default limit
macro index B "l~(! ~D)<enter>"
@@ -195,3 +196,8 @@ folder-hook (^notmuch) "set read_only=yes"
set abort_noattach = ask-yes
set abort_noattach_regex = "^([^>].*)?\\<(attach(|ed|ments?)|(attaché|attachés|attache|attachons|joint|jointe|joints|jointes|joins|joignons))\\>"
+# == Remailback ==
+source ~/.mutt/remailback
+
+#set autocrypt
+
diff --git a/mutt/remailback b/mutt/remailback
@@ -0,0 +1,3 @@
+macro pager,index Y "|runon psi /data/remailback/add.sh "
+macro pager,index y "|runon psi /data/remailback/show.sh<enter>"
+macro pager,index Z "|runon psi /data/remailback/delete.sh<enter>"
diff --git a/sway/config b/sway/config
@@ -15,7 +15,8 @@ set $mod Mod4
# font for window titles. ISO 10646 = Unicode
#font -*-Terminus*-*-*-*-*-*-*-*-*-*-*-*
-font Terminus 10
+#font Terminus 10
+font Inconsolata 10
#font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
client.background #000000
@@ -127,9 +128,8 @@ bindsym $mod+Shift+n move container to output right
# reload the configuration file
-bindsym $mod+Shift+D reload
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+R restart
+bindsym $mod+Shift+R reload
# exit i3 (logs you out of your X session)
bindsym $mod+Shift+greater exit
@@ -171,7 +171,7 @@ bar {
mode hide
position bottom
#font -*-Terminus*-*-*-*-*-*-*-*-*-*-*-*
- font Terminus
+ font Inconsolata
}
input * {
diff --git a/zsh/path b/zsh/path
@@ -1,9 +1,13 @@
#!/bin/bash
-PATH=~/bin_private:~/bin:~/local/bin/:$PATH:/sbin:/usr/sbin:~/.subuser/bin
+PATH=~/bin_private:~/bin:~/local/bin/:~/local/usr/bin/:~/local/usr/local/bin:$PATH:/sbin:/usr/sbin:~/.subuser/bin
export PATH
-LD_LIBRARY_PATH=~/local/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=~/local/lib:~/local/usr/lib:~/local/usr/local/lib:/usr/local/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
+C_INCLUDE_PATH=~/local/usr/include:~/local/usr/local/include:$C_INCLUDE_PATH
+export C_INCLUDE_PATH
+CPP_INCLUDE_PATH=~/local/usr/include:~/local/usr/local/include:$CPP_INCLUDE_PATH
+export CPP_INCLUDE_PATH
MANPATH=~/local/share/man:$MANPATH
export MANPATH
INFOPATH=~/local/share/info:$INFOPATH
diff --git a/zsh/zshrc b/zsh/zshrc
@@ -86,7 +86,7 @@ zstyle ':completion:*:sudo:*' command-path /usr/local/sbin /usr/local/bin \
export PAGER='less'
export EDITOR='vim'
-export BROWSER='firefox'
+export BROWSER="$HOME/bin/sandboxed-browser"
bindkey -e
