From 6307325120f5405410deea2292336df1d6dde3cf Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Thu, 12 Feb 2015 10:03:52 +0100 Subject: [PATCH] Lots of updates SUDO_ASKPASS in bashrc muttrc cleaned and made more comprehensible offlineimaprc cleaned when coding c in vim some options made default updated i3config --- .bashrc | 9 ++++++++- .mutt/muttrc | 43 +++++++++++++++++++++++-------------------- .mutt/offlineimaprc | 1 - .vim/ftplugin/c.vim | 4 ++++ i3/config | 5 +++-- 5 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 .vim/ftplugin/c.vim diff --git a/.bashrc b/.bashrc index 2cdb213..4e24d39 100644 --- a/.bashrc +++ b/.bashrc @@ -12,7 +12,14 @@ export HISTFILESIZE=10000 export HISTSIZE=100000 export HISTCONTROL=ignoreboth -export PATH=$PATH:/usr/local/texlive/2014/bin/x86_64-linux +export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass + +export PATH=\ +$PATH:\ +/usr/local/texlive/2014/bin/x86_64-linux:\ +/opt/clean/bin:\ +/opt/MATLAB/2014b/bin + alias ls='ls --color=auto' alias grep='grep --color=auto' diff --git a/.mutt/muttrc b/.mutt/muttrc index d8c2c1f..4700963 100644 --- a/.mutt/muttrc +++ b/.mutt/muttrc @@ -1,9 +1,17 @@ +# Basic information set from="mart@martlubbers.net" set use_from="yes set envelope_from=yes +set mbox_type=Maildir +set folder=~/.mutt/mail +set spoolfile=+/INBOX/ +set record=+/Sent/ +set postponed=+/Drafts/ +set mask="!^\\.[^.]" +source ~/.mutt/mailboxes +# Receiving, sending and searching set sendmail="msmtp -C /home/mart/.mutt/msmtprc" - macro index,pager $ "offlineimap -c ~/.mutt/offlineimaprc &" "Force refresh" macro index \ "set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key\ @@ -12,6 +20,7 @@ macro index \ set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key" \ "notmuch: search mail" +# Clean up mailing lists macro index,pager \Ct "\ ~C vim@vim.org | ~C vim_use=vim\ ~C lists.debian.org=debian\ @@ -20,22 +29,15 @@ macro index,pager \Ct "\ ~C i3-discuss@i3.zekjur.net=i3\ " "Clean up mailing lists" -macro index,pager \cb "| urlview\n" - -set mbox_type=Maildir -set folder=~/.mutt/mail -set spoolfile=+/INBOX/ -set record=+/Sent/ -# set trash=+/Trash/ -set postponed=+/Drafts/ -set mask="!^\\.[^.]" +# Misc options set timeout=2 set mail_check=0 -source ~/.mutt/mailboxes -set mailcap_path=~/.mutt/mailcap -set mailcap_sanitize=yes -auto_view text/html +set include=yes +set delete=yes +set confirmappend=yes +set fast_reply=yes +# Display options unset wait_key unset markers set sort_browser=alpha @@ -45,7 +47,11 @@ set editor=vim set duplicate_threads=yes ignore headers * unignore headers from to subject date cc +set mailcap_path=~/.mutt/mailcap +set mailcap_sanitize=yes +auto_view text/html +# Pager options set pager_index_lines=20 set pager_context=3 set pager_stop @@ -53,14 +59,11 @@ set menu_scroll set tilde set quote_regexp="^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+" +# Aliases set alias_file=~/.mutt/alias source ~/.mutt/alias -set include=yes -set delete=yes -set confirmappend=yes -set fast_reply=yes - +# Colors color normal white default color attachment brightyellow default color hdrdefault cyan default @@ -83,6 +86,7 @@ color index blue default ~T color index red default ~D color index brightblue default ~F +# Crypto set pgp_decode_command="gpg %?p?--passphrase-fd 0? --no-verbose --batch --output - %f" set pgp_verify_command="gpg --no-verbose --batch --output - --verify %s %f" set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --batch --output - %f" @@ -101,5 +105,4 @@ set crypt_autosign set crypt_replysign set crypt_replysignencrypted=yes set crypt_verify_sig=yes - message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp" diff --git a/.mutt/offlineimaprc b/.mutt/offlineimaprc index 8b20e88..064829f 100644 --- a/.mutt/offlineimaprc +++ b/.mutt/offlineimaprc @@ -19,7 +19,6 @@ remotepasseval = mailpasswd() remotehost = mail.martlubbers.net remoteuser = mart@martlubbers.net ssl = yes -#cert_fingerprint = bb330825807b130ef600f6fcacb67196788b07b5 cert_fingerprint = d8f2613ee3017fe9eaec772cd07094342945f632 [mbnames] diff --git a/.vim/ftplugin/c.vim b/.vim/ftplugin/c.vim new file mode 100644 index 0000000..375e233 --- /dev/null +++ b/.vim/ftplugin/c.vim @@ -0,0 +1,4 @@ +set tabstop=8 +set softtabstop=8 +set shiftwidth=8 +set noexpandtab diff --git a/i3/config b/i3/config index b62ce5b..d735a1e 100644 --- a/i3/config +++ b/i3/config @@ -11,9 +11,10 @@ set $mod Mod4 -exec setxkbmap dvorak +exec setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt -option grp:menu_toggle exec xautolock -locker 'i3lock -c 000000' -exec convert -size 1600x900 gradient:grey15-black png:- | display -window root +exec convert -size 1600x900 plasma:fractal -colorspace Gray -modulate 20,100,10 png:- | display -window root +exec /home/mart/projects/netctltray/netctl-tray.py bindsym XF86AudioLowerVolume exec amixer set Master 5- bindsym XF86AudioRaiseVolume exec amixer set Master 5+ -- 2.20.1