commit c6616584ad099d1c5b8780e92fb2c4e965865913 parent 30f868a8a78b8b0ba3f6f20c0dce79bee3126560 Author: Ashymad <czilukim@o2.pl> Date: Sun, 18 Nov 2018 21:20:16 +0100 Merge remote-tracking branch 'origin/master' into notwobug Diffstat:
22 files changed, 123 insertions(+), 146 deletions(-)
diff --git a/.gitmodules b/.gitmodules @@ -1,3 +1,6 @@ [submodule ".juliamodules"] path = julia/.juliamodules url = git@github.com:Ashymad/JuliaModules +[submodule "astroid/.config/astroid/kpxcnm"] + path = astroid/.config/astroid/kpxcnm + url = git@github.com:Ashymad/kpxcnm diff --git a/astroid/.config/astroid/config b/astroid/.config/astroid/config @@ -112,15 +112,15 @@ "accounts": { "o2": { "name": "Szymon Mikulicz", - "email": "czilukim@o2.pl", + "email": "szymon.mikulicz@posteo.net", "gpgkey": "", "always_gpg_sign": "false", "sendmail": "msmtp -i -t", "default": "true", "save_sent": "true", - "save_sent_to": "\/home\/shyman\/.mail\/o2\/Sent\/cur\/", - "additional_sent_tags": "o2", - "save_drafts_to": "\/home\/shyman\/.mail\/o2\/Drafts\/cur\/", + "save_sent_to": "\/home\/shyman\/.mail\/posteo\/Sent\/cur\/", + "additional_sent_tags": "posteo", + "save_drafts_to": "\/home\/shyman\/.mail\/posteo\/Drafts\/cur\/", "signature_separate": "false", "signature_file": "", "signature_file_markdown": "", diff --git a/astroid/.config/astroid/get_pass.py b/astroid/.config/astroid/get_pass.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 + +from os import path +import configparser +import sys + +import kpxcnm +from nacl.public import PrivateKey + +config = configparser.ConfigParser() +config.read(path.expanduser("~/.config/astroid/keys.ini")); + +k = kpxcnm.Kpxcnm(PrivateKey(kpxcnm.Kpxcnm._from_b64_str(config['DEFAULT']['privkey'])), + config['DEFAULT']['dbid']) + +k.change_public_keys() +if k.test_associate(True): + print(k.get_logins(sys.argv[1])[0]['password']) diff --git a/astroid/.config/astroid/kpxcnm b/astroid/.config/astroid/kpxcnm @@ -0,0 +1 @@ +Subproject commit d4ed23b64be17f939fbfc802a94924ae39fbe992 diff --git a/astroid/.config/astroid/poll.sh b/astroid/.config/astroid/poll.sh @@ -1,37 +1,44 @@ #!/usr/bin/env bash -MAILDIR="/home/shyman/.mail" - -if ! nc -z 127.0.0.1 19455; then - keepassxc & - exit -else - case $(curl -sd '{"RequestType":"test-associate","TriggerUnlock":true}' http://127.0.0.1:19455 | wc -w) in - - 0) exit - ;; - *) - ;; - esac -fi - -notmuch search --output=files tag:deleted and tag:o2 and not folder:o2/Trash | xargs -I {} mv -f "{}" $MAILDIR/o2/Trash/cur/ -notmuch search --output=files tag:deleted and tag:freeos and not folder:freeos/Trash | xargs -I {} mv -f "{}" $MAILDIR/freeos/Trash/cur/ -notmuch search --output=files tag:deleted and tag:agh and not folder:agh/Trash | xargs -I {} mv -f "{}" $MAILDIR/agh/Trash/cur/ - -offlineimap +set -e + +export MAILDIR="/home/shyman/.mail" + +moveIt() +{ + s=${1##*/} + s=${s%%,*} + mv -f $1 $2/$s + true +} +export -f moveIt + +#notmuch search --output=files tag:deleted and tag:o2 and not folder:o2/Trash | xargs -I {} mv -f "{}" $MAILDIR/o2/Trash/cur/ +#notmuch search --output=files tag:deleted and tag:freeos and not folder:freeos/Trash | xargs -I {} mv -f "{}" $MAILDIR/freeos/Trash/cur/ +#notmuch search --output=files tag:deleted and tag:agh and not folder:agh/Trash | xargs -I {} mv -f "{}" $MAILDIR/agh/Trash/cur/ +notmuch search --output=files tag:deleted and tag:posteo and not folder:posteo/Trash | xargs -I{} bash -c 'moveIt "{}" $MAILDIR/posteo/Trash/new/' + +# +o2 tag:new and path:"o2/**" +#+freeos tag:new and path:"freeos/**" +# +agh tag:new and path:"agh/**" +# +deleted tag:new and folder:o2/Trash or folder:freeos/Trash or folder:agh/Trash +# +sent tag:new and folder:o2/Sent or folder:freeos/Sent or folder:"freeos/Sent Items" or folder:agh/Sent +# +spam tag:new and folder:o2/Spam or folder:freeos/Spam or folder:freeos/Junk or folder:agh/Spam +# +inbox tag:new and folder:o2/INBOX or folder:freeos/INBOX or folder:agh/INBOX +# +archive tag:new and folder:o2/INBOX.Archive or folder:freeos/Archive or folder:agh/Archives +# +draft tag:new and folder:o2/Drafts or folder:freeos/Drafts or folder:agh/Drafts + +mbsync posteo notmuch new notmuch tag --batch <<EOF - +o2 tag:new and path:"o2/**" - +freeos tag:new and path:"freeos/**" - +agh tag:new and path:"agh/**" - +deleted tag:new and folder:o2/Trash or folder:freeos/Trash or folder:agh/Trash - +sent tag:new and folder:o2/Sent or folder:freeos/Sent or folder:"freeos/Sent Items" or folder:agh/Sent - +spam tag:new and folder:o2/Spam or folder:freeos/Spam or folder:freeos/Junk or folder:agh/Spam - +inbox tag:new and folder:o2/INBOX or folder:freeos/INBOX or folder:agh/INBOX - +archive tag:new and folder:o2/INBOX.Archive or folder:freeos/Archive or folder:agh/Archives - +draft tag:new and folder:o2/Drafts or folder:freeos/Drafts or folder:agh/Drafts + +posteo tag:new and path:"posteo/**" + +deleted tag:new and folder:posteo/Trash + +sent tag:new and folder:posteo/Sent + +inbox tag:new and folder:posteo/Inbox + +draft tag:new and folder:posteo/Drafts + +note tag:new and folder:posteo/Notes + +migration tag:new and folder:"posteo/Migration_*" EOF notmuch tag -new tag:new diff --git a/fish/.config/fish/functions/7z.fish b/fish/.config/fish/functions/7z.fish diff --git a/fish/.config/fish/functions/aur-async.fish b/fish/.config/fish/functions/aur-async.fish diff --git a/fish/.config/fish/functions/aur-cleanup.fish b/fish/.config/fish/functions/aur-cleanup.fish diff --git a/fish/.config/fish/functions/aur-resync-devel.fish b/fish/.config/fish/functions/aur-resync-devel.fish diff --git a/fish/.config/fish/functions/aur-update-devel.fish b/fish/.config/fish/functions/aur-update-devel.fish diff --git a/fish/.config/fish/functions/aur-vcsync.fish b/fish/.config/fish/functions/aur-vcsync.fish diff --git a/fish/.config/fish/functions/aur.fish b/fish/.config/fish/functions/aur.fish @@ -1,4 +1,5 @@ -function aur --wraps aur +#!/usr/bin/env fish +function aur if test -f "$HOME/.config/fish/functions/aur-$argv[1].fish" eval "aur-$argv[1]" $argv[2..-1] else if test -f "/usr/share/aurutils/contrib/$argv[1]" diff --git a/fish/.config/fish/functions/fish_user_key_bindings.fish b/fish/.config/fish/functions/fish_user_key_bindings.fish diff --git a/fish/.config/fish/functions/reverse_search.fish b/fish/.config/fish/functions/reverse_search.fish diff --git a/i3/.i3/config b/i3/.i3/config @@ -141,6 +141,7 @@ client.urgent #383a3b #383a3b #ee0000 #383a3b for_window [instance="polybar"] gaps inner 0 for_window [instance="mpv"] pixel 0 for_window [instance="^r_x11$"] floating enable +for_window [instance="^octave\-gui$"] floating enable exec --no-startup-id /usr/lib/geoclue-2.0/demos/agent exec --no-startup-id redshift-gtk diff --git a/i3/.i3/toggle_touchpad.sh b/i3/.i3/toggle_touchpad.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +en=$(xinput list-props "$1" | grep 'Device Enabled' | tail -c-2) + +if [[ en -eq 0 ]]; then + xinput enable "$1" +else + xinput disable "$1" +fi diff --git a/isync/.mbsyncrc b/isync/.mbsyncrc @@ -1,102 +1,36 @@ -# Global configuration section -# Values here are used as defaults for any following Channel section that -# doesn't specify them. -Expunge None -Create Both - -MaildirStore local -Path ~/.mail/ -Trash Trash - - -IMAPStore work -Host work.host.com -User tehuser -Pass xxxxxxxx -# Fetch password from gnome-keyring: -#PassCmd "gnome-keyring-query get mail_pw" -# Fetch password from .netrc: -#PassCmd "sed -n -e 's,^machine work\\.host\\.com login tehuser password \\(.*\\),\\1,p' < $HOME/.netrc" -# Fetch password from a gpg-encrypted file: -#PassCmd "gpg --quiet --for-your-eyes-only --decrypt $HOME/imappassword.gpg" -# Fetch password from pwmd (http://pwmd.sourceforge.net/): -#PassCmd "echo -ne 'GET myIsp\\tpassword' | pwmc datafile" -# On Mac OS X, run "KeyChain Access" -- File->New Password Item. Fill out form using -# "Keychain Item Name" http://IMAPSERVER (note: the "http://" is a hack) -# "Account Name" USERNAME -# "Password" PASSWORD -#PassCmd "/usr/bin/security find-internet-password -w -a USERNAME -s IMAPSERVER ~/Library/Keychains/login.keychain" - -Channel work -Master :work: -Slave :local:work -Expunge Slave -Sync PullNew Push - - -IMAPStore personal -Host host.play.com -Port 6789 -RequireSSL no - -Channel personal -Master :personal: -Slave :local:personal -Expunge Both -MaxMessages 150 -MaxSize 200k - -IMAPStore remote -Tunnel "ssh -q host.remote.com /usr/sbin/imapd" - -Channel remote -Master :remote: -Slave :local:remote - - -Group boxes -Channels work personal remote - - -IMAPStore st1 -Host st1.domain.com -RequireCRAM yes -CertificateFile ~/.st1-certificate.crt - -IMAPStore st2 -Host imap.another-domain.com -Path non-standard/ -RequireSSL no -UseTLSv1 no - -Channel rst -Master :st1:somebox -Slave :st2: - - -IMAPAccount server -Host imaps:foo.bar.com -CertificateFile ~/.server-certificate.crt - -IMAPStore server -Account server -MapInbox inbox -Trash ~/trash -TrashRemoteNew yes - -MaildirStore mirror -Path ~/Maildir/ -SubFolders Verbatim - -Channel o2o -Master :server: -Slave :mirror: -Patterns % - -Group partial o2o:inbox,sent-mail,foobar - -# INBOX => server, INBOX.foo => server.foo, etc. -Channel inbox -Master :server:INBOX -Slave :mirror:server +IMAPAccount posteo +# Address to connect to +Host posteo.de +User szymon.mikulicz@posteo.net +PassCmd "~/.config/astroid/get_pass.py \"https://posteo.de\"" +# Pass *************** +# To store the password in an encrypted file use PassCmd instead of Pass +# PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.mailpass.gpg" +# +# Use SSL +SSLType IMAPS +# The following line should work. If get certificate errors, uncomment the two following lines and read the "Troubleshooting" section. +CertificateFile /etc/ssl/certs/ca-certificates.crt +#CertificateFile ~/.cert/imap.gmail.com.pem +#CertificateFile ~/.cert/Equifax_Secure_CA.pem + +IMAPStore posteo-remote +Account posteo + +MaildirStore posteo-local +Subfolders Verbatim +# The trailing "/" is important +Path ~/.mail/posteo/ +Inbox ~/.mail/posteo/Inbox + +Channel posteo +Master :posteo-remote: +Slave :posteo-local: +# Exclude everything under the internal [Gmail] folder, except the interesting folders +# Patterns * ![Gmail]* "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail" +# Or include everything Patterns * +# Automatically create missing mailboxes, both locally and on the server +Create Both +# Save the synchronization state files in the relevant directory +SyncState * diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc @@ -7,12 +7,12 @@ tls_trust_file /etc/ssl/certs/ca-certificates.crt logfile ~/.msmtp.log # Gmail -account o2 -host poczta.o2.pl +account posteo +host posteo.de port 465 -from czilukim@o2.pl -user czilukim -passwordeval python2 -c "execfile('/home/shyman/.offlineimap.py'); print(get_password('https://poczta.o2.pl'))" +from szymon.mikulicz@posteo.net +user szymon.mikulicz@posteo.net +passwordeval "~/.config/astroid/get_pass.py "https://posteo.de"" # Set a default account -account default : o2 +account default : posteo diff --git a/notmuch/.notmuch-config b/notmuch/.notmuch-config @@ -30,7 +30,7 @@ path=/home/shyman/.mail # [user] name=Szymon Mikulicz -primary_email=czilukim@o2.pl +primary_email=szymon.mikulicz@posteo.de # Configuration for "notmuch new" # @@ -48,7 +48,7 @@ primary_email=czilukim@o2.pl # [new] tags=new; -ignore= +ignore=.mbsyncstate;.uidvalidity # Search configuration # diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim @@ -25,6 +25,9 @@ Plug 'JuliaEditorSupport/julia-vim' " LaTeX Plug 'lervag/vimtex' +" Rust +Plug 'rust-lang/rust.vim' + " R Plug 'jalvesaq/Nvim-R' diff --git a/offlineimap/.offlineimap.py b/offlineimap/.offlineimap.py @@ -7,7 +7,7 @@ def blockPrint(): def enablePrint(): sys.stdout = sys.__stdout__ -session = keepasshttp.start('oflima') +session = keepasshttp.start('ofm') def get_password( str ): blockPrint() diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config @@ -64,8 +64,8 @@ wm-restack = i3 ;scroll-up = bspwm-desknext ;scroll-down = bspwm-deskprev -binding modescroll-up = i3wm-wsnext -scroll-down = i3wm-wsprev +;scroll-up = i3wm-wsnext +;scroll-down = i3wm-wsprev [module/xwindow] type = internal/xwindow