From 92f86ef00ca2acddb7bf69c3043d65e91fc8330a Mon Sep 17 00:00:00 2001 From: Jeff LANCE Date: Sat, 27 Mar 2021 17:02:24 +0100 Subject: [PATCH] update confs --- conf/abcde.conf | 4 +- conf/editorconfig | 3 +- conf/gitignore.global | 2 +- conf/mbsyncrc | 88 +++++++++++++++++++++---------------------- conf/tmux.conf.local | 2 +- 5 files changed, 50 insertions(+), 49 deletions(-) diff --git a/conf/abcde.conf b/conf/abcde.conf index f54048c..7f2be1e 100644 --- a/conf/abcde.conf +++ b/conf/abcde.conf @@ -377,8 +377,8 @@ CDROM=/dev/sr0 # If you'd like to make a default location that overrides the current # directory for putting mp3's, uncomment this. #OUTPUTDIR=`pwd` -#OUTPUTDIR="$HOME/Musique/todo" -OUTPUTDIR="/mnt/diskstation1/music" +OUTPUTDIR="$HOME/Musique" +# OUTPUTDIR="/mnt/diskstation1/music" # Or if you'd just like to put the temporary .wav files somewhere else # you can specify that here diff --git a/conf/editorconfig b/conf/editorconfig index 21cb651..872a276 100644 --- a/conf/editorconfig +++ b/conf/editorconfig @@ -13,7 +13,7 @@ insert_final_newline = true trim_trailing_whitespace = true indent_style = space indent_size = 2 -max_line_length = 80 +max_line_length = off charset = utf-8 [{Makefile,makefile,*.mk}] @@ -21,6 +21,7 @@ indent_style = tab [*.md] indent_style = space +max_line_length = 100 [*.py] indent_style = space diff --git a/conf/gitignore.global b/conf/gitignore.global index 2f4b2d2..c6b32da 100644 --- a/conf/gitignore.global +++ b/conf/gitignore.global @@ -53,7 +53,7 @@ flycheck_*.el # Compiled source # ################### -*.com +# *.com *.class *.dll *.exe diff --git a/conf/mbsyncrc b/conf/mbsyncrc index a7c2ccd..f9a9296 100644 --- a/conf/mbsyncrc +++ b/conf/mbsyncrc @@ -10,7 +10,7 @@ CopyArrivalDate yes # Automatically create missing mailboxes, # both locally and on the server -Create Slave +Create Near @@ -50,50 +50,50 @@ Inbox ~/Mail/jeff.lance@mala.fr/inbox Channel jeff.lance@mala.fr-inbox -Master :jeff.lance@mala.fr-remote:"Inbox" -Slave :jeff.lance@mala.fr-local:inbox +Far :jeff.lance@mala.fr-remote: +Near :jeff.lance@mala.fr-local:inbox Sync PullNew PullDelete Push SyncState * Expunge Both Channel jeff.lance@mala.fr-sent -Master :jeff.lance@mala.fr-remote:"Sent Items" -Slave :jeff.lance@mala.fr-local:sent +Far :jeff.lance@mala.fr-remote:"Sent Items" +Near :jeff.lance@mala.fr-local:sent Sync PullNew PullDelete Push SyncState * Expunge Both Channel jeff.lance@mala.fr-trash -Master :jeff.lance@mala.fr-remote:"Deleted Items" -Slave :jeff.lance@mala.fr-local:trash +Far :jeff.lance@mala.fr-remote:"Deleted Items" +Near :jeff.lance@mala.fr-local:trash Sync PullNew PullDelete Push SyncState * Expunge Both Channel jeff.lance@mala.fr-drafts -Master :jeff.lance@mala.fr-remote:"Drafts" -Slave :jeff.lance@mala.fr-local:drafts +Far :jeff.lance@mala.fr-remote:"Drafts" +Near :jeff.lance@mala.fr-local:drafts Sync PullNew PullDelete Push SyncState * Expunge Both Channel jeff.lance@mala.fr-junk -Master :jeff.lance@mala.fr-remote:"Junk Email" -Slave :jeff.lance@mala.fr-local:junk +Far :jeff.lance@mala.fr-remote:"Junk Email" +Near :jeff.lance@mala.fr-local:junk Sync PullNew PullDelete Push SyncState * Expunge Both Channel jeff.lance@mala.fr-archives -Master :jeff.lance@mala.fr-remote:"Archives" -Slave :jeff.lance@mala.fr-local:archives +Far :jeff.lance@mala.fr-remote:"Archives" +Near :jeff.lance@mala.fr-local:archives Pattern * -Create Slave +Create Near MaxMessages 500 Sync New Delete Push SyncState * @@ -139,40 +139,40 @@ Inbox ~/Mail/games@mala.fr/inbox Channel games@mala.fr-inbox -Master :games@mala.fr-remote:"Inbox" -Slave :games@mala.fr-local:inbox +Far :games@mala.fr-remote: +Near :games@mala.fr-local:inbox Sync PullNew PullDelete Push SyncState * Expunge Both Channel games@mala.fr-sent -Master :games@mala.fr-remote:"Sent Items" -Slave :games@mala.fr-local:sent +Far :games@mala.fr-remote:"Sent Items" +Near :games@mala.fr-local:sent Sync PullNew PullDelete Push SyncState * Expunge Both Channel games@mala.fr-trash -Master :games@mala.fr-remote:"Deleted Items" -Slave :games@mala.fr-local:trash +Far :games@mala.fr-remote:"Deleted Items" +Near :games@mala.fr-local:trash Sync PullNew PullDelete Push SyncState * Expunge Both Channel games@mala.fr-drafts -Master :games@mala.fr-remote:"Drafts" -Slave :games@mala.fr-local:drafts +Far :games@mala.fr-remote:"Drafts" +Near :games@mala.fr-local:drafts Sync PullNew PullDelete Push SyncState * Expunge Both Channel games@mala.fr-junk -Master :games@mala.fr-remote:"Junk Email" -Slave :games@mala.fr-local:junk +Far :games@mala.fr-remote:"Junk Email" +Near :games@mala.fr-local:junk Sync PullNew PullDelete Push SyncState * Expunge Both @@ -211,30 +211,30 @@ Path ~/Mail/jean-francois.lance@ac-creteil.fr/ Inbox ~/Mail/jean-francois.lance@ac-creteil.fr/inbox Channel jean-francois.lance@ac-creteil.fr-inbox -Master :jean-francois.lance@ac-creteil.fr-remote: -Slave :jean-francois.lance@ac-creteil.fr-local: +Far :jean-francois.lance@ac-creteil.fr-remote: +Near :jean-francois.lance@ac-creteil.fr-local: Patterns "INBOX" Sync PullNew PullDelete Push SyncState * Expunge Both Channel jean-francois.lance@ac-creteil.fr-sent -Master :jean-francois.lance@ac-creteil.fr-remote:"Sent" -Slave :jean-francois.lance@ac-creteil.fr-local:sent +Far :jean-francois.lance@ac-creteil.fr-remote:"Sent" +Near :jean-francois.lance@ac-creteil.fr-local:sent Sync PullNew PullDelete Push SyncState * Expunge Both Channel jean-francois.lance@ac-creteil.fr-trash -Master :jean-francois.lance@ac-creteil.fr-remote:"Trash" -Slave :jean-francois.lance@ac-creteil.fr-local:trash +Far :jean-francois.lance@ac-creteil.fr-remote:"Trash" +Near :jean-francois.lance@ac-creteil.fr-local:trash Sync PullNew PullDelete Push SyncState * Expunge Both Channel jean-francois.lance@ac-creteil.fr-drafts -Master :jean-francois.lance@ac-creteil.fr-remote:"Drafts" -Slave :jean-francois.lance@ac-creteil.fr-local:drafts +Far :jean-francois.lance@ac-creteil.fr-remote:"Drafts" +Near :jean-francois.lance@ac-creteil.fr-local:drafts Sync PullNew PullDelete Push SyncState * Expunge Both @@ -272,34 +272,34 @@ Channel jean-francois.lance@ac-creteil.fr-drafts #Inbox ~/Mail/jean-francois.lance@ac-montpellier.fr/INBOX #Channel jean-francois.lance@ac-montpellier.fr-inbox -#Master :jean-francois.lance@ac-montpellier.fr-remote: -#Slave :jean-francois.lance@ac-montpellier.fr-local: +#Far :jean-francois.lance@ac-montpellier.fr-remote: +#Near :jean-francois.lance@ac-montpellier.fr-local: #Patterns "INBOX" #Expunge Both #Channel jean-francois.lance@ac-montpellier.fr-sent -#Master :jean-francois.lance@ac-montpellier.fr-remote:"Sent" -#Slave :jean-francois.lance@ac-montpellier.fr-local:SENT +#Far :jean-francois.lance@ac-montpellier.fr-remote:"Sent" +#Near :jean-francois.lance@ac-montpellier.fr-local:SENT #Expunge Both #Channel jean-francois.lance@ac-montpellier.fr-trash -#Master :jean-francois.lance@ac-montpellier.fr-remote:"Trash" -#Slave :jean-francois.lance@ac-montpellier.fr-local:TRASH +#Far :jean-francois.lance@ac-montpellier.fr-remote:"Trash" +#Near :jean-francois.lance@ac-montpellier.fr-local:TRASH #Expunge Both #Channel jean-francois.lance@ac-montpellier.fr-drafts -#Master :jean-francois.lance@ac-montpellier.fr-remote:"Drafts" -#Slave :jean-francois.lance@ac-montpellier.fr-local:DRAFTS +#Far :jean-francois.lance@ac-montpellier.fr-remote:"Drafts" +#Near :jean-francois.lance@ac-montpellier.fr-local:DRAFTS #Expunge Both #Channel jean-francois.lance@ac-montpellier.fr-spams -#Master :jean-francois.lance@ac-montpellier.fr-remote:"Spams" -#Slave :jean-francois.lance@ac-montpellier.fr-local:SPAMS +#Far :jean-francois.lance@ac-montpellier.fr-remote:"Spams" +#Near :jean-francois.lance@ac-montpellier.fr-local:SPAMS #Expunge Both #Channel jean-francois.lance@ac-montpellier.fr-archives -#Master :jean-francois.lance@ac-montpellier.fr-remote:"Archives" -#Slave :jean-francois.lance@ac-montpellier.fr-local:ARCHIVES +#Far :jean-francois.lance@ac-montpellier.fr-remote:"Archives" +#Near :jean-francois.lance@ac-montpellier.fr-local:ARCHIVES #Patterns * #Group jean-francois.lance@ac-montpellier.fr diff --git a/conf/tmux.conf.local b/conf/tmux.conf.local index 1ac7d6b..575b1dc 100644 --- a/conf/tmux.conf.local +++ b/conf/tmux.conf.local @@ -305,7 +305,7 @@ tmux_conf_theme_clock_style="24" # - false (default) # on macOS, this requires installing reattach-to-user-namespace, see README.md # on Linux, this requires xsel or xclip -tmux_conf_copy_to_os_clipboard=false +tmux_conf_copy_to_os_clipboard=true # -- user customizations -------------------------------------------------------