Merge branch 'master' of ssh://git.yulqen.org:2222/home/git/repositories/dotfiles/arch-dotfiles

4 files changed, 50 insertions, 66 deletions

diff --git a/Xresources b/Xresources
index 2f61cf4..6f1a8e1 100644
--- a/Xresources
+++ b/Xresources
@@ -1,50 +1,4 @@
-xterm*faceName:OfficeCodePro-Regular:size=12
-URxvt.font: xft:monaco:size=12
-URxvt.perl-ext-common: default,matcher
-URxvt.url-launcher: /usr/bin/xdg-open
-URxvt.matcher.button: 1
-URxvt.matcher.rend.0: Uline Bold fg5
-
-!! from https://wiki.manjaro.org/index.php?title=Improve_Font_Rendering
-Xft.dpi: 96
-Xft.antialias: true
-Xft.hinting: true
-Xft.rgba: rgb
-Xft.autohint: false
-Xft.hintstyle: hintslight
-Xft.lcdfilter: lcddefault
-
-xterm*VT100*colorMode: on
-xterm*VT100*boldColors: on
-xterm*VT100*dynamicColors: on
-
-XTerm*selectToClipboard: true
-
-XTerm*ptyInitialErase:true
-
-XTerm*backarrowKey: false
-XTerm.vt100.backarrowKey: false
-XTerm.ttyModes: erase ^?
-XTerm.vt100.locale:true
-
-!Theme Three
-xterm*background: #161916
+/* xterm*font: -Misc-Fixed-Medium-R-Normal--10-100-75-75-C-60-ISO10646-1 */
+xterm*font: fixed
+xterm*background: black
 xterm*foreground: white
-urxvt*background: black
-urxvt*foreground: white
-/* *color0:     rgb:00/00/00 */
-/* *color1:     rgb:e0/10/10 */
-/* *color2:     rgb:20/ad/20 */
-/* *color3:     rgb:d4/c2/4f */
-/* *color4:     rgb:23/1b/b8 */
-/* *color5:     rgb:9c/38/85 */
-/* *color6:     rgb:1d/bd/b8 */
-/* *color7:     rgb:fe/fe/fe */
-/* *color8:     rgb:6a/6a/6a */
-/* *color9:     rgb:e8/3a/3d */
-/* *color10:    rgb:35/e9/56 */
-/* *color11:    rgb:ff/ff/2f */
-/* *color12:    rgb:3a/53/f0 */
-/* *color13:    rgb:e6/28/ba */
-/* *color14:    rgb:1c/f5/f5 */
-/* *color15:    rgb:ff/ff/ff */
diff --git a/fish2024/fish_variables b/fish2024/fish_variables
index a50d410..4eb79ad 100644
--- a/fish2024/fish_variables
+++ b/fish2024/fish_variables
@@ -1,32 +1,43 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR __fish_initialized:3400
-SETUVAR fish_color_autosuggestion:brblack
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:blue
-SETUVAR fish_color_comment:red
+SETUVAR fish_color_autosuggestion:585858
+SETUVAR fish_color_cancel:\x2d\x2dreverse
+SETUVAR fish_color_command:a1b56c
+SETUVAR fish_color_comment:f7ca88
 SETUVAR fish_color_cwd:green
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:green
-SETUVAR fish_color_error:brred
-SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_end:ba8baf
+SETUVAR fish_color_error:ab4642
+SETUVAR fish_color_escape:86c1b9
 SETUVAR fish_color_history_current:\x2d\x2dbold
 SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_host_remote:\x1d
+SETUVAR fish_color_keyword:\x1d
+SETUVAR fish_color_match:7cafc2
 SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:brcyan
-SETUVAR fish_color_param:cyan
-SETUVAR fish_color_quote:yellow
-SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
+SETUVAR fish_color_operator:7cafc2
+SETUVAR fish_color_option:\x1d
+SETUVAR fish_color_param:d8d8d8
+SETUVAR fish_color_quote:f7ca88
+SETUVAR fish_color_redirection:d8d8d8
 SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_status:red
 SETUVAR fish_color_user:brgreen
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
 SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_background:\x1d
 SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:yellow\x1e\x2di
+SETUVAR fish_pager_color_description:B3A06D
 SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_pager_color_selected_background:\x2dr
-SETUVAR fish_user_paths:/home/lemon/\x2elocal/bin
+SETUVAR fish_pager_color_secondary_background:\x1d
+SETUVAR fish_pager_color_secondary_completion:\x1d
+SETUVAR fish_pager_color_secondary_description:\x1d
+SETUVAR fish_pager_color_secondary_prefix:\x1d
+SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_pager_color_selected_completion:\x1d
+SETUVAR fish_pager_color_selected_description:\x1d
+SETUVAR fish_pager_color_selected_prefix:\x1d
+SETUVAR fish_user_paths:/home/lemon/go/bin\x1e/home/lemon/\x2elocal/bin
diff --git a/muttrc b/muttrc
index bdcd23c..0ed202a 100644
--- a/muttrc
+++ b/muttrc
@@ -13,6 +13,7 @@ set certificate_file = ~/.mutt/certificates  # where to store certs
 set mailcap_path     = ~/.mutt/mailcap       # entries for filetypes
 set tmpdir           = ~/.mutt/temp          # where to keep temp files
 set signature        = ~/.mutt/signature           # my signature file
+set attach_save_dir  = ~/Downloads
 
 # Allow forwarding of attachments with emails
 set mime_forward
@@ -233,8 +234,25 @@ macro index ,t "<pipe-message>mutt2task<enter> <move-message>purelymail/INBOX.Ar
 #new notmuch-mutt for linux
 
 # Notmuch
-set virtual_spoolfile=yes
+#set virtual_spoolfile=yes  # uncomment this to have mutt open the first virtual-mailbox below when it launches
 macro index \\\\ "<vfolder-from-query>"
+virtual-mailboxes "Today" "notmuch://?query=date:today"
+virtual-mailboxes "Flagged" "notmuch://?query=tag:flagged"
+virtual-mailboxes "FromMe" "notmuch://?query=from:matt@matthewlemon.com"
+set nm_db_limit = 5000
+#set nm_default_url = ""
+set nm_open_timeout = 5
+set nm_query_window_enable=yes
+set nm_query_window_duration=2
+set nm_query_window_timebase="month" # or "hour", "day", "week", "month", "year"
+set nm_query_window_or_terms="tag:unread and tag:flagged"
+# read entire thread of the current message
+bind index,pager + entire-thread
+# generate virtual folder from query
+#bind index,pager \cf vfolder-from-query
+bind index < vfolder-window-backward
+bind index > vfolder-window-forward
+
 
 # neomutt does not require notmuch-mutt, so this lot is commented out
 
diff --git a/vim/vimrc b/vim/vimrc
index 4e1d925..319ffd9 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -109,7 +109,8 @@ endfunction
 " }}}
 " Folding {{{
 if has('folding')
-	set foldmethod=marker
+	"set foldmethod=marker " default
+	set foldmethod=syntax
 "	set foldmarker=#\ {{{,#\ }}}
 	set viewoptions=folds,options,cursor,unix,slash
 endif