merge cleanup
This commit is contained in:
commit
29d6433dc0
SSH key fingerprint:
SHA256:6jDSUhitcXG0Nrh/g8Gy8ZJdsZ5LzPJlaGmGKUGfP5k
14 changed files with 1050 additions and 434 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -1,5 +1,10 @@
|
|||
.AppleDouble
|
||||
.netrwhist
|
||||
vim/.vim/plugged
|
||||
vim/.vim/autoload
|
||||
zsh/.zsh/cache
|
||||
<<<<<<< HEAD
|
||||
.DS_Store
|
||||
=======
|
||||
gnupg
|
||||
>>>>>>> origin/main
|
||||
|
|
|
|||
288
bash/#.bashrc#
Normal file
288
bash/#.bashrc#
Normal file
|
|
@ -0,0 +1,288 @@
|
|||
### Andrew's .bashrc
|
||||
|
||||
|
||||
|
||||
# _ _
|
||||
# ___ _ ____ _(_)_ __ ___ _ __ _ __ ___ ___ _ __ | |_
|
||||
# / _ \ '_ \ \ / / | '__/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __|
|
||||
# | __/ | | \ V /| | | | (_) | | | | | | | | | __/ | | | |_
|
||||
# \___|_| |_|\_/ |_|_| \___/|_| |_|_| |_| |_|\___|_| |_|\__|
|
||||
|
||||
|
||||
# Set some defaults.
|
||||
export EDITOR="emacsclient -t"
|
||||
export VISUAL="emacsclient -c -a emacs"
|
||||
export ALTERNATE_EDITOR=""
|
||||
export PATH=".:~/bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||||
export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
|
||||
|
||||
if [[-d
|
||||
|
||||
|
||||
|
||||
# checks (stolen from zshuery)
|
||||
if [[ $(uname) = 'Linux' ]]; then
|
||||
IS_LINUX=1
|
||||
fi
|
||||
|
||||
if [[ $(uname) = 'Darwin' ]]; then
|
||||
IS_MAC=1
|
||||
fi
|
||||
|
||||
if [[ -x `which brew >/dev/null 2>&1` ]]; then
|
||||
HAS_BREW=1
|
||||
fi
|
||||
|
||||
if [[ -x `which apt-get >/dev/null 2>&1` ]]; then
|
||||
sdfHAS_APT=1
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# _
|
||||
# _ __ _ __ ___ _ __ ___ _ __ | |_
|
||||
# | '_ \| '__/ _ \| '_ ` _ \| '_ \| __|
|
||||
# | |_) | | | (_) | | | | | | |_) | |_
|
||||
# | .__/|_| \___/|_| |_| |_| .__/ \__|
|
||||
# |_| |_|
|
||||
|
||||
|
||||
# define useful aliases for color codes
|
||||
sh_norm="\[\033[0m\]"
|
||||
sh_black="\[\033[0;30m\]"
|
||||
sh_dark_gray="\[\033[1;30m\]"
|
||||
sh_blue="\[\033[0;34m\]"
|
||||
sh_light_blue="\[\033[1;34m\]"
|
||||
sh_green="\[\033[0;32m\]"
|
||||
sh_light_green="\[\033[1;32m\]"
|
||||
sh_cyan="\[\033[0;36m\]"
|
||||
sh_light_cyan="\[\033[1;36m\]"
|
||||
sh_red="\[\033[0;31m\]"
|
||||
sh_light_red="\[\033[1;31m\]"
|
||||
sh_purple="\[\033[0;35m\]"
|
||||
sh_light_purple="\[\033[1;35m\]"
|
||||
sh_brown="\[\033[0;33m\]"
|
||||
sh_yellow="\[\033[1;33m\]"
|
||||
sh_light_gray="\[\033[0;37m\]"
|
||||
sh_white="\[\033[1;37m\]"
|
||||
|
||||
function git_prompt {
|
||||
PCHANGED=""
|
||||
PAHEAD=""
|
||||
PBEHIND=""
|
||||
local FULL_BRANCH="$(git symbolic-ref -q HEAD 2>/dev/null || git name-rev --name-only --no-undefined --always HEAD 2>/dev/null)"
|
||||
PBRANCH="$(echo $FULL_BRANCH | sed 's/refs\/heads\///')"
|
||||
if [ -n $PBRANCH ]; then
|
||||
echo -n "${PBRANCH} "
|
||||
# Are there unstaged changes in the working directory
|
||||
local CHANGED=$(git status --porcelain --ignore-submodule -unormal 2>/dev/null | wc -l)
|
||||
if [ $CHANGED -gt 0 ]; then
|
||||
PCHANGED="◊"
|
||||
fi
|
||||
# Are we behind the origin?
|
||||
local NUM_BEHIND="$(git log --oneline ..@{u} 2>/dev/null | wc -l | tr -d ' ' )"
|
||||
if [ "$NUM_BEHIND" -gt 0 ]; then
|
||||
PBEHIND="↓"
|
||||
fi
|
||||
# Are we ahead of the origin?
|
||||
local NUM_AHEAD="$(git log --oneline @{u}.. 2>/dev/null | wc -l | tr -d ' ')"
|
||||
if [ "$NUM_AHEAD" -gt 0 ]; then
|
||||
PAHEAD="↑"
|
||||
fi
|
||||
|
||||
if [[ -n $PCHANGED || -n $PAHEAD || -n $PBEHIND ]]; then
|
||||
echo -n "${PCHANGED}${PBEHIND}${PAHEAD}"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
|
||||
# Make a pretty prompt.
|
||||
export PROMPT_COMMAND='history -a; if [ $? -ne 0 ];then ERROR_FLAG=1;else ERROR_FLAG=;fi;'
|
||||
export PS1=${HOSTCOLOUR}${sh_light_gray}'\h'${sh_green}':\w'${sh_light_gray}' $(git_prompt)'${sh_light_gray}'${ERROR_FLAG:+'${sh_light_red}'}\$ '${sh_norm}
|
||||
|
||||
# New files and folders should not be world readable
|
||||
umask 0027
|
||||
|
||||
# Borrow features from sensible.bash
|
||||
|
||||
# Trim long paths in prompt
|
||||
PROMPT_DIRTRIM=2
|
||||
|
||||
# Update window size after every command
|
||||
shopt -s checkwinsize
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# _ _ _
|
||||
# | |__ (_)___| |_ ___ _ __ _ _
|
||||
# | '_ \| / __| __/ _ \| '__| | | |
|
||||
# | | | | \__ \ || (_) | | | |_| |
|
||||
# |_| |_|_|___/\__\___/|_| \__, |
|
||||
# |___/
|
||||
|
||||
# Append history don't overwrite
|
||||
shopt -s histappend
|
||||
|
||||
# Save multi-line commands as one line
|
||||
shopt -s cmdhist
|
||||
|
||||
# Avoid duplicate entries
|
||||
export HISTCONTROL="erasedups:ignoreboth"
|
||||
|
||||
# Use ISO8601 time format for history file.
|
||||
export HISTTIMEFORMAT='%F %T '
|
||||
|
||||
# Big history file
|
||||
HISTSIZE=500000
|
||||
HISTFILESIZE=100000
|
||||
|
||||
|
||||
|
||||
|
||||
# _ _
|
||||
# __ _| (_) __ _ ___ ___ ___
|
||||
# / _` | | |/ _` / __|/ _ \/ __|
|
||||
# | (_| | | | (_| \__ \ __/\__ \
|
||||
# \__,_|_|_|\__,_|___/\___||___/
|
||||
|
||||
# jump down the tree.
|
||||
alias ..="cd .."
|
||||
|
||||
# empty the screen (or use C-l)
|
||||
alias c="clear"
|
||||
|
||||
# why wouldn't you want human readable sizes?
|
||||
alias df="df -h"
|
||||
|
||||
# get outta here!
|
||||
alias e="exit"
|
||||
|
||||
# grep shortie
|
||||
alias g="grep --color=auto -i "
|
||||
|
||||
# shorter ls
|
||||
alias l="ls -G --color"
|
||||
|
||||
# list files with details
|
||||
alias ll="ls -lh --color"
|
||||
|
||||
# list all files.
|
||||
alias la="ls -alh --color"
|
||||
|
||||
# List directories.
|
||||
alias ld="ls --color -Gd */"
|
||||
|
||||
# add some color to grep.
|
||||
alias grep="grep --color=auto"
|
||||
|
||||
# make the whole directory tree if required and let us know about it.
|
||||
alias mkdir="mkdir -p -v "
|
||||
|
||||
# don't ping forever.
|
||||
#alias ping="ping -c5"
|
||||
|
||||
# refresh the shell customizations without opening a new one.
|
||||
alias refresh="source ~/.bashrc && hash -r"
|
||||
|
||||
# A python calculator
|
||||
alias pc='python -ic "from __future__ import division; from math import *"'
|
||||
|
||||
# Start nano with line numbering no wrapping and autoindenting
|
||||
alias nano='nano -ciw '
|
||||
|
||||
# shortcut for tmux command
|
||||
alias tm="tmux new-session -A -s main"
|
||||
|
||||
# emacsclient
|
||||
alias ec="emacsclient -n -c -a emacs"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# __ _ _
|
||||
# / _|_ _ _ __ ___| |_(_) ___ _ __ ___
|
||||
# | |_| | | | '_ \ / __| __| |/ _ \| '_ \/ __|
|
||||
# | _| |_| | | | | (__| |_| | (_) | | | \__ \
|
||||
# |_| \__,_|_| |_|\___|\__|_|\___/|_| |_|___/
|
||||
|
||||
# General purpose extract command.
|
||||
extract () {
|
||||
if [ -f $1 ] ; then
|
||||
case $1 in
|
||||
*.tar.bz2) tar xjf $1 ;;
|
||||
*.tar.gz) tar xzf $1 ;;
|
||||
*.tar.xz) tar xJf $1 ;;
|
||||
*.bz2) bunzip2 $1 ;;
|
||||
*.rar) rar x $1 ;;
|
||||
*.gz) gunzip $1 ;;
|
||||
*.tar) tar xf $1 ;;
|
||||
*.tbz2) tar xjf $1 ;;
|
||||
*.tgz) tar xzf $1 ;;
|
||||
*.zip) unzip $1 ;;
|
||||
*.Z) uncompress $1 ;;
|
||||
*.7z) 7za e $1 ;;
|
||||
*.xz) xz -dv $1 ;;
|
||||
*) echo "'$1' cannot be extracted via extract()" ;;
|
||||
esac
|
||||
else
|
||||
echo "'$1' is not a valid file"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# General purpose backup command.
|
||||
bu () { tar czf ~/.backup/`basename $1`-`date +%Y%m%d%H%M`.tgz $1; }
|
||||
|
||||
# create an archive of a list of files, compress the archive, and encrypt the compressed archive
|
||||
function archive-and-encrypt {
|
||||
echo -n "Enter desired output filename: "
|
||||
read filename
|
||||
tar cJ $1 | \
|
||||
gpg -q -r andrew@amdavidson.com -s -e -o "$filename.tar.xz.gpg"
|
||||
}
|
||||
|
||||
|
||||
# run mosh and tmux to a specific host
|
||||
function mt {
|
||||
mosh $1 -- tmux new-session -A -s main
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
# _ _
|
||||
# (_)_ __ ___ _ __ ___ _ __| |_ ___
|
||||
# | | '_ ` _ \| '_ \ / _ \| '__| __/ __|
|
||||
# | | | | | | | |_) | (_) | | | |_\__ \
|
||||
# |_|_| |_| |_| .__/ \___/|_| \__|___/
|
||||
# |_|
|
||||
|
||||
# import fzf if possible
|
||||
|
||||
# Debian
|
||||
if [ -d /usr/share/doc/fzf/examples ]; then
|
||||
source /usr/share/doc/fzf/examples/key-bindings.bash
|
||||
|
||||
if [ -f /usr/share/doc/fzf/examples/completion.bash ]; then
|
||||
source /usr/share/doc/fzf/examples/completion.bash
|
||||
fi
|
||||
fi
|
||||
|
||||
# MacOS
|
||||
if [ -d /opt/homebrew/opt/fzf/shell ]; then
|
||||
source /opt/homebrew/opt/fzf/shell/key-bindings.bash
|
||||
source /opt/homebrew/opt/fzf/shell/completion.bash
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Import local extensions if needed.
|
||||
if [ -f $HOME/.bashrc_local ]; then
|
||||
source $HOME/.bashrc_local
|
||||
fi
|
||||
|
||||
49
bash/.bashrc
49
bash/.bashrc
|
|
@ -11,10 +11,15 @@
|
|||
|
||||
# Set some defaults.
|
||||
export EDITOR="nvim"
|
||||
export PATH=".:~/bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||||
export VISUAL="nvim"
|
||||
export ALTERNATE_EDITOR=""
|
||||
export PATH=".:~/bin:~/.local/bin:/usr/games:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||||
export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
|
||||
|
||||
|
||||
# include doom in path if it exists
|
||||
if [ -d ~/.config/emacs/bin ]; then
|
||||
export PATH="$HOME/.emacs.d/bin:$PATH"
|
||||
fi
|
||||
|
||||
# checks (stolen from zshuery)
|
||||
if [[ $(uname) = 'Linux' ]]; then
|
||||
|
|
@ -33,11 +38,6 @@ if [[ -x `which apt-get >/dev/null 2>&1` ]]; then
|
|||
HAS_APT=1
|
||||
fi
|
||||
|
||||
if [[ -x `which yum >/dev/null 2>&1` ]]; then
|
||||
HAS_YUM=1
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# _
|
||||
# _ __ _ __ ___ _ __ ___ _ __ | |_
|
||||
|
|
@ -100,7 +100,7 @@ function git_prompt {
|
|||
|
||||
# Make a pretty prompt.
|
||||
export PROMPT_COMMAND='history -a; if [ $? -ne 0 ];then ERROR_FLAG=1;else ERROR_FLAG=;fi;'
|
||||
export PS1=${HOSTCOLOUR}${sh_light_gray}'\t | \h'${sh_green}':\w'${sh_light_gray}' $(git_prompt)'${sh_light_gray}'${ERROR_FLAG:+'${sh_light_red}'}\$ '${sh_norm}
|
||||
export PS1=${HOSTCOLOUR}${sh_light_gray}'\h'${sh_green}':\w'${sh_light_gray}' $(git_prompt)'${sh_light_gray}'${ERROR_FLAG:+'${sh_light_red}'}\$ '${sh_norm}
|
||||
|
||||
# New files and folders should not be world readable
|
||||
umask 0027
|
||||
|
|
@ -194,16 +194,18 @@ alias pc='python -ic "from __future__ import division; from math import *"'
|
|||
# Start nano with line numbering no wrapping and autoindenting
|
||||
alias nano='nano -ciw '
|
||||
|
||||
# shortcut for tmux command
|
||||
alias tm="tmux new-session -A -s main"
|
||||
|
||||
# always use nvim
|
||||
alias vim='nvim'
|
||||
alias vi='nvim'
|
||||
alias nv='nvim'
|
||||
|
||||
# emacsclient
|
||||
alias ec="emacsclient -n -c -a emacs"
|
||||
|
||||
if [[ HAS_GNOME ]]; then
|
||||
alias nosleep="gnome-session-inhibit --inhibit-only"
|
||||
fi
|
||||
|
||||
# magic packets to wake up hosts
|
||||
alias wake_richie="wakeonlan ec:b1:d7:44:91:40"
|
||||
alias wake_ari="wakeonlan 3c:97:0e:97:32:84 6c:88:14:36:92:b0"
|
||||
alias wake_uzi="wakeonlan f4:d4:88:7d:6a:e9 34:99:71:d8:a4:48"
|
||||
|
||||
|
||||
|
||||
|
|
@ -250,9 +252,15 @@ function archive-and-encrypt {
|
|||
}
|
||||
|
||||
|
||||
# shortcut for tmux command
|
||||
function tm {
|
||||
tmux new-session -A -s main -x $(tput cols) -y $(tput lines)
|
||||
}
|
||||
|
||||
|
||||
# run mosh and tmux to a specific host
|
||||
function mt {
|
||||
mosh $1 -- tmux new-session -A -s main
|
||||
mosh $1 -- tm
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -276,6 +284,15 @@ if [ -d /usr/share/doc/fzf/examples ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# Arch
|
||||
if [ -d /usr/share/fzf ]; then
|
||||
source /usr/share/fzf/key-bindings.bash
|
||||
|
||||
if [ -f /usr/share/fzf/completion.bash ]; then
|
||||
source /usr/share/fzf/completion.bash
|
||||
fi
|
||||
fi
|
||||
|
||||
# MacOS
|
||||
if [ -d /opt/homebrew/opt/fzf/shell ]; then
|
||||
source /opt/homebrew/opt/fzf/shell/key-bindings.bash
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
;; If you use `org' and don't want your org files in the default location below,
|
||||
;; change `org-directory'. It must be set before org loads!
|
||||
(setq org-directory "~/Nextcloud/org/")
|
||||
(setq org-agenda-files '("~/Nextcloud/org/todo"))
|
||||
|
||||
|
||||
;; Whenever you reconfigure a package, make sure to wrap your config in an
|
||||
|
|
|
|||
|
|
@ -31,16 +31,16 @@
|
|||
;;deft ; notational velocity for Emacs
|
||||
doom ; what makes DOOM look the way it does
|
||||
doom-dashboard ; a nifty splash screen for Emacs
|
||||
;;doom-quit ; DOOM quit-message prompts when you quit Emacs
|
||||
doom-quit ; DOOM quit-message prompts when you quit Emacs
|
||||
;;(emoji +unicode) ; 🙂
|
||||
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
|
||||
;;hydra
|
||||
;;indent-guides ; highlighted indent columns
|
||||
;;ligatures ; ligatures and symbols to make your code pretty again
|
||||
;;minimap ; show a map of the code on the side
|
||||
minimap ; show a map of the code on the side
|
||||
modeline ; snazzy, Atom-inspired modeline, plus API
|
||||
;;nav-flash ; blink cursor line after big motions
|
||||
;;neotree ; a project drawer, like NERDTree for vim
|
||||
neotree ; a project drawer, like NERDTree for vim
|
||||
ophints ; highlight the region an operation acts on
|
||||
(popup +defaults) ; tame sudden yet inevitable temporary windows
|
||||
;;tabs ; a tab bar for Emacs
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[user]
|
||||
name = Andrew Davidson
|
||||
email = andrew@andr3w.net
|
||||
signingkey = /Users/amd/.ssh/id_rsa.pub
|
||||
email = andrew@amd.im
|
||||
|
||||
[color]
|
||||
ui = auto
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
text/html; firefox %s && sleep 5; test=test -n "$DISPLAY";
|
||||
text/html; links -html-numbered-links 1 -dump %s; nametemplate=%s.html; copiousoutput
|
||||
#text/html; w3m -I %{charset} -T text/html; copiousoutput;
|
||||
text/plain; vim %s;
|
||||
|
||||
|
||||
172
mutt/.muttrc
172
mutt/.muttrc
|
|
@ -1,172 +0,0 @@
|
|||
# Paths ---------------------
|
||||
set folder = ~/.maildir
|
||||
set alias_file = ~/.mutt/alias
|
||||
set header_cache = ~/.mutt/cache/headers
|
||||
set message_cachedir = ~/.mutt/cache/bodies
|
||||
set certificate_file = ~/.mutt/certificates
|
||||
set mailcap_path = ~/.mailcap
|
||||
set tmpdir = ~/.mutt/temp
|
||||
set signature = ~/.sig
|
||||
|
||||
# Options -------------------
|
||||
set wait_key = no
|
||||
set mbox_type = Maildir
|
||||
set timeout = 3
|
||||
set mail_check = 0
|
||||
unset move
|
||||
set delete
|
||||
unset confirmappend
|
||||
set quit
|
||||
unset mark_old
|
||||
set pipe_decode
|
||||
set thorough_search
|
||||
set charset = utf-8
|
||||
set send_charset = utf-8
|
||||
|
||||
# Sidebar -------------------
|
||||
set sidebar_visible = yes
|
||||
set sidebar_width = 20
|
||||
set sidebar_short_path = yes
|
||||
set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
|
||||
color sidebar_new color221 color233
|
||||
|
||||
# Header Options ------------
|
||||
ignore *
|
||||
unignore from: reply-to: to: cc: bcc: date: subject: x-Spam-score: list-id:
|
||||
unhdr_order *
|
||||
hdr_order from: reply-to: to: cc: bcc: date: subject: x-Spam-score: list-id:
|
||||
|
||||
# Setup IMAP -------------------
|
||||
set my_pass=`~/bin/pw.sh IMAP_PASSWORD`
|
||||
set my_user=`~/bin/pw.sh IMAP_USERNAME`
|
||||
set folder = "imaps://$my_user:$my_pass@imap.fastmail.com:993"
|
||||
set spoolfile= "+INBOX"
|
||||
set record = +Sent
|
||||
set postponed = +Drafts
|
||||
set trash = +Trash
|
||||
set imap_check_subscribed = yes
|
||||
bind index G imap-fetch-mail
|
||||
|
||||
# Setup SMTP -------------------
|
||||
set smtp_url=smtp://$my_user:$my_pass@smtp.fastmail.com:587
|
||||
set ssl_force_tls=yes
|
||||
#set ssl_starttls=yes
|
||||
|
||||
|
||||
# Mailboxes -----------------
|
||||
# source ~/.mutt/mailboxes
|
||||
|
||||
# Index ---------------------
|
||||
set date_format = "%m/%d"
|
||||
set index_format = "[%Z] %D %-20.20F %s"
|
||||
set sort = threads
|
||||
set sort_aux = reverse-last-date-received
|
||||
set uncollapse_jump
|
||||
set sort_re
|
||||
set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
|
||||
|
||||
bind index R group-reply
|
||||
bind index <tab> sync-mailbox
|
||||
bind index <space> collapse-thread
|
||||
|
||||
macro index / "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py<enter><change-folder-readonly>~/.cache/mutt_results<enter>" \
|
||||
"search mail (using notmuch)"
|
||||
|
||||
macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
|
||||
|
||||
macro index,pager o "<shell-escape>$HOME/bin/fastmail.sh<enter>" "run offlineimap to sync fastmail"
|
||||
|
||||
macro index,pager C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
|
||||
macro index,pager s "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
|
||||
|
||||
bind index D purge-message
|
||||
|
||||
bind index,pager <down> sidebar-next
|
||||
bind index,pager <up> sidebar-prev
|
||||
bind index,pager <right> sidebar-open
|
||||
|
||||
|
||||
# Pager View -----------------
|
||||
set pager_index_lines = 10 # number of index lines to show
|
||||
set pager_context = 3 # number of context lines to show
|
||||
set pager_stop # don't go to next message automatically
|
||||
set menu_scroll # scroll in menus
|
||||
set tilde # show tildes like in vim
|
||||
unset markers # no ugly plus signs
|
||||
|
||||
set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
|
||||
alternative_order text/plain text/enriched text/html
|
||||
|
||||
|
||||
# Pager Bindings -------------
|
||||
bind pager k previous-line
|
||||
bind pager j next-line
|
||||
bind pager R group-reply
|
||||
|
||||
# View attachments properly.
|
||||
bind attach <return> view-mailcap
|
||||
auto_view text/html
|
||||
|
||||
macro pager \Cu "|urlview<enter>" "call urlview to open links"
|
||||
|
||||
# Setup Identity
|
||||
set realname="Andrew Davidson"
|
||||
set from="andrew@amdavidson.com"
|
||||
|
||||
|
||||
|
||||
# Setup VIM for editing headers
|
||||
set edit_headers
|
||||
set editor="nvim +':set textwidth=0' +':set wrapmargin=0' +':set wrap' +':set linebreak' +':set nolist' +/^$ ++1"
|
||||
|
||||
# Contacts shortcuts
|
||||
set query_command = "khard email --parsable --search-in-source-files '%s'"
|
||||
bind editor <Tab> complete-query
|
||||
bind editor ^T complete
|
||||
macro index,pager A "<pipe-message>khard add-email<return>" "add the sender email address to khard"
|
||||
|
||||
# Some neat stuff.
|
||||
set fcc_attach=yes # Forward attachments.
|
||||
unset reply_self # Don't include myself when replying to all
|
||||
set smart_wrap # wrap text smartly and don't clip words.
|
||||
set forward_format='Fwd: %s' # make the forwarding subject line look more like other clients.
|
||||
set forward_decode
|
||||
set reply_to
|
||||
set reverse_name
|
||||
set include
|
||||
set forward_quote
|
||||
|
||||
# Crypto stuff
|
||||
set pgp_decode_command="gpg --pinentry-mode loopback %?p?--passphrase-fd 0? --no-verbose --batch --output - %f"
|
||||
set pgp_verify_command="gpg --pinentry-mode loopback --no-verbose --batch --output - --verify %s %f"
|
||||
set pgp_decrypt_command="gpg --pinentry-mode loopback --passphrase-fd 0 --no-verbose --batch --output - %f"
|
||||
set pgp_sign_command="gpg --pinentry-mode loopback --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
|
||||
set pgp_clearsign_command="gpg --pinentry-mode loopback --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
|
||||
set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x49CF25C6 -- -r %r -- %f"
|
||||
set pgp_encrypt_sign_command="/usr/lib/neomutt/pgpewrap gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to 0x49CF25C6 -- -r %r -- %f"
|
||||
set pgp_import_command="gpg --no-verbose --import -v %f"
|
||||
set pgp_export_command="gpg --no-verbose --export --armor %r"
|
||||
set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs %r"
|
||||
set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r"
|
||||
set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r"
|
||||
|
||||
# Sign emails as me.
|
||||
set pgp_sign_as=0x49CF25C6
|
||||
|
||||
# Automatically sign emails.
|
||||
#set crypt_autosign
|
||||
|
||||
# Reply to signed emails with a signed email.
|
||||
set crypt_replysign
|
||||
|
||||
# Encrypt and sign replies to signed emails.
|
||||
# set crypt_replyencrypt=yes
|
||||
|
||||
# Encrypt and sign replies to encrypted emails.
|
||||
set crypt_replysignencrypted=yes
|
||||
|
||||
# Time out of GPG after xx seconds.
|
||||
set pgp_timeout=28800
|
||||
|
||||
# Automatically verify signatures.
|
||||
set crypt_verify_sig=yes
|
||||
86
neomutt/.config/neomutt/neomuttrc
Normal file
86
neomutt/.config/neomutt/neomuttrc
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
### Me
|
||||
set from = "andrew@amd.im"
|
||||
set realname = "Andrew Davidson"
|
||||
|
||||
|
||||
### Connectivity
|
||||
set imap_user = "andrew@bigfootstoybox.com"
|
||||
set imap_pass = "`pass show email/bigfootstoybox.com/andrew`"
|
||||
set folder = "imaps://mail.amd.im"
|
||||
set smtp_url = "smtps://$imap_user:$imap_pass@mail.amd.im:465"
|
||||
set ssl_starttls = no
|
||||
set ssl_force_tls = yes
|
||||
set imap_check_subscribed # automatically check subscribed folders
|
||||
mailboxes +INBOX
|
||||
|
||||
|
||||
### Mailbox Locations
|
||||
set spoolfile = "+INBOX"
|
||||
set record = "=Sent"
|
||||
set postponed = "=Drafts"
|
||||
set trash = "=Trash"
|
||||
|
||||
|
||||
### Local Folders
|
||||
set header_cache = "~/.cache/mutt/headers"
|
||||
set message_cachedir = "~/.cache/mutt/messages"
|
||||
|
||||
|
||||
### Local Settings
|
||||
set mail_check = 60 # check for mail every XX seconds
|
||||
set imap_keepalive = 900 # does what it says on the tin, in seconds
|
||||
set edit_headers # include headers when editing a message
|
||||
set fast_reply # dont ask too many questions when replying
|
||||
set pager_stop # stop scrolling pager at end of message
|
||||
set pager_context # add 3 lines of context to message pager
|
||||
set forward_quote # include message when forwarding
|
||||
set forward_decode # decode message when forwarding
|
||||
set reply_to # follow Reply to: header
|
||||
set reverse_name # reply as the recipient address
|
||||
set include # include message in replies as default
|
||||
set text_flowed=yes # correct indentation
|
||||
unset sig_dashes # no dashes before signature
|
||||
set charset = "utf-8" # prefer utf-8
|
||||
set send_charset = "utf-8:iso-8859-1:us-ascii" # send in utf-8
|
||||
set editor = "nvim" # we know we want to edit in nvim
|
||||
unset confirmappend # don't double check when moving messages
|
||||
set reverse_alias # if an alias is set for a contact, use that
|
||||
set pager_index_lines = 10 # Shows 10 lines of index when pager is active
|
||||
|
||||
|
||||
### Message threading
|
||||
set sort_re # changes method by which threads are sorted
|
||||
set sort = reverse-threads # sort by threads
|
||||
set sort_aux = last-date-received # secondarily sory by most recent message received in thread
|
||||
|
||||
|
||||
### Sidebar
|
||||
set sidebar_visible # show the sidebar
|
||||
set sidebar_short_path # simplify paths in sidebar
|
||||
unset sidebar_folder_indent # indent mailboxes in sidebar
|
||||
set sidebar_format = "%B %* [%?N?%N/?%S]" # what should the sidebar display
|
||||
set sidebar_sort_method = path
|
||||
set mail_check_stats # check mailbox statistics for sidebar view
|
||||
|
||||
|
||||
### Colorscheme
|
||||
source "./nord.theme"
|
||||
|
||||
|
||||
### Keybindings
|
||||
bind index j next-entry
|
||||
bind index k previous-entry
|
||||
bind pager j next-line
|
||||
bind pager k previous-line
|
||||
|
||||
bind attach,index,pager \CD next-page
|
||||
bind attach,index,pager \CU previous-page
|
||||
bind pager g top
|
||||
bind pager G bottom
|
||||
bind attach,index g first-entry
|
||||
bind attach,index G last-entry
|
||||
|
||||
bind index,pager \CJ sidebar-next
|
||||
bind index,pager \CK sidebar-prev
|
||||
bind index,pager \CE sidebar-open
|
||||
bind index,pager B sidebar-toggle-visible
|
||||
28
neomutt/.config/neomutt/nord.theme
Normal file
28
neomutt/.config/neomutt/nord.theme
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
color normal default default # default colours
|
||||
color index brightblue default ~N # new messages
|
||||
color index red default ~F # flagged messages
|
||||
color index blue default ~T # tagged messages
|
||||
color index brightred default ~D # deleted messages
|
||||
color body brightgreen default (https?|ftp)://[\-\.+,/%~_:?&=\#a-zA-Z0-9]+ # links
|
||||
color body brightgreen default [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+ # email-addresses
|
||||
color attachment magenta default # attachments
|
||||
color signature brightwhite default # sigs
|
||||
color search brightred black # highlight results
|
||||
|
||||
color indicator black cyan # currently highlighted message
|
||||
color error red default # error messages
|
||||
color status white brightblack # status line
|
||||
color tree white default # thread tree arrows
|
||||
color tilde cyan default # blank line padding
|
||||
|
||||
color hdrdefault brightblue default # default headers
|
||||
color header cyan default "^From:"
|
||||
color header cyan default "^Subject:"
|
||||
|
||||
color quoted cyan default # quote colours
|
||||
color quoted1 brightcyan default
|
||||
color quoted2 blue default
|
||||
color quoted3 green default
|
||||
color quoted4 yellow default
|
||||
color quoted5 red default
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# More logical (to me) split keys.
|
||||
bind - split-window -p 38 -v
|
||||
bind | split-window -p 38 -h
|
||||
bind - split-window -v -l 38%
|
||||
bind | split-window -h -l 38%
|
||||
|
||||
set -g @plugin 'tmux-plugins/tpm'
|
||||
set -g @plugin 'tmux-plugins/tmux-sensible'
|
||||
|
|
|
|||
1
tmux/.tmux/plugins/.gitignore
vendored
Normal file
1
tmux/.tmux/plugins/.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
*
|
||||
File diff suppressed because it is too large
Load diff
37
vim/.vimrc
37
vim/.vimrc
|
|
@ -1,18 +1,19 @@
|
|||
" ==================== Plugins ====================
|
||||
call plug#begin()
|
||||
|
||||
" Airline
|
||||
Plug 'bling/vim-airline'
|
||||
|
||||
" Git integration
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
|
||||
" Gruvbox theme
|
||||
Plug 'morhetz/gruvbox'
|
||||
" Nord Theme
|
||||
Plug 'nordtheme/vim'
|
||||
|
||||
" Airline
|
||||
Plug 'bling/vim-airline'
|
||||
let g:airline_powerline_fonts = 1
|
||||
|
||||
" Commenter
|
||||
Plug 'scrooloose/nerdcommenter'
|
||||
" Plug 'scrooloose/nerdcommenter'
|
||||
|
||||
" Sayonara
|
||||
Plug 'mhinz/vim-sayonara', { 'on': 'Sayonara' }
|
||||
|
|
@ -20,8 +21,6 @@ Plug 'mhinz/vim-sayonara', { 'on': 'Sayonara' }
|
|||
" Go support for Vim
|
||||
"Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
|
||||
|
||||
" Python Stuff
|
||||
" Plug 'davidhalter/jedi-vim'
|
||||
if has('nvim')
|
||||
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
|
||||
else
|
||||
|
|
@ -30,28 +29,35 @@ else
|
|||
Plug 'roxma/vim-hug-neovim-rpc'
|
||||
endif
|
||||
let g:deoplete#enable_at_startup = 1
|
||||
|
||||
" Python source for deoplete
|
||||
Plug 'zchee/deoplete-jedi', { 'for': 'python' }
|
||||
|
||||
" Vim source for deoplete
|
||||
Plug 'Shougo/neco-vim', { 'for': 'vim' }
|
||||
|
||||
"{{ Python-related plugins
|
||||
" Python-related plugins
|
||||
" Python completion, goto definition etc.
|
||||
Plug 'davidhalter/jedi-vim', { 'for': 'python' }
|
||||
" Plug 'davidhalter/jedi-vim', { 'for': 'python' }
|
||||
|
||||
" Python syntax highlighting and more
|
||||
Plug 'numirias/semshi', { 'do': ':UpdateRemotePlugins' }
|
||||
" Plug 'numirias/semshi', { 'do': ':UpdateRemotePlugins' }
|
||||
|
||||
" Python auto formatting
|
||||
Plug 'psf/black', { 'branch': 'stable' }
|
||||
autocmd BufWritePre *.py execute ':Black'
|
||||
" Plug 'psf/black', { 'branch': 'stable' }
|
||||
" autocmd BufWritePre *.py execute ':Black'
|
||||
|
||||
" Smart Line Numbers
|
||||
Plug 'myusuf3/numbers.vim'
|
||||
|
||||
Plug 'tpope/vim-commentary'
|
||||
|
||||
" Ale
|
||||
Plug 'dense-analysis/ale'
|
||||
|
||||
" OpenSCAD Support
|
||||
Plug 'salkin-mada/openscad.nvim'
|
||||
|
||||
call plug#end()
|
||||
|
||||
" ==================== Vim Settings ====================
|
||||
|
|
@ -139,7 +145,7 @@ endif " has("autocmd")
|
|||
"let g:dracula_colorterm = 0
|
||||
"silent! colorscheme dracula
|
||||
set background=dark
|
||||
silent! colorscheme gruvbox
|
||||
silent! colorscheme nord
|
||||
|
||||
|
||||
" ==================== Code Folding ====================
|
||||
|
|
@ -186,6 +192,9 @@ map q: :q
|
|||
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
||||
cmap w!! w !sudo tee > /dev/null %
|
||||
|
||||
" Disable F1 key
|
||||
nmap <F1> <nop>
|
||||
|
||||
" Go shortcuts just for .go files
|
||||
autocmd FileType go nmap <leader>r <Plug>(go-run)
|
||||
autocmd FileType go nmap <leader>t <Plug>(go-test)
|
||||
|
|
|
|||
Loading…
Reference in a new issue