From b9cd958c8bbc799ca278428eec197f72a1b0053d Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Tue, 14 Jun 2016 16:44:22 +0100 Subject: [PATCH 01/16] Remove message caching for mutt It does not make a lot of sense to cache locally stored messages! --- offline_mail/.mutt/account.musoft | 1 - offline_mail/.mutt/account.personal | 1 - offline_mail/.mutt/account.personal-gmail | 1 - offline_mail/.mutt/account.student | 1 - 4 files changed, 4 deletions(-) diff --git a/offline_mail/.mutt/account.musoft b/offline_mail/.mutt/account.musoft index 6ba3af2..625f123 100644 --- a/offline_mail/.mutt/account.musoft +++ b/offline_mail/.mutt/account.musoft @@ -8,7 +8,6 @@ set trash = "" set record = "" set header_cache = ~/.mutt/musoft/cache/headers -set message_cachedir = ~/.mutt/musoft/cache/bodies set certificate_file = ~/.mutt/musoft/certificates set pgp_sign_as="0x2EA4B143" diff --git a/offline_mail/.mutt/account.personal b/offline_mail/.mutt/account.personal index c7f4485..9628e24 100644 --- a/offline_mail/.mutt/account.personal +++ b/offline_mail/.mutt/account.personal @@ -8,7 +8,6 @@ set trash = "+personal/Trash" set record = "+personal/Sent" set header_cache = ~/.mutt/personal/cache/headers -set message_cachedir = ~/.mutt/personal/cache/bodies set certificate_file = ~/.mutt/personal/certificates set pgp_sign_as="0x153CBB66" diff --git a/offline_mail/.mutt/account.personal-gmail b/offline_mail/.mutt/account.personal-gmail index 780d86c..fafa378 100644 --- a/offline_mail/.mutt/account.personal-gmail +++ b/offline_mail/.mutt/account.personal-gmail @@ -8,7 +8,6 @@ set trash = "" set record = "" set header_cache = ~/.mutt/personal-gmail/cache/headers -set message_cachedir = ~/.mutt/personal-gmail/cache/bodies set certificate_file = ~/.mutt/personal-gmail/certificates set pgp_sign_as="0x153CBB66" diff --git a/offline_mail/.mutt/account.student b/offline_mail/.mutt/account.student index cbadeaa..48c5aea 100644 --- a/offline_mail/.mutt/account.student +++ b/offline_mail/.mutt/account.student @@ -8,7 +8,6 @@ set trash = "+student/Trash" set record = "+student/Sent" set header_cache = ~/.mutt/student/cache/headers -set message_cachedir = ~/.mutt/student/cache/bodies set certificate_file = ~/.mutt/student/certificates set pgp_sign_as="0x33FA1EFF" -- 2.45.2 From 8cd8d91a7f2698b675d486a127481a20db58ce41 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Tue, 14 Jun 2016 16:46:41 +0100 Subject: [PATCH 02/16] use ~/.local/tmp as TMPDIR --- bash/.bash_profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/.bash_profile b/bash/.bash_profile index 9a5044b..c4958eb 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -27,4 +27,4 @@ fi export GPG_AGENT_INFO # the env file does not contain the export statement export SSH_AUTH_SOCK # enable gpg-agent for ssh -export USER_TMP="/home/max/.local/tmp" +export TMPDIR="/home/max/.local/tmp" -- 2.45.2 From 35e9c26e97bd9f61a59fcce7d6178fef37b78bd8 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Tue, 14 Jun 2016 18:47:19 +0100 Subject: [PATCH 03/16] Minor formatting changes in muttrc --- offline_mail/.mutt/muttrc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/offline_mail/.mutt/muttrc b/offline_mail/.mutt/muttrc index 701f867..b4e310c 100644 --- a/offline_mail/.mutt/muttrc +++ b/offline_mail/.mutt/muttrc @@ -29,16 +29,19 @@ macro index \cb "|urlview\n" macro pager \cb "|urlview\n" set text_flowed=yes +set reflow_text=yes set editor="vim +':set textwidth=72' +'set fo=aw'" # Encryption source ~/.mutt/gpg.rc # Speed up folder switch -set sleep_time = 0 +set sleep_time=0 # Mutt colors source ~/.mutt/colors.mutt -set sort = threads -set sort_aux = last-date-received +set sort=threads +set sort_aux=last-date-received + +set fast_reply=yes -- 2.45.2 From a665e14abfaa2081f3f6deef7568bc1e6885e4d9 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Fri, 24 Jun 2016 10:45:29 +0100 Subject: [PATCH 04/16] Reduce time between imap fetches --- offline_mail/.mutt/mutt_with_mbsync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offline_mail/.mutt/mutt_with_mbsync.sh b/offline_mail/.mutt/mutt_with_mbsync.sh index f9479f5..90921c1 100755 --- a/offline_mail/.mutt/mutt_with_mbsync.sh +++ b/offline_mail/.mutt/mutt_with_mbsync.sh @@ -29,7 +29,7 @@ sync_mailboxes_loop() do sync_mailboxes - sleep 250 + sleep 60 done } -- 2.45.2 From ccba59cd06d0018f2aedb04f13c17c9cca94a7ad Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Tue, 28 Jun 2016 16:21:22 +0100 Subject: [PATCH 05/16] Fix 'purple' color in bashrc bash prompt --- bash/.bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/.bashrc b/bash/.bashrc index dbf95c3..3cf998a 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -92,7 +92,7 @@ function __prompt_command() if [[ "$git_status" =~ nothing\ to\ commit ]]; then local Color_On=$GREEN elif [[ "$git_status" =~ nothing\ added\ to\ commit\ but\ untracked\ files\ present ]]; then - local Color_On=$PURPLE + local Color_On=$CYAN else local Color_On=$RED fi -- 2.45.2 From 37c0c591dbdcc61e0e549838bfb0b8422344ef10 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Tue, 28 Jun 2016 16:40:55 +0100 Subject: [PATCH 06/16] Better line breaking behaviour in latex. --- vim/.vim/ftplugin/tex.vim | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 vim/.vim/ftplugin/tex.vim diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim new file mode 100644 index 0000000..9e60f19 --- /dev/null +++ b/vim/.vim/ftplugin/tex.vim @@ -0,0 +1,2 @@ +setlocal formatoptions=aw +setlocal textwidth=80 -- 2.45.2 From 6064692c3e68554e4aa791befac2bf8b496e4aee Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Mon, 4 Jul 2016 16:01:30 +0100 Subject: [PATCH 07/16] Change the way gpg agent is called --- bash/.bash_profile | 12 +++--------- bash/.bashrc | 11 +++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/bash/.bash_profile b/bash/.bash_profile index c4958eb..c80cb2d 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -18,13 +18,7 @@ if [ -f /etc/bash_completion ]; then . /etc/bash_completion fi -envfile="$HOME/.gnupg/gpg-agent.env" -if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then - eval "$(cat "$envfile")" -else - eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")" -fi -export GPG_AGENT_INFO # the env file does not contain the export statement -export SSH_AUTH_SOCK # enable gpg-agent for ssh - export TMPDIR="/home/max/.local/tmp" + +gpg-agent --daemon --enable-ssh-support \ + --write-env-file "${HOME}/.gpg-agent-info" diff --git a/bash/.bashrc b/bash/.bashrc index 3cf998a..9413671 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -112,3 +112,14 @@ function __prompt_command() PS1+="\$ " } PROMPT_COMMAND=__prompt_command + + +if [ -f "${HOME}/.gpg-agent-info" ]; then + . "${HOME}/.gpg-agent-info" + export GPG_AGENT_INFO + export SSH_AUTH_SOCK +fi + + +# Set GPG TTY +export GPG_TTY=$(tty) -- 2.45.2 From 1639aeb9b2bbc063e3a80949e770aea8786ce1d7 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Mon, 4 Jul 2016 16:01:46 +0100 Subject: [PATCH 08/16] Alias tmux forces tmux to run correctly in 256color mode --- bash/.bash_aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/bash/.bash_aliases b/bash/.bash_aliases index 9c3be03..36e02d4 100644 --- a/bash/.bash_aliases +++ b/bash/.bash_aliases @@ -10,3 +10,4 @@ if [ -x /usr/bin/dircolors ]; then fi alias la='ls -lah' +alias tmux='TERM=xterm-256color tmux' -- 2.45.2 From f44c6b83383cd22f50fddadca3a4b0effaa12ed0 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Mon, 4 Jul 2016 16:03:06 +0100 Subject: [PATCH 09/16] Simple tmux config Contains color scheme, rebinding prefix to C-a and other small tweaks. --- tmux/.tmux.conf | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 tmux/.tmux.conf diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf new file mode 100644 index 0000000..97849fe --- /dev/null +++ b/tmux/.tmux.conf @@ -0,0 +1,42 @@ +set -g history-limit 10000 + +set -g utf8 on +set-window-option -g utf8 on + +set -g default-command /bin/bash + +unbind C-b +set -g prefix C-a +bind C-a send-prefix + +# COLOUR (based on Solarized dark) + +# default statusbar colors +set-option -g status-bg black #base02 +set-option -g status-fg yellow #yellow +set-option -g status-attr default + +# default window title colors +set-window-option -g window-status-fg brightblue #base0 +set-window-option -g window-status-bg default +#set-window-option -g window-status-attr dim + +# active window title colors +set-window-option -g window-status-current-fg brightred #orange +set-window-option -g window-status-current-bg default +#set-window-option -g window-status-current-attr bright + +# pane border +set-option -g pane-border-fg black #base02 +set-option -g pane-active-border-fg brightgreen #base01 + +# message text +set-option -g message-bg black #base02 +set-option -g message-fg brightred #orange + +# pane number display +set-option -g display-panes-active-colour blue #blue +set-option -g display-panes-colour brightred #orange + +# clock +set-window-option -g clock-mode-colour green #green -- 2.45.2 From 282200e897a2ceaa8854c82af5073762520c8ccd Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Sun, 17 Jul 2016 21:40:41 +0100 Subject: [PATCH 10/16] Add folders for mailing lists --- offline_mail/.mbsync/personal.mbsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offline_mail/.mbsync/personal.mbsync b/offline_mail/.mbsync/personal.mbsync index 4a64d76..db94ab3 100644 --- a/offline_mail/.mbsync/personal.mbsync +++ b/offline_mail/.mbsync/personal.mbsync @@ -15,6 +15,6 @@ Inbox ~/mail/personal/Inbox Channel personal Master :personal-remote: Slave :personal-local: -Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" +Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "Sec-Announce" "Support-blfs" "Dev-blfs" Create Both SyncState * -- 2.45.2 From 34968443f7f8bcad32ece63149981c2cb2e6c80f Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 14 Sep 2016 10:49:46 +0100 Subject: [PATCH 11/16] Try to recover most of existing dotfiles --- offline_mail/.mutt/mutt_with_mbsync.sh | 4 +-- tmux/.tmux.conf | 34 -------------------------- vim/.vimrc | 6 ++--- 3 files changed, 5 insertions(+), 39 deletions(-) diff --git a/offline_mail/.mutt/mutt_with_mbsync.sh b/offline_mail/.mutt/mutt_with_mbsync.sh index 90921c1..6741220 100755 --- a/offline_mail/.mutt/mutt_with_mbsync.sh +++ b/offline_mail/.mutt/mutt_with_mbsync.sh @@ -1,6 +1,6 @@ #!/bin/bash -PID="/var/run/user/1000/sync_mailboxes.pid" +PID="/home/max/.local/var/run/sync_mailboxes.pid" LOG="/home/max/.local/var/log/mutt_mbsync.log" touch $LOG @@ -35,6 +35,6 @@ sync_mailboxes_loop() sync_mailboxes_loop& >> $LOG 2>&1 echo $! > $PID -/usr/local/bin/mutt +/usr/bin/mutt clean_up diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 97849fe..a2103d5 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,42 +1,8 @@ set -g history-limit 10000 -set -g utf8 on -set-window-option -g utf8 on set -g default-command /bin/bash unbind C-b set -g prefix C-a bind C-a send-prefix - -# COLOUR (based on Solarized dark) - -# default statusbar colors -set-option -g status-bg black #base02 -set-option -g status-fg yellow #yellow -set-option -g status-attr default - -# default window title colors -set-window-option -g window-status-fg brightblue #base0 -set-window-option -g window-status-bg default -#set-window-option -g window-status-attr dim - -# active window title colors -set-window-option -g window-status-current-fg brightred #orange -set-window-option -g window-status-current-bg default -#set-window-option -g window-status-current-attr bright - -# pane border -set-option -g pane-border-fg black #base02 -set-option -g pane-active-border-fg brightgreen #base01 - -# message text -set-option -g message-bg black #base02 -set-option -g message-fg brightred #orange - -# pane number display -set-option -g display-panes-active-colour blue #blue -set-option -g display-panes-colour brightred #orange - -# clock -set-window-option -g clock-mode-colour green #green diff --git a/vim/.vimrc b/vim/.vimrc index a311a07..c346456 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -29,7 +29,7 @@ Plugin 'ajh17/VimCompletesMe' Plugin 'hynek/vim-python-pep8-indent' Plugin 'vim-scripts/octave.vim--' Plugin 'vim-scripts/MatlabFilesEdition' -Plugin 'altercation/vim-colors-solarized' +Plugin 'flazz/vim-colorschemes' " All of your Plugins must be added before the following line call vundle#end() " required @@ -38,12 +38,11 @@ filetype plugin indent on " required " Random look and feel stuff syntax on set background=dark -colorscheme solarized +colorscheme molokai set expandtab set shiftwidth=2 set softtabstop=2 set number -set t_Co=16 let g:html_indent_inctags = "html,body,head,tbody" let g:indentLine_color_term = 200 @@ -84,6 +83,7 @@ let g:EditorConfig_exclude_patterns = ['fugitive://.*'] " latex-box let g:LatexBox_quickfix = 4 +let g:LatexBox_viewer = "mupdf" " clang fix let g:clang_user_options='|| exit0' -- 2.45.2 From 21e9b2bece375bf290bd6564b65a6fa47a9e4b97 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 14 Sep 2016 11:05:18 +0100 Subject: [PATCH 12/16] 256 colors in tmux --- tmux/.tmux.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index a2103d5..5d8a0c0 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -6,3 +6,5 @@ set -g default-command /bin/bash unbind C-b set -g prefix C-a bind C-a send-prefix + +set -g default-terminal "screen-256color" -- 2.45.2 From ffc71e23f350bb78be47b2ba2f05fb58ced42211 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 14 Sep 2016 11:10:44 +0100 Subject: [PATCH 13/16] Better formatting in latex --- vim/.vim/ftplugin/tex.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim index 9e60f19..5e17e68 100644 --- a/vim/.vim/ftplugin/tex.vim +++ b/vim/.vim/ftplugin/tex.vim @@ -1,2 +1,2 @@ -setlocal formatoptions=aw +setlocal formatoptions=wt setlocal textwidth=80 -- 2.45.2 From c3518062aa80849b7c954b2b06c52eb73cf432e1 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Tue, 20 Sep 2016 22:10:03 +0100 Subject: [PATCH 14/16] Use flourine X config files --- X/.Xresources | 94 +++++++++++++++++++++++---------------------------- X/.xinitrc | 3 +- 2 files changed, 44 insertions(+), 53 deletions(-) diff --git a/X/.Xresources b/X/.Xresources index 98a6939..7ebee6a 100644 --- a/X/.Xresources +++ b/X/.Xresources @@ -1,51 +1,43 @@ -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - -#define S_base03 #00161b -#define S_base02 #04222a -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 - -*background: S_base03 -*foreground: S_base0 -*fading: 40 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground: S_base01 -*pointerColorForeground: S_base1 - -*color0: S_base02 -*color1: S_red -*color2: S_green -*color3: S_yellow -*color4: S_blue -*color5: S_magenta -*color6: S_cyan -*color7: S_base2 -*color9: S_orange -*color8: S_base03 -*color10: S_base01 -*color11: S_base00 -*color12: S_base0 -*color13: S_violet -*color14: S_base1 -*color15: S_base3 - -xterm*termName: xterm-color -XTerm*locale: true -XTerm*metaSendsEscape: true -xterm*faceName: Liberation Mono -xterm*faceSize: 13 - -Rxvt*scrollBar: false -Xcursor.size: 30 +! special +*.foreground: #f8f8f3 +*.background: #272822 +*.cursorColor: #f8f8f3 + +! black +*.color0: #000000 +*.color8: #555555 + +! red +*.color1: #f92672 +*.color9: #dd4278 + +! green +*.color2: #74e22e +*.color10: #9dc54b + +! yellow +*.color3: #e6db74 +*.color11: #d1ca89 + +! blue +*.color4: #66d9ef +*.color12: #7accda + +! magenta +*.color5: #ae81ff +*.color13: #b392ef + +! cyan +*.color6: #00d9d9 +*.color14: #c8f0f0 + +! white +*.color7: #f5deb3 +*.color15: #ffffff + + +*faceName: Inconsolata +*faceSize: 14 + + +XTerm*termName: xterm-256color diff --git a/X/.xinitrc b/X/.xinitrc index a0f6e2a..1a86c7f 100644 --- a/X/.xinitrc +++ b/X/.xinitrc @@ -16,9 +16,8 @@ fi # Load .Xresources xrdb -merge ~/.Xresources &> /dev/null +setxkbmap gb -# Set caps lock as control to avoid emacs pinky -setxkbmap -option ctrl:nocaps # Set java font option export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on" -- 2.45.2 From 5a003b059551bd3d7527916ecbf25b126161db4f Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 21 Sep 2016 11:54:19 +0100 Subject: [PATCH 15/16] Add aber email, remove student and musoft. --- offline_mail/.mail_pass/aber.gpg | Bin 0 -> 357 bytes offline_mail/.mail_pass/musoft.gpg | Bin 382 -> 0 bytes offline_mail/.mail_pass/student.gpg | Bin 365 -> 0 bytes offline_mail/.mbsync/aber.mbsync | 20 ++++++++++ offline_mail/.mbsync/musoft.mbsync | 49 ------------------------- offline_mail/.mbsync/student.mbsync | 20 ---------- offline_mail/.mutt/account.aber | 11 ++++++ offline_mail/.mutt/account.musoft | 13 ------- offline_mail/.mutt/account.student | 13 ------- offline_mail/.mutt/mutt_with_mbsync.sh | 3 +- offline_mail/.mutt/muttrc | 6 +-- 11 files changed, 34 insertions(+), 101 deletions(-) create mode 100644 offline_mail/.mail_pass/aber.gpg delete mode 100644 offline_mail/.mail_pass/musoft.gpg delete mode 100644 offline_mail/.mail_pass/student.gpg create mode 100644 offline_mail/.mbsync/aber.mbsync delete mode 100644 offline_mail/.mbsync/musoft.mbsync delete mode 100644 offline_mail/.mbsync/student.mbsync create mode 100644 offline_mail/.mutt/account.aber delete mode 100644 offline_mail/.mutt/account.musoft delete mode 100644 offline_mail/.mutt/account.student diff --git a/offline_mail/.mail_pass/aber.gpg b/offline_mail/.mail_pass/aber.gpg new file mode 100644 index 0000000000000000000000000000000000000000..bb1fb4f35515c8412cfe8a4ee7431e40ec7c569a GIT binary patch literal 357 zcmV-r0h<1W0Sp7T%)}e0opU4s2mr61t?pfI5lbN>TPzXBY!{RO5&B-qTxPQRxH%LN z(JVoJsd?$J@WBdCbKJ033~GbW<8NM@Mqb6=#Q$LqiAn6F=j9EDH_=~$n^P2a#)@c!R`|J_<}<7UYzBvl1lzKLW(eeEs;Rxm|w4&Ab^-LUsXF& zT%b09dc!7V444NEL=IyzvmPS}UFx9`HYtxT*lZq3?PBqbZB%QR)imjnk z_ar?;as*J5f7E=hBzvQ~E2d%OZ!K{f@OQ@3qAp^-;C-!><4QjxG`Ej00f1+i_}zrZ D2Va`~e4R|cEq z4+0~lW_{sCYAsYIYLFVxU!XI8@9%aPf}JR10mKCTUJfiM%jBxAC%xdB(EYgwd&r9i$=(PZ+xr^@1n$3H=~8>M*;be$K0ck9u!(4&clyJ>;n%DhD@8 z_nxDr{t-@qc=NMzxUNi{31lyre22a7SN+&HHB<(S7YGz&Nw&Fe2)@BO7)#J6{vIS-bAZqb|f-f>x zyN4*08~-Tfvj8sgLnL-xf%Q(2nAPo{L|;AE>L2a@o}^SotQfBhL3^MNVZ*;o(WAmG z@)AS%w)2I)$4kz<$V-dcfNI}~&C@$5uJ75~@~omts8R@K`o8=EW+K)+{ci!)(ayug zDf{3CjB)H|ZbnN)CjrOL1>VwJ0n*F(M4>LZtCIm#aA%I84v@WU7Yq{Sjl?5|e`->t zV=wVxl1o-fAb`8(nN-iYpD3$)6sRCV5tA-Ctd7#};S2hnU0Km!)ETZhCL>-GK+3z4 L$DCA?b%*bP#HYB( diff --git a/offline_mail/.mbsync/aber.mbsync b/offline_mail/.mbsync/aber.mbsync new file mode 100644 index 0000000..58c4c97 --- /dev/null +++ b/offline_mail/.mbsync/aber.mbsync @@ -0,0 +1,20 @@ +IMAPAccount aber +Host outlook.office365.com +User maf54@aber.ac.uk +PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/aber.gpg" +UseIMAPS yes +CertificateFile /etc/ssl/certs/ca-certificates.crt + +IMAPStore aber-remote +Account aber + +MaildirStore aber-local +Path ~/mail/aber/ +Inbox ~/mail/aber/Inbox + +Channel aber +Master :aber-remote: +Slave :aber-local: +Patterns "INBOX" "Drafts" "Sent" "Trash" "Junk E-Mail" +Create Both +SyncState * diff --git a/offline_mail/.mbsync/musoft.mbsync b/offline_mail/.mbsync/musoft.mbsync deleted file mode 100644 index 41b3dc2..0000000 --- a/offline_mail/.mbsync/musoft.mbsync +++ /dev/null @@ -1,49 +0,0 @@ -IMAPAccount gmail -Host imap.gmail.com -User max@musoft.co.uk -PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/musoft.gpg" -UseIMAPS yes -CertificateFile /etc/ssl/certs/ca-certificates.crt - -IMAPStore gmail-remote -Account gmail - -MaildirStore gmail-local -Path ~/mail/musoft/ -Inbox ~/mail/musoft/Inbox - -Channel gmail-sent -Master :gmail-remote:"[Gmail]/Sent Mail" -Slave :gmail-local:Sent -SyncState * -Create Slave - -Channel gmail-all-mail -Master :gmail-remote:"[Gmail]/All Mail" -Slave :gmail-local:"All Mail" -SyncState * -Create Slave - -Channel gmail-all-drafts -Master :gmail-remote:"[Gmail]/Drafts" -Slave :gmail-local:"Drafts" -SyncState * -Create Slave - -Channel gmail-all-spam -Master :gmail-remote:"[Gmail]/Spam" -Slave :gmail-local:"Spam" -SyncState * -Create Slave - -Channel gmail-default -Master :gmail-remote: -Slave :gmail-local: -Patterns "INBOX" -SyncState * -Create Slave - -Group gmail -Channel gmail-default -Channel gmail-sent -Channel gmail-all-mail diff --git a/offline_mail/.mbsync/student.mbsync b/offline_mail/.mbsync/student.mbsync deleted file mode 100644 index f0afe9e..0000000 --- a/offline_mail/.mbsync/student.mbsync +++ /dev/null @@ -1,20 +0,0 @@ -IMAPAccount student -Host outlook.office365.com -User mf195@student.le.ac.uk -PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/student.gpg" -UseIMAPS yes -CertificateFile /etc/ssl/certs/ca-certificates.crt - -IMAPStore student-remote -Account student - -MaildirStore student-local -Path ~/mail/student/ -Inbox ~/mail/student/Inbox - -Channel student -Master :student-remote: -Slave :student-local: -Patterns "INBOX" "Drafts" "Sent" "Trash" "Junk E-Mail" -Create Both -SyncState * diff --git a/offline_mail/.mutt/account.aber b/offline_mail/.mutt/account.aber new file mode 100644 index 0000000..a7e2761 --- /dev/null +++ b/offline_mail/.mutt/account.aber @@ -0,0 +1,11 @@ +set from = "maf54@aber.ac.uk" +set realname = "Maximilian Friedersdorff" +set sendmail = "/usr/bin/msmtp --account=aber" + +set spoolfile = "+aber/Inbox" +set postponed = "+aber/Drafts" +set trash = "+aber/Trash" +set record = "+aber/Sent" + +set header_cache = ~/.mutt/aber/cache/headers +set certificate_file = ~/.mutt/aber/certificates diff --git a/offline_mail/.mutt/account.musoft b/offline_mail/.mutt/account.musoft deleted file mode 100644 index 625f123..0000000 --- a/offline_mail/.mutt/account.musoft +++ /dev/null @@ -1,13 +0,0 @@ -set from = "max@musoft.co.uk" -set realname = "Maximilian Friedersdorff" -set sendmail = "/usr/bin/msmtp --account=musoft" - -set spoolfile = "+musoft/INBOX" -set postponed = "+musoft/Drafts" -set trash = "" -set record = "" - -set header_cache = ~/.mutt/musoft/cache/headers -set certificate_file = ~/.mutt/musoft/certificates - -set pgp_sign_as="0x2EA4B143" diff --git a/offline_mail/.mutt/account.student b/offline_mail/.mutt/account.student deleted file mode 100644 index 48c5aea..0000000 --- a/offline_mail/.mutt/account.student +++ /dev/null @@ -1,13 +0,0 @@ -set from = "mf195@student.le.ac.uk" -set realname = "Maximilian Friedersdorff" -set sendmail = "/usr/bin/msmtp --account=student" - -set spoolfile = "+student/Inbox" -set postponed = "+student/Drafts" -set trash = "+student/Trash" -set record = "+student/Sent" - -set header_cache = ~/.mutt/student/cache/headers -set certificate_file = ~/.mutt/student/certificates - -set pgp_sign_as="0x33FA1EFF" diff --git a/offline_mail/.mutt/mutt_with_mbsync.sh b/offline_mail/.mutt/mutt_with_mbsync.sh index 6741220..83f7d54 100755 --- a/offline_mail/.mutt/mutt_with_mbsync.sh +++ b/offline_mail/.mutt/mutt_with_mbsync.sh @@ -19,8 +19,7 @@ sync_mailboxes() { /usr/bin/mbsync -c /home/max/.mbsync/personal.mbsync -a >> $LOG 2>&1 /usr/bin/mbsync -c /home/max/.mbsync/personal-gmail.mbsync -a >> $LOG 2>&1 - /usr/bin/mbsync -c /home/max/.mbsync/student.mbsync -a >> $LOG 2>&1 - /usr/bin/mbsync -c /home/max/.mbsync/musoft.mbsync -a >> $LOG 2>&1 + /usr/bin/mbsync -c /home/max/.mbsync/aber.mbsync -a >> $LOG 2>&1 } sync_mailboxes_loop() diff --git a/offline_mail/.mutt/muttrc b/offline_mail/.mutt/muttrc index b4e310c..651e8c4 100644 --- a/offline_mail/.mutt/muttrc +++ b/offline_mail/.mutt/muttrc @@ -2,13 +2,11 @@ set folder = ~/mail folder-hook personal/* source ~/.mutt/account.personal folder-hook personal-gmail/* source ~/.mutt/account.personal-gmail -folder-hook student/* source ~/.mutt/account.student -folder-hook musoft/* source ~/.mutt/account.musoft +folder-hook aber/* source ~/.mutt/account.aber macro index \e1 '~/mail/personal/Inbox' macro index \e2 '~/mail/personal-gmail/Inbox' -macro index \e3 '~/mail/student/Inbox' -macro index \e4 '~/mail/musoft/Inbox' +macro index \e3 '~/mail/aber/Inbox' source ~/.mutt/account.personal -- 2.45.2 From 84050688b1de80953cc421544947b068af3a2f1f Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Fri, 23 Sep 2016 09:53:49 +0100 Subject: [PATCH 16/16] Some color borders+other things --- ratpoison/.ratpoisonrc | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ratpoison/.ratpoisonrc diff --git a/ratpoison/.ratpoisonrc b/ratpoison/.ratpoisonrc new file mode 100644 index 0000000..03d8393 --- /dev/null +++ b/ratpoison/.ratpoisonrc @@ -0,0 +1,11 @@ +# Set the colors for ratpoison text! +set bgcolor red +set fwcolor red + + +bind f exec firefox --remote "openurl(`$RATPOISON -c getsel`,new-tab)" + +bind t time + +bind l ratclick 1 +bind v ratclick 2 -- 2.45.2