From: Maximilian Friedersdorff Date: Tue, 15 Nov 2016 19:21:43 +0000 (+0000) Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=294d1ee3bc8dd0a60128109e34a9d184944af651;hp=b804fc668509478a1e8d4604f444896e4aeb56f3;p=max%2Fdotfiles.git Merge branch 'master' of git.friedersdorff.com:max/dotfiles --- diff --git a/X/.xinitrc b/X/.xinitrc index a031825..17e58e9 100644 --- a/X/.xinitrc +++ b/X/.xinitrc @@ -21,12 +21,18 @@ fi # Set keyboard layout case $HOSTNAME in - palladium|beryllium) + palladium) setxkbmap -variant colemak gb xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L" xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R" xmodmap -e "add Control = Control_L Control_R" ;; + beryllium) + setxkbmap -variant colemak us + xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L" + xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R" + xmodmap -e "add Control = Control_L Control_R" + ;; *) esac @@ -44,6 +50,8 @@ export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on" feh --bg-scale ~/Pictures/background.jpg& +twmnd& + xset -b exec /usr/bin/ratpoison diff --git a/bash/.bash_aliases b/bash/.bash_aliases index 36e02d4..0bab62d 100644 --- a/bash/.bash_aliases +++ b/bash/.bash_aliases @@ -1,3 +1,5 @@ +#!/bin/bash + if [ -x /usr/bin/dircolors ]; then test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" alias ls='ls --color=auto' @@ -9,5 +11,13 @@ if [ -x /usr/bin/dircolors ]; then alias egrep='egrep --color=auto' fi -alias la='ls -lah' +function la { + ls_out=$(\ls -lah --color=always "$@") + let "allowed_lines = $(tput lines) - 3" + if [ $(echo "$ls_out" | wc -l) -le $allowed_lines ]; then + echo "$ls_out" + else + echo "$ls_out" | less -r + fi +} alias tmux='TERM=xterm-256color tmux' diff --git a/bash/.bash_profile b/bash/.bash_profile index c408f2d..d1982c4 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -14,6 +14,3 @@ if [ -f /etc/bash_completion ]; then fi 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 a90c177..8d4422e 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -123,13 +123,17 @@ function __prompt_command() } PROMPT_COMMAND=__prompt_command - -if [ -f "${HOME}/.gpg-agent-info" ]; then - . "${HOME}/.gpg-agent-info" - export GPG_AGENT_INFO - export SSH_AUTH_SOCK +if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then + gpg-connect-agent /bye >/dev/null 2>&1 fi - -# Set GPG TTY +export GPG_AGENT_INFO="${GNUPGHOME:-${HOME}/.gnupg}/S.gpg-agent:-1:1" export GPG_TTY=$(tty) + +# Use gpg-agent for SSH +unset SSH_AGENT_PID +if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" +fi + +gpg-connect-agent udatestartuptty /bye >/dev/null diff --git a/emacs/.emacs b/emacs/.emacs index f0348c8..9628a42 100644 --- a/emacs/.emacs +++ b/emacs/.emacs @@ -22,7 +22,7 @@ ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3"))) '(package-selected-packages (quote - (yaml-mode minimap js2-mode editorconfig wanderlust evil-magit evil-leader evil-org molokai-theme org-evil flycheck-mypy jinja2 jinja2-mode highlight-indent-guides projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil))) + (mu4e-alert yaml-mode minimap js2-mode editorconfig wanderlust evil-magit evil-leader evil-org molokai-theme org-evil flycheck-mypy jinja2 jinja2-mode highlight-indent-guides projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil))) '(pdf-view-midnight-colors (quote ("#DCDCCC" . "#383838"))) '(vc-annotate-background "#2B2B2B") '(vc-annotate-color-map @@ -140,10 +140,13 @@ "/usr/bin/mbsync -c /home/max/.mbsync/personal-gmail.mbsync -a &&" "/usr/bin/mbsync -c /home/max/.mbsync/aber.mbsync -a") mu4e-update-interval 60) + ; Force mu4e to rename file on moving + (setq mu4e-change-filenames-when-moving t) (setq message-send-mail-function 'smtpmail-send-it smtpmail-default-smtp-server "mail.friedersdorff.com" smtpmail-auth-credentials (expand-file-name "~/.authinfo.gpg")) + (setq mu4e-drafts-folder "/Drafts") (setq mu4e-contexts `( , (make-mu4e-context :name "Personal" @@ -156,7 +159,6 @@ :vars '((user-mail-address . "max@friedersdorff.com") (user-full-name . "Maximilian Friedersdorff") (mu4e-sent-folder . "/personal/Sent") - (mu4e-drafts-folder . "/personal/Drafts") (mu4e-trash-folder . "/personal/Trash") (smtpmail-smtp-server . "mail.friedersdorff.com") (smtpmail-smtp-service . 587))), @@ -172,7 +174,6 @@ (user-full-name . "Maximilian Friedersdorff") (mu4e-sent-folder . "/personal-gmail/Sent") (mu4e-sent-messages-behaviour . 'delete) - (mu4e-drafts-folder . "/personal-gmail/Drafts") (smtpmail-smtp-server . "smtp.gmail.com") (smtpmail-smtp-service . 587))), (make-mu4e-context @@ -182,17 +183,43 @@ (when msg (mu4e-message-contact-field-matches msg (list :to :cc :bcc) - "maf54\\+?.*@aber.ac.uk"))) + ".*@aber.ac.uk"))) :vars '((user-mail-address . "maf54@aber.ac.uk") (user-full-name . "Maximilian Friedersdorff") (mu4e-sent-folder . "/aber/Sent") - (mu4e-drafts-folder . "/aber/Drafts") (mu4e-trash-folder . "/aber/Trash") (smtpmail-smtp-server . "smtp.office365.com") (smtpmail-smtp-service . 587)))) mu4e-context-policy 'pick-first) - (setq mu4e-html2text-command "lynx -stdin -dump -force_html")) + (setq mu4e-html2text-command "lynx -stdin -dump -force_html") + (add-to-list 'mu4e-bookmarks + '((concatenate + 'string + "flag:unread " + "AND ( " + "maildir:/personal/Inbox OR " + "maildir:/personal/slackware OR " + "maildir:/personal-gmail/Inbox OR " + "maildir:/aber/Inbox " + ")") "Unread Interesting Messages" ?i) + )) + +(use-package mu4e-alert + :ensure t + :config + (setq mu4e-alert-interesting-mail-query + (concatenate + 'string + "flag:unread " + "AND ( " + "maildir:/personal/Inbox OR " + "maildir:/personal/slackware OR " + "maildir:/personal-gmail/Inbox OR " + "maildir:/aber/Inbox " + ")")) + (mu4e-alert-set-default-style 'notifications) + (add-hook 'after-init-hook #'mu4e-alert-enable-notifications)) ;;;(global-company-mode) diff --git a/offline_mail/.mbsync/aber.mbsync b/offline_mail/.mbsync/aber.mbsync index 5c62c22..1a996d5 100644 --- a/offline_mail/.mbsync/aber.mbsync +++ b/offline_mail/.mbsync/aber.mbsync @@ -15,6 +15,6 @@ Inbox ~/mail/aber/Inbox Channel aber Master :aber-remote: Slave :aber-local: -Patterns "INBOX" "Drafts" "Sent" "Trash" "Junk E-Mail" +Patterns "INBOX" "Sent" "Trash" "Junk E-Mail" Create Both SyncState * diff --git a/offline_mail/.mbsync/personal-gmail.mbsync b/offline_mail/.mbsync/personal-gmail.mbsync index abc355e..7f47f38 100644 --- a/offline_mail/.mbsync/personal-gmail.mbsync +++ b/offline_mail/.mbsync/personal-gmail.mbsync @@ -24,12 +24,6 @@ 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" @@ -47,3 +41,4 @@ Group gmail Channel gmail-default Channel gmail-sent Channel gmail-all-mail +Channel gmail-all-spam diff --git a/offline_mail/.mbsync/personal.mbsync b/offline_mail/.mbsync/personal.mbsync index e2e6472..45a3103 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" "slackware" "quicknote" "todo" +Patterns "INBOX" "Sent" "Spam" "Trash" "slackware" "quicknote" "todo" Create Both SyncState * diff --git a/vimperator/.vimperatorrc b/vimperator/.vimperatorrc index 5d02f6f..8befa56 100644 --- a/vimperator/.vimperatorrc +++ b/vimperator/.vimperatorrc @@ -1,7 +1,12 @@ "3.14.0 (created: 2016/06/07 23:58:16) set defsearch=duckduckgo +set gui=noaddons,nobookmarks,nomenu,nonavigation,tabs + js services.services.autoCompleteSearch.class_="@mozilla.org/autocomplete/search;1?name=unifiedcomplete" + +nnoremap k 3k +nnoremap j 3j source! /home/max/.vimperatorrc.local -" vim: set ft=vimperator: +"vim: set ft=vimperator: