From 305f4e53aba70e6660e927bd26946e338dce6251 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Wed, 16 May 2018 07:21:05 +0200 Subject: [PATCH] New installation --- 20-keyboard.conf | 2 +- cal/.config/vdirsyncer/config | 6 +++--- dirs.sh | 2 +- email/.config/msmtp/config | 2 +- email/.mutt/mailcap | 1 + email/.mutt/muttrc | 4 +++- pkgs.sh | 4 +--- shell/.bashrc | 2 +- shell/.local/bin/update | 2 +- texlive.profile | 30 ++++++++++++++++++++++++++++++ 10 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 texlive.profile diff --git a/20-keyboard.conf b/20-keyboard.conf index 687d125..071e6fd 100644 --- a/20-keyboard.conf +++ b/20-keyboard.conf @@ -5,5 +5,5 @@ Section "InputClass" Option "XkbModel" "pc104" Option "XkbLayout" "dvorak,ru,us" Option "XkbVariant" ",phonetic_dvorak," - Option "XKbOptions" "compose:ralt,grp:menu_toggle,ctrl:swapcaps" + Option "XKbOptions" "compose:ralt,grp:menu_toggle" EndSection diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config index aaf9326..90956df 100644 --- a/cal/.config/vdirsyncer/config +++ b/cal/.config/vdirsyncer/config @@ -25,7 +25,7 @@ fileext = ".vcf" [storage contacts_remote] type = "carddav" -url = "https://cal.martlubbers.net/caldav.php/mart" +url = "https://cal.martlubbers.net/dav.php/" #auth = digest username = "mart" password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"] @@ -43,7 +43,7 @@ fileext = ".ics" [storage calendar_remote] type = "caldav" -url = "https://cal.martlubbers.net/caldav.php/mart" +url = "https://cal.martlubbers.net/dav.php/" #auth = digest username = "mart" password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"] @@ -62,7 +62,7 @@ fileext = ".ics" [storage tasks_remote] type = "caldav" -url = "https://cal.martlubbers.net/caldav.php/task" +url = "https://cal.martlubbers.net" #auth = digest username = "task" password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"] diff --git a/dirs.sh b/dirs.sh index 777c389..70be705 100644 --- a/dirs.sh +++ b/dirs.sh @@ -1,4 +1,4 @@ -mkdir -pv ~/.config/{khal,khard,vdirsyncer,todoman,notmuch,msmtp,offlineimap,dunst,newsbeuter,tmux} +mkdir -pv ~/.config/{khal,khard,vdirsyncer,todoman,notmuch,msmtp,offlineimap,dunst,newsboat,tmux} mkdir -pv ~/.mutt mkdir -pv ~/.gnupg mkdir -pv ~/.vim/{after/ftplugin,autoload,bundle,spell,pack/plugins/{opt,start}} diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config index ee9d71f..f26f9a6 100644 --- a/email/.config/msmtp/config +++ b/email/.config/msmtp/config @@ -15,7 +15,7 @@ host smtp.science.ru.nl port 587 auth on tls on -tls_fingerprint 1F:1D:F5:62:FC:9B:D4:BE:77:30:B1:F4:DB:24:49:F8:21:DD:6F:FC:08:1E:4A:78:0B:AC:C4:B4:FA:8E:A4:10 +tls_fingerprint BE:B9:55:15:31:91:FD:0A:C1:E5:DB:FE:C7:94:AB:8D:49:9D:B2:0E:2C:6B:4A:78:04:FD:0E:76:AE:2B:63:44 user mlubbers passwordeval pass science.ru.nl/mlubbers from mart@cs.ru.nl diff --git a/email/.mutt/mailcap b/email/.mutt/mailcap index 25c914e..10590f4 100644 --- a/email/.mutt/mailcap +++ b/email/.mutt/mailcap @@ -30,5 +30,6 @@ application/vnd.openxmlformats-officedocument.presentationml.presentation; libre text/html; w3m -I %{charset} -T text/html; copiousoutput; application/pdf; pdftotext '%s' -; copiousoutput; application/msword; libreoffice --headless --cat '%s'; copiousoutput; +application/ics; khal printics '%s'; copiousoutput; application/vnd.openxmlformats-officedocument.wordprocessingml.document; libreoffice --headless --cat '%s'; copiousoutput; application/vnd.oasis.opendocument.text; libreoffice --headless --cat '%s'; copiousoutput; diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc index 5b4c18c..0566146 100644 --- a/email/.mutt/muttrc +++ b/email/.mutt/muttrc @@ -58,7 +58,9 @@ set mailcap_sanitize=yes # w3m --dump auto_view text/html # pdftotext -auto_view application/pdf +auto_view application/pdf +# khal +auto_view application/ics # libreoffice --cat auto_view application/vnd.openxmlformats-officedocument.wordprocessingml.document auto_view application/msword diff --git a/pkgs.sh b/pkgs.sh index 20888ae..ca5305d 100644 --- a/pkgs.sh +++ b/pkgs.sh @@ -2,10 +2,8 @@ sudo apt-get install \ bash-completion \ build-essential \ dunst \ - dbus-x11 \ firefox-esr \ git \ - gv \ i3-wm \ i3status \ man-db \ @@ -18,7 +16,7 @@ sudo apt-get install \ pass \ pinentry-qt \ psmisc \ - rxvt-unicode \ + tmux \ stow \ suckless-tools \ unzip \ diff --git a/shell/.bashrc b/shell/.bashrc index c47ed4f..ddbfa89 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -19,7 +19,7 @@ export CLEAN_HOME=/opt/clean export PATH=~/.local/bin:$PATH export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin -export PATH=$PATH:/opt/texlive/bin/x86_64-linux:/opt/zotero:/opt/firefox +export PATH=$PATH:/opt/texlive/2018/bin/x86_64-linux export GTK_IM_MODULE=xim export QT_IM_MODULE=xim diff --git a/shell/.local/bin/update b/shell/.local/bin/update index 2dedbc0..24892b5 100755 --- a/shell/.local/bin/update +++ b/shell/.local/bin/update @@ -2,7 +2,7 @@ NUL='>/dev/null 2>&1' cmd() { - echo -n 'apt-get update && apt-get dist-upgrade -y && ' + echo -n 'apt-get update && apt-get dist-upgrade && ' echo -n 'apt-get autoremove --purge && apt-get clean && apt-get autoclean' } diff --git a/texlive.profile b/texlive.profile new file mode 100644 index 0000000..1860901 --- /dev/null +++ b/texlive.profile @@ -0,0 +1,30 @@ +# texlive.profile written on Wed May 9 14:04:26 2018 UTC +# It will NOT be updated and reflects only the +# installation profile at installation time. +selected_scheme scheme-infraonly +TEXDIR /opt/texlive/2018 +TEXMFCONFIG ~/.local/share/texlive/2018/texmf-config +TEXMFHOME ~/.local/share/texlive/2018/texmf +TEXMFLOCAL /opt/texlive/texmf-local +TEXMFSYSCONFIG /opt/texlive/2018/texmf-config +TEXMFSYSVAR /opt/texlive/2018/texmf-var +TEXMFVAR ~/.local/share/texlive/2018/texmf-var +binary_x86_64-linux 1 +instopt_adjustpath 0 +instopt_adjustrepo 1 +instopt_letter 0 +instopt_portable 0 +instopt_write18_restricted 1 +tlpdbopt_autobackup 1 +tlpdbopt_backupdir tlpkg/backups +tlpdbopt_create_formats 1 +tlpdbopt_desktop_integration 1 +tlpdbopt_file_assocs 1 +tlpdbopt_generate_updmap 0 +tlpdbopt_install_docfiles 1 +tlpdbopt_install_srcfiles 1 +tlpdbopt_post_code 1 +tlpdbopt_sys_bin /usr/local/bin +tlpdbopt_sys_info /usr/local/share/info +tlpdbopt_sys_man /usr/local/share/man +tlpdbopt_w32_multi_user 1 -- 2.20.1