From 93830da481aa5c85799767d6617f5a0e88392fca Mon Sep 17 00:00:00 2001 From: luxagraf Date: Mon, 12 Dec 2022 10:28:32 -0600 Subject: dell: brought X11 setup up to par with sway --- .aliases | 9 ++-- .bashrc | 10 ++-- .config/khard/khard.conf | 55 +++++++++++++++++++ .config/ranger/bookmarks | 2 +- .config/vdirsyncer/config | 72 +++++++++++++++++++++++++ .gitconfig | 7 +++ .mutt/muttrc | 8 +-- .mutt/personal | 27 +++++----- .notmuch-config | 83 +++++++++++++++++++++++++++++ .photocopyrc | 2 +- .rsync-exclude-weekly | 8 ++- .tmux.conf | 1 + .vim/.netrwhist | 16 ++++-- arch.conf | 5 ++ colorbalancergb_colorcontrastboost.dtpreset | 2 + diffuse_clarity.dtpreset | 2 + diffuse_lc new 2.dtpreset | 2 + diffuse_lc new 3.dtpreset | 2 + diffuse_lc new.dtpreset | 2 + diffuse_local contrast 2.dtpreset | 2 + diffuse_local contrast 3.dtpreset | 2 + diffuse_local contrast small.dtpreset | 2 + 22 files changed, 284 insertions(+), 37 deletions(-) create mode 100644 .config/khard/khard.conf create mode 100644 .config/vdirsyncer/config create mode 100644 .gitconfig create mode 100644 .notmuch-config create mode 100644 arch.conf create mode 100644 colorbalancergb_colorcontrastboost.dtpreset create mode 100644 diffuse_clarity.dtpreset create mode 100644 diffuse_lc new 2.dtpreset create mode 100644 diffuse_lc new 3.dtpreset create mode 100644 diffuse_lc new.dtpreset create mode 100644 diffuse_local contrast 2.dtpreset create mode 100644 diffuse_local contrast 3.dtpreset create mode 100644 diffuse_local contrast small.dtpreset diff --git a/.aliases b/.aliases index b8b6956..c6d528f 100644 --- a/.aliases +++ b/.aliases @@ -1,8 +1,6 @@ # vi:syntax=sh # connect to wireless: -alias jp='sudo netctl start jetpack' -alias ngear='sudo netctl start netgear' alias egrep='egrep --color=auto' alias tmux="tmux -2" alias v="vim " @@ -64,6 +62,9 @@ alias remp4="~/./bin/rename_mp4_files.sh" alias mtsconvert="~/./bin/mts-convert.sh" alias findname='find . -name $1' +# convert GPR to DNG +alias gprtodng="~/./bin/gprtodng.sh" + #Django web dev alias virt='source venv/bin/activate' alias serve='python -m http.server' @@ -91,10 +92,6 @@ alias moon='python bin/moonphase.py' alias watchtraffic="nload wlp3s0" alias mt="vnstat -m" -# sync -alias ccgtodt="rsync -avvz --progress ~/pictures/nextcloud-ccg-phone/ ~/pictures/2020/00_phone/" -alias lxftodt="rsync -avvz --progress ~/pictures/nextcloud-lxf-phone/ ~/pictures/2020/00_phone/" - alias mntHFS="sudo mount -t hfsplus -o force,rw" # get battery info: diff --git a/.bashrc b/.bashrc index 7dbc903..2041337 100644 --- a/.bashrc +++ b/.bashrc @@ -1,7 +1,6 @@ #basics stty -ixon export MOZ_DBUS_REMOTE=1 -#alias vivaldi-snapshot="vivaldi-snapshot --use-gl=egl" export BROWSER="vivaldi-snapshot" export EDITOR="vim" # keep dictionaries in ~/bin/ @@ -128,11 +127,11 @@ function nvl(){ } #find in "notes" which might be in any of half a dozen folders -function fnt(){ +function fntt(){ find ~/notes ~/documents/bookmarks ~/documents/reading\ notes -type f -maxdepth 2 -print0 | xargs -0 grep -$2i $1 } -function fntt(){ - ${EDITOR:-nvim} "$(rg -l $1 ~/notes/ ~/documents/bookmarks/ ~/documents/reading\ notes/ | fzf --preview="bat {}" --preview-window=right:70%:wrap)"; +function fnt(){ + ${EDITOR:-nvim} "$(rg -l $1 ~/notes/ ~/documents/bookmarks/ ~/documents/reading\ notes/ ~/lux/ | fzf --preview="bat {}" --preview-window=right:70%:wrap)"; } #fuzzy find function f() { @@ -153,9 +152,6 @@ function tolux() { scp $3 $1 lxf:/home/lxf/$2 } -function todis() { - scp $3 $1 dis:/home/lxf/$2 -} function frlux() { scp $3 lxf:/home/lxf/$1 $2 } diff --git a/.config/khard/khard.conf b/.config/khard/khard.conf new file mode 100644 index 0000000..8a1d05f --- /dev/null +++ b/.config/khard/khard.conf @@ -0,0 +1,55 @@ +# example configuration file for khard version > 0.14.0 +# place it under ~/.config/khard/khard.conf +# This file is parsed by the configobj library. The syntax is described at +# https://configobj.readthedocs.io/en/latest/configobj.html#the-config-file-format + +[addressbooks] +[[personal]] +path = ~/.contacts/contacts/ +[[works]] +path = ~/.contacts/work/ + +[general] +debug = no +default_action = list +# These are either strings or comma seperated lists +editor = nvim, -i, NONE +merge_editor = vimdiff + +[contact table] +# display names by first or last name: first_name / last_name / formatted_name +display = first_name +# group by address book: yes / no +group_by_addressbook = no +# reverse table ordering: yes / no +reverse = no +# append nicknames to name column: yes / no +show_nicknames = no +# show uid table column: yes / no +show_uids = yes +# sort by first or last name: first_name / last_name / formatted_name +sort = last_name +# localize dates: yes / no +localize_dates = yes +# set a comma separated list of preferred phone number types in descending priority +# or nothing for non-filtered alphabetical order +preferred_phone_number_type = pref, cell, home +# set a comma separated list of preferred email address types in descending priority +# or nothing for non-filtered alphabetical order +preferred_email_address_type = pref, work, home + +[vcard] +# extend contacts with your own private objects +# these objects are stored with a leading "X-" before the object name in the vcard files +# every object label may only contain letters, digits and the - character +# example: +# private_objects = Jabber, Skype, Twitter +# default: , (the empty list) +private_objects = Jabber, Skype, Twitter +# preferred vcard version: 3.0 / 4.0 +preferred_version = 3.0 +# Look into source vcf files to speed up search queries: yes / no +search_in_source_files = no +# skip unparsable vcard files: yes / no +skip_unparsable = no + diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks index c568179..21d5de2 100644 --- a/.config/ranger/bookmarks +++ b/.config/ranger/bookmarks @@ -9,4 +9,4 @@ s:/home/lxf/sites/luxagraf.net c:/home/lxf/pictures/nextcloud-ccg-phone t:/home/lxf/temp p:/home/lxf/temp/wired -':/home/lxf/temp +':/home/lxf/.dotfiles diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config new file mode 100644 index 0000000..3077026 --- /dev/null +++ b/.config/vdirsyncer/config @@ -0,0 +1,72 @@ +# An example configuration for vdirsyncer. +# +# Move it to ~/.vdirsyncer/config or ~/.config/vdirsyncer/config and edit it. +# Run `vdirsyncer --help` for CLI usage. +# +# Optional parameters are commented out. +# This file doesn't document all available parameters, see +# http://vdirsyncer.pimutils.org/ for the rest of them. + +[general] +# A folder where vdirsyncer can store some metadata about each pair. +status_path = "~/.vdirsyncer/status/" + +# CARDDAV +[pair lxf_contacts] +# A `[pair ]` block defines two storages `a` and `b` that should be +# synchronized. The definition of these storages follows in `[storage ]` +# blocks. This is similar to accounts in OfflineIMAP. +a = "lxf_contacts_local" +b = "lxf_contacts_remote" + +# Synchronize all collections that can be found. +# You need to run `vdirsyncer discover` if new calendars/addressbooks are added +# on the server. + +collections = ["from a", "from b"] + +# Synchronize the "display name" property into a local file (~/.contacts/displayname). +metadata = ["displayname"] + +# To resolve a conflict the following values are possible: +# `null` - abort when collisions occur (default) +# `"a wins"` - assume a's items to be more up-to-date +# `"b wins"` - assume b's items to be more up-to-date +conflict_resolution = "b wins" + +[storage lxf_contacts_local] +# A storage references actual data on a remote server or on the local disk. +# Similar to repositories in OfflineIMAP. +type = "filesystem" +path = "~/.contacts/" +fileext = ".vcf" + +[storage lxf_contacts_remote] +type = "carddav" +url = "https://cloud.luxagraf.net/remote.php/carddav/" +username="luxagraf" +# The password can also be fetched from the system password storage, netrc or a +# custom command. See http://vdirsyncer.pimutils.org/en/stable/keyring.html +password.fetch = ["command", "pass", "cloud.luxagraf.net"] + +# CALDAV +[pair lxf_calendar] +a = "lxf_calendar_local" +b = "lxf_calendar_remote" +collections = ["from a", "from b"] + +# Calendars also have a color property +metadata = ["displayname", "color"] + +[storage bob_calendar_local] +type = "filesystem" +path = "~/.calendars/" +fileext = ".ics" + +[storage lxf_calendar_remote] +type = "caldav" +url = "https://cloud.luxagraf.net/remote.php/carddav/" +username="luxagraf" +# The password can also be fetched from the system password storage, netrc or a +# custom command. See http://vdirsyncer.pimutils.org/en/stable/keyring.html +password = "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/cloud.luxagraf.net.gpg" diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..357500b --- /dev/null +++ b/.gitconfig @@ -0,0 +1,7 @@ +[user] + email = sng@luxagraf.net + name = luxagraf +[gpg] + program = gpg2 +[pull] + rebase = false diff --git a/.mutt/muttrc b/.mutt/muttrc index ee7f6ba..b93fdb7 100644 --- a/.mutt/muttrc +++ b/.mutt/muttrc @@ -63,7 +63,7 @@ bind index collapse-thread macro index \Cr "T~UN." "mark all messages as read" # Sync email -macro index O "mbsync personal" "run mbsync to sync all mail" +macro index O "mbsync personal notmuch new" "run mbsync to sync all mail" macro index o "mbsync personal:INBOX" "run mbsync to sync inbox" # Saner copy/move dialogs @@ -78,6 +78,7 @@ macro index,pager ga "=Archive" "Go to all mail" macro index,pager gb "=Bookmarks" "Go to Bookmarks" macro index,pager gt "=Starred" "Go to starred messages" macro index,pager gs "=Sent" "Go to starred messages" +macro index ,n "" "Go to new mail" #Save a message to my notes folder macro index,pager N "~/bin/mqq.sh " @@ -141,7 +142,7 @@ bind compose p postpone-message bind index p recall-message #set query_command = "contacts -Sf '%eTOKEN%n' '%s' | sed -e 's/TOKEN/\t/g'" -set query_command = "abook --mutt-query '%s'" +set query_command = "khard email --parsable %s" bind editor complete-query bind editor ^T complete set editor="vim -c 'set spell spelllang=en'" @@ -154,8 +155,7 @@ macro index S "unset wait_keynotmuch-mutt -- macro index "unset wait_keynotmuch-mutt thread`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`set wait_key" "notmuch: reconstruct thread" -#macro generic,index,pager \ca "abook" "launch abook" -macro index,pager A "abook --add-email" "add the sender address to abook" +macro index,pager A "khard add-email" "add the sender email address to khard" set spoolfile = "+INBOX" source ~/.mutt/personal diff --git a/.mutt/personal b/.mutt/personal index e90d825..b727bb6 100644 --- a/.mutt/personal +++ b/.mutt/personal @@ -18,17 +18,20 @@ mailboxes =INBOX \ +Bookmarks \ +Darktable \ +Sent \ - +'Old Mail.2008' \ - +'Old Mail.2009' \ - +'Old Mail.2010' \ - +'Old Mail.2011' \ - +'Old Mail.2012' \ - +'Old Mail.2013' \ - +'Old Mail.2014' \ - +'Old Mail.2015' \ - +'Old Mail.2016' \ - +'Old Mail.2017' \ - +'Old Mail.2018' \ - +'Old Mail.2019' \ + +Starred \ + +Old\ Mail/2008 \ + +Old\ Mail/2009 \ + +Old\ Mail/2010 \ + +Old\ Mail/2011 \ + +Old\ Mail/2012 \ + +Old\ Mail/2013 \ + +Old\ Mail/2014 \ + +Old\ Mail/2015 \ + +Old\ Mail/2016 \ + +Old\ Mail/2017 \ + +Old\ Mail/2018 \ + +Old\ Mail/2019 \ + +Old\ Mail/2020 \ + +Old\ Mail/2021 \ +Drafts \ +temporary/search diff --git a/.notmuch-config b/.notmuch-config new file mode 100644 index 0000000..de819c7 --- /dev/null +++ b/.notmuch-config @@ -0,0 +1,83 @@ +# .notmuch-config - Configuration file for the notmuch mail system +# +# For more information about notmuch, see https://notmuchmail.org + +# Database configuration +# +# The only value supported here is 'path' which should be the top-level +# directory where your mail currently exists and to where mail will be +# delivered in the future. Files should be individual email messages. +# Notmuch will store its database within a sub-directory of the path +# configured here named ".notmuch". +# +[database] +path=/home/lxf/.mail + +# User configuration +# +# Here is where you can let notmuch know how you would like to be +# addressed. Valid settings are +# +# name Your full name. +# primary_email Your primary email address. +# other_email A list (separated by ';') of other email addresses +# at which you receive email. +# +# Notmuch will use the various email addresses configured here when +# formatting replies. It will avoid including your own addresses in the +# recipient list of replies, and will set the From address based on the +# address to which the original email was addressed. +# +[user] +name=Scott Gilbertson +primary_email=sng@luxagraf.net + +# Configuration for "notmuch new" +# +# The following options are supported here: +# +# tags A list (separated by ';') of the tags that will be +# added to all messages incorporated by "notmuch new". +# +# ignore A list (separated by ';') of file and directory names +# that will not be searched for messages by "notmuch new". +# +# NOTE: *Every* file/directory that goes by one of those +# names will be ignored, independent of its depth/location +# in the mail store. +# +[new] +ignore=.mbsyncstate;.uidvalidity +# Search configuration +# +# The following option is supported here: +# +# exclude_tags +# A ;-separated list of tags that will be excluded from +# search results by default. Using an excluded tag in a +# query will override that exclusion. +# +[search] + +# Maildir compatibility configuration +# +# The following option is supported here: +# +# synchronize_flags Valid values are true and false. +# +# If true, then the following maildir flags (in message filenames) +# will be synchronized with the corresponding notmuch tags: +# +# Flag Tag +# ---- ------- +# D draft +# F flagged +# P passed +# R replied +# S unread (added when 'S' flag is not present) +# +# The "notmuch new" command will notice flag changes in filenames +# and update tags, while the "notmuch tag" and "notmuch restore" +# commands will notice tag changes and update flags in filenames +# +[maildir] diff --git a/.photocopyrc b/.photocopyrc index 27cd2fd..1ba2dcf 100644 --- a/.photocopyrc +++ b/.photocopyrc @@ -1 +1 @@ -DSC06612.ARW \ No newline at end of file +DSC08601.ARW \ No newline at end of file diff --git a/.rsync-exclude-weekly b/.rsync-exclude-weekly index 7599fc2..52f73ac 100644 --- a/.rsync-exclude-weekly +++ b/.rsync-exclude-weekly @@ -1,4 +1,3 @@ - .cache/ venv/ .DS_Store @@ -23,3 +22,10 @@ cache/ .thunderbird/ bin/venv bin/venv3 +.conan/ +.config/qwired/ +.config/vivaldi-snapshot/Default/Service Worker/ +.config/vivaldi/Default/Service Worker/ +.config/vivaldi-snapshot/Profile\ 1/Service Worker/ +.config/vivaldi/Profile\ 1/Service Worker/ +.cargo/ diff --git a/.tmux.conf b/.tmux.conf index 0edffb9..43e0da7 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -55,6 +55,7 @@ bind C-f source-file ~/.tmux/write-fict bind C-x source-file ~/.tmux/write-lux bind C-w source-file ~/.tmux/write-wire bind C-d source-file ~/.tmux/dev +bind C-l source-file ~/.tmux/dev-lbh #set -g status-left-length 52 set -g status-right-length 451 diff --git a/.vim/.netrwhist b/.vim/.netrwhist index 52155a1..b65ebeb 100644 --- a/.vim/.netrwhist +++ b/.vim/.netrwhist @@ -1,6 +1,12 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhistcnt =4 -let g:netrw_dirhist_4='/home/lxf' -let g:netrw_dirhist_3='/home/lxf/.dotfiles/.config/ranger' -let g:netrw_dirhist_2='/home/lxf/.config/ranger' -let g:netrw_dirhist_1='/home/lxf/.dotfiles/.config/qutebrowser' +let g:netrw_dirhistcnt =8 +let g:netrw_dirhist_8='/home/lxf/dotfilesway' +let g:netrw_dirhist_7='/home/lxf/.dotfiles' +let g:netrw_dirhist_6='/home/lxf/.dotfiles/.config' +let g:netrw_dirhist_5='/home/lxf/dotfilesway/.config' +let g:netrw_dirhist_4='/home/lxf/.dotfiles/.config' +let g:netrw_dirhist_3='/home/lxf/dotfilesway/.config' +let g:netrw_dirhist_2='/home/lxf/.dotfiles/.config' +let g:netrw_dirhist_1='/home/lxf/dotfilesway' +let g:netrw_dirhist_0='/home/lxf/.dotfiles' +let g:netrw_dirhist_9='/home/lxf/dotfilesway/.mutt' diff --git a/arch.conf b/arch.conf new file mode 100644 index 0000000..ebecddb --- /dev/null +++ b/arch.conf @@ -0,0 +1,5 @@ +title Arch Linux +linux /vmlinuz-linux +initrd /intel-ucode.img +initrd /initramfs-linux.img +options root="LABEL=arch_os" rw mem_sleep_default=deep systemd.unified_cgroup_hierarchy=0 diff --git a/colorbalancergb_colorcontrastboost.dtpreset b/colorbalancergb_colorcontrastboost.dtpreset new file mode 100644 index 0000000..cc26c36 --- /dev/null +++ b/colorbalancergb_colorcontrastboost.dtpreset @@ -0,0 +1,2 @@ + +color contrast boostcolorbalancergbgz03eJxjYCAVNNij0gwMZ8/42MHYBT/793Kcm2l75zqjHYzvwcMEl5/41sYuYcYZWxDdYLbaBgCjbRTM410%%%0.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.00000001000gz10eJxjYGBgYAFiCQYYOOHEgAZY0QVwggZ7CB6pfOygYtaVAyCMi08IAAB/xiOk110007 diff --git a/diffuse_clarity.dtpreset b/diffuse_clarity.dtpreset new file mode 100644 index 0000000..c1e76db --- /dev/null +++ b/diffuse_clarity.dtpreset @@ -0,0 +1,2 @@ + +claritydiffuse020000000000000020000000000040400000000000008040000080400000804000008040000000000000803f0000803f0000803f0000803f00000000210%%%0.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.00000001000gz09eJxjZ2BgYIHikn3r9zMwiDgxQAEjlGZlIAY02CMwuthI4WMHFbOuHABhXHxCAAB+vCZD110007 diff --git a/diffuse_lc new 2.dtpreset b/diffuse_lc new 2.dtpreset new file mode 100644 index 0000000..65bbc3f --- /dev/null +++ b/diffuse_lc new 2.dtpreset @@ -0,0 +1,2 @@ + +lc new 2diffuse02000000b81e053e000200008ec2753da070bd3ec0648a3e00f0963d000000000086c93c00000000000000bfd4c5edbe000000001851fabe00020000210%%%0.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.00000001000gz08eJxjZ2BgYAFiCQYYOOEEYzECsbHxNidWBsLgxrVrdgwMDfYQDAMjjY8dVMy6cgCEcfEJAQBZsyfM110007 diff --git a/diffuse_lc new 3.dtpreset b/diffuse_lc new 3.dtpreset new file mode 100644 index 0000000..cb3e588 --- /dev/null +++ b/diffuse_lc new 3.dtpreset @@ -0,0 +1,2 @@ + +lc new 3diffuse080000000000000000020000000000400000000000000040000080400000004000008040000000009a9999be9a99193e0c2d72be208e353e01000000210%%%0.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.00000001000gz08eJxjZ2BgYAFiCQYYOOEEYzFCaVYGwmDpEhU7BoYGewiGgZHGxw4qZl05AMK4+IQAAM+2JVc=110007 diff --git a/diffuse_lc new.dtpreset b/diffuse_lc new.dtpreset new file mode 100644 index 0000000..38939b7 --- /dev/null +++ b/diffuse_lc new.dtpreset @@ -0,0 +1,2 @@ + +lc newdiffuse020000000000000000020000a370bd3e5c8f42bf0000000000000000000000000000000000000000000000bf0000000000000000000000bf00020000210%%%0.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.00000001000gz08eJxjZ2BgYAFiCQYYOOEEYzECsbHxNidWBsLgxrVrdgwMDfYQDAMjjY8dVMy6cgCEcfEJAQBZsyfM110007 diff --git a/diffuse_local contrast 2.dtpreset b/diffuse_local contrast 2.dtpreset new file mode 100644 index 0000000..1974e5d --- /dev/null +++ b/diffuse_local contrast 2.dtpreset @@ -0,0 +1,2 @@ + +local contrast 2diffuse0200000000000000000200000000004000000000000080c0000080c0000080c00000804000000000f0633cbf512740bf3de839bf6098ec3e80000000210%%%0.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.00000001000gz08eJxjZ2BgYAFiCQYYOOEEYzFCaVYGwuDUCQ87BoYGewiGgZHGxw4qZl05AMK4+IQAAGOFJcQ=110007 diff --git a/diffuse_local contrast 3.dtpreset b/diffuse_local contrast 3.dtpreset new file mode 100644 index 0000000..607ae5f --- /dev/null +++ b/diffuse_local contrast 3.dtpreset @@ -0,0 +1,2 @@ + +local contrast 3diffuse040000000000000000020000285c0f40000000000000000000000000000000000000000000000000fc6537bf716841bf5b2031bf5b2031bfff010000210%%%0.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.00000001000gz08eJxjZ2BgYAFiCQYYOOEEYzEC8dkzrU6sDITBgvny9gwMDVAMAyONjx1UzLpyAIRx8QkBAFPaJ6k=110007 diff --git a/diffuse_local contrast small.dtpreset b/diffuse_local contrast small.dtpreset new file mode 100644 index 0000000..401da48 --- /dev/null +++ b/diffuse_local contrast small.dtpreset @@ -0,0 +1,2 @@ + +local contrast smalldiffuse0400000000000000000100000000604000000000000080c0000080c0000080c00000804000000000000000bfdaf99ebeb050ebbd0000803e00000000210%%%0.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.0000000.000000340282346638528859811704183484516925440.00000001000gz10eJxjYGBgYAFiCQYYOOHEgAZY0QVwggZ7CB6pfOygYtaVAyCMi08IAAB/xiOk110007 -- cgit v1.2.3-70-g09d2