summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--home/.config/neomutt/muttrc4
-rw-r--r--home/.gitconfig6
-rw-r--r--home/.mutt/muttrc4
-rw-r--r--home/var/system/config-updater/post-update4
-rw-r--r--src/xcompose.patch4
5 files changed, 14 insertions, 8 deletions
diff --git a/home/.config/neomutt/muttrc b/home/.config/neomutt/muttrc
index cc5e42f..aaa1427 100644
--- a/home/.config/neomutt/muttrc
+++ b/home/.config/neomutt/muttrc
@@ -24,6 +24,9 @@ set postponed="+.Postponed" # mailbox to store postponed messages in
set abort_unmodified=yes # automatically abort replies if I don't
# change the message
+#forgotten-attachment
+set abort_noattach = ask-yes
+set abort_noattach_regex = "\\<(anhängen|angehängt|anhang|anhänge|hängt an|attach(|ed|ments?))\\>"
set alias_file=~/.mail_aliases # where I keep my aliases
set allow_8bit # never do Q-P encoding on legal 8-bit chars
set arrow_cursor # use -> instead of hiliting the whole line
@@ -253,6 +256,7 @@ bind pager G bottom # just like vi and less
#macro pager X "<pipe-message> morepgp<Enter>" # pipe PGP message to a script
macro index,pager c "<change-folder>?" "open a different folder"
+macro index,pager \Cx ":source $HOME/.config/neomutt/filters/folderchange.sh|<enter>" "open a different folder"
macro index,pager C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
macro index,pager M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
diff --git a/home/.gitconfig b/home/.gitconfig
index c35fe89..5a3a133 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -4,7 +4,7 @@
wdiff = diff --word-diff
[branch]
- autosetuprebase = always
+ autoSetupRebase = always
[branch "master"]
merge = refs/heads/master
@@ -20,7 +20,7 @@
[core]
abbrev = 12
autocrlf = input
- excludesfile = /home/astra/.gitignore
+ excludesFile = /home/astra/.gitignore
[merge]
tool = meld
@@ -35,7 +35,7 @@
default = upstream
[rebase]
- autostash = true
+ autoStash = true
stat = true
[remote "origin"]
diff --git a/home/.mutt/muttrc b/home/.mutt/muttrc
index ee0fc1a..828f119 100644
--- a/home/.mutt/muttrc
+++ b/home/.mutt/muttrc
@@ -24,6 +24,9 @@ set postponed="+.Postponed" # mailbox to store postponed messages in
set abort_unmodified=yes # automatically abort replies if I don't
# change the message
+#forgotten-attachment
+set abort_noattach = ask-yes
+set abort_noattach_regex = "\\<(anhängen|angehängt|anhang|anhänge|hängt an|attach(|ed|ments?))\\>"
set alias_file=~/.mail_aliases # where I keep my aliases
set allow_8bit # never do Q-P encoding on legal 8-bit chars
set arrow_cursor # use -> instead of hiliting the whole line
@@ -237,6 +240,7 @@ bind pager G bottom # just like vi and less
#macro pager X "<pipe-message> morepgp<Enter>" # pipe PGP message to a script
macro index,pager c "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro index,pager \Cx ":source $HOME/.config/neomutt/filters/folderchange.sh|<enter>" "open a different folder"
macro index,pager C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
macro index,pager M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
diff --git a/home/var/system/config-updater/post-update b/home/var/system/config-updater/post-update
index e2560f0..1a03de1 100644
--- a/home/var/system/config-updater/post-update
+++ b/home/var/system/config-updater/post-update
@@ -2,9 +2,9 @@ rm -f this_file_will_be_deleted
rm -f bin/config-update.sh
if ! [ -d $HOME/.oh-my-zsh ]; then
if which curl >/dev/null ; then
- sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
elif which wget >/dev/null ; then
- sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
+ sh -c "$(wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh -O -)"
fi
fi
rm -f .zshrc.pre-oh-my-zsh
diff --git a/src/xcompose.patch b/src/xcompose.patch
index 82b00aa..bc6a0d6 100644
--- a/src/xcompose.patch
+++ b/src/xcompose.patch
@@ -8,7 +8,7 @@
<Multi_key> <Multi_key> <a> <l> <e> <p> <h> : "ℵ" U2135 # ALEF SYMBOL
<Multi_key> <Multi_key> <a> <l> <e> <p> <0> : "ℵ₀" # ALEF Null
<Multi_key> <Multi_key> <a> <l> <e> <p> <1> : "ℵ₁" # ALEF One
-@@ -772,8 +773,18 @@
+@@ -772,8 +773,16 @@
<Multi_key> <Left> <f> <less> <3> : "❧" U2767 # ROTATED FLORAL HEART BULLET
<Multi_key> <Right> <f> <less> <3> : "☙" U2619 # REVERSED ROTATED FLORAL HEART BULLET
<Multi_key> <Multi_key> <t> <e> <l> : "☎" U260E # BLACK TELEPHONE
@@ -22,8 +22,6 @@
+<Multi_key> <Multi_key> <c> <a> <t> : "😸" U1F431 # CAT
+<Multi_key> <Multi_key> <o> <w> <l> : "🦉" U1F989 # OWL
+<Multi_key> <Multi_key> <t> <r> <e> <e> : "🌲" U1F332 # TREE (alt: 🌳, U1F333)
-+#<Multi_key> <Multi_key> <s> <t> <a> <r> : "⋆" U22C6 # STAR OPERATOR
-+#<Multi_key> <Multi_key> <s> <t> <a> <r> : "★" U2605 # BLACK STAR
+<Multi_key> <Multi_key> <s> <t> <a> <r> : "⭐" U2B50 # MEDIUM WHITE STAR
# Other possibly useful symbols:
# 2668 HOT SPRINGS (for chat, for running off to shower?)