.chezmoiexternal.toml

@@ -1,29 +0,0 @@
-[".config/i3/"]
-    type = "git-repo"
-    url = "git@git.arachnitech.com:kellya/i3-config.git"
-    refreshPeriod = "168h"
-
-[".taskwarrior_aliases/"]
-    type = "git-repo"
-    url = "git@git.arachnitech.com:kellya/twalias.git"
-    refreshPeriod = "168h"
-
-[".config/task/hooks"]
-    type = "git-repo"
-    url = "git@git.arachnitech.com:kellya/taskwarrior_hooks.git"
-    refreshPeriod = "168h"
-
-[".config/swaync"]
-    type = "git-repo"
-    url = "git@git.arachnitech.com:kellya/swaync-config.git"
-    refreshPeriod = "168h"
-
-[".config/sway"]
-    type = "git-repo"
-    url = "git@git.arachnitech.com:kellya/sway-config.git"
-    refreshPeriod = "168h"
-
-[".config/waybar"]
-    type = "git-repo"
-    url = "git@git.arachnitech.com:kellya/waybar-config.git"
-    refreshPeriod = "168h"

.chezmoiignore

@@ -1 +0,0 @@
-README.md

.direnvrc

@@ -0,0 +1,9 @@
+layout_virtualenv() {
+  local venv_path="$1"
+  source ${venv_path}/bin/activate
+}
+
+layout_virtualenvwrapper() {
+  local venv_path="${WORKON_HOME}/$1"
+  layout_virtualenv $venv_path
+}

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "zsh/zsh-git-prompt"]
+	path = zsh/zsh-git-prompt
+	url = https://github.com/olivierverdier/zsh-git-prompt.git

README.md

@@ -1,7 +1,10 @@
-# dotfiles
+# My Dotfiles
 
-The repo to track all my dotfiles changes.
+Here are my configuration files that I use on my system.  I use Vundle (https://github.com/gmarik/Vundle.vim) for all of my plugin management, so in order to get most of the things working, you need to have that installed first.
 
-Old changes are my "homegrown symlink" solution that are in the *master* branch.
 
-Changes moving forward are in the *main* branch and are tracked with chezmois.
+## File Naming
+
+You should clone this to your home directory, and then create a symlink for the files.  For example, if you want to use my .vimrc, you would:
+
+    ln -s ~/dotfiles/vim/vimrc .vimrc

direnv/direnvrc

@@ -0,0 +1,9 @@
+layout_virtualenv() {
+    local venv_path="$1"
+    source ${venv_path}/bin/activate
+}
+
+layout_virtualenvwrapper() {
+    local venv_path="${WORKON_HOME}/$1"
+    layout_virtualenv $venv_path
+}

dot_bashrc

@@ -1,31 +0,0 @@
-# .bashrc
-
-# Source global definitions
-if [ -f /etc/bashrc ]; then
-	. /etc/bashrc
-fi
-
-# User specific environment
-if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]
-then
-    PATH="$HOME/.local/bin:$HOME/bin:$PATH"
-fi
-export PATH
-
-# Uncomment the following line if you don't like systemctl's auto-paging feature:
-# export SYSTEMD_PAGER=
-
-# User specific aliases and functions
-if [ -d ~/.bashrc.d ]; then
-	for rc in ~/.bashrc.d/*; do
-		if [ -f "$rc" ]; then
-			. "$rc"
-		fi
-	done
-fi
-
-unset rc
-
-# Hishtory Config:
-export PATH="$PATH:/home/kellya/.hishtory"
-source /home/kellya/.hishtory/config.sh

dot_config/direnv/direnvrc

@@ -1,29 +0,0 @@
-layout_hatch() {
-    if [[ ! -f "pyproject.toml" ]]; then
-        if [[ ! -f "setup.py" ]]; then
-            local tmpdir
-            log_status "No pyproject.toml or setup.py found. Executing \`hatch new\` to create a new project."
-            PROJECT_NAME=$(basename $PWD)
-            tmpdir="$(mktemp -d)"
-            hatch new $PROJECT_NAME $tmpdir > /dev/null
-            cp -a --no-clobber $tmpdir/* . && rm -rf $tmpdir
-        else
-            # I haven't yet seen a case where migrating from an existing `setup.py` works, but I'm sure there are some.
-            log_status "No pyproject.toml found. Executing \`hatch new --init\` to migrate from setuptools."
-            hatch new --init || log_error "Failed to migrate from setuptools. Please fix and run \`hatch new --init\` manually." && return 1
-        fi
-    fi
-
-    HATCH_ENV=${HATCH_ENV_ACTIVE:-default}
-    # We need this to error out if the env doesn't exist in the pyproject.toml file.
-    VIRTUAL_ENV=$(hatch env find $HATCH_ENV)
-
-    if [[ ! -d $VIRTUAL_ENV ]]; then
-        log_status "No virtual environment exists. Executing \`hatch env create\` to create one."
-        hatch env create $HATCH_ENV
-    fi
-
-    PATH_add "$VIRTUAL_ENV/bin"
-    export HATCH_ENV_ACTIVE=$HATCH_ENV
-    export VIRTUAL_ENV
-}

dot_config/git/ignore

@@ -1 +0,0 @@
-.idea

dot_config/khal/config

@@ -1,16 +0,0 @@
-[calendars]
-
-[[franklin_calendar_local]]
-path = ~/.calendars/*
-type = discover
-
-[[franklin_contacts_local]]
-path = ~/.contacts/*
-type = discover
-
-[locale]
-timeformat = %H:%M
-dateformat = %Y-%m-%d
-longdateformat = %Y-%m-%d
-datetimeformat = %Y-%m-%d %H:%M
-longdatetimeformat = %Y-%m-%d %H:%M

dot_config/khard/khard.conf

@@ -1,52 +0,0 @@
-# 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]
-[[franklin]]
-path = ~/.contacts/contacts
-
-[general]
-debug = no
-default_action = list
-# These are either strings or comma seperated lists
-editor = vim, -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

dot_config/kmonad/config.kbd

@@ -1,81 +0,0 @@
-#| -------------------------------------------------------------------------
-(deflayer template
-   _    _   _     _    _    _    _    _     _    _    _    _    _    _   _  _
-   _    _   _     _    _    _    _    _     _    _    _    _    _    _ 
-   _    _   _     _    _    _    _    _     _    _    _    _    _    _
-   _    _   _     _    _    _    _    _     _    _    _    _    _
-   _    _   _     _    _    _    _    _     _    _    _    _
-   _    _   _                       _            _    _    _    _
----------------------------------------------------------------------------- |#
-(defcfg
-  input  (device-file "/dev/input/by-path/platform-i8042-serio-0-event-kbd")
-  output (uinput-sink "My KMonad output"
-    ;; To understand the importance of the following line, see the section on
-    ;; Compose-key sequences at the near-bottom of this file.
-    "/usr/bin/sleep 1 && /usr/bin/setxkbmap -option compose:ralt")
-  cmp-seq ralt    ;; Set the compose key to `RightAlt'
-  cmp-seq-delay 5 ;; 5ms delay between each compose-key sequence press
-
-  fallthrough true
-
-  allow-cmd true
-)
-
-(defsrc
-  esc  f1  f2   f3   f4   f5   f6   f7    f8   f9 f10  f11  f12 ins prnt   del
-  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc 
-  tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
-  caps a    s    d    f    g    h    j    k    l    ;    '    ret
-  lsft z    x    c    v    b    n    m    ,    .    /    rsft
-  lctl lmet lalt           spc            ralt rmet cmp  rctl
-)
-
-(defalias
- std (layer-switch standard_layer)
- num (layer-toggle numbers)
- snum (layer-switch numbers)
- cole (layer-toggle colemak)
- scole (layer-switch colemak)
- cesc (tap-next esc lctl)
- dmenu (around lmet d)
- superd (tap-next @dmenu lmet)
- f12 (tap-next @snum @num)
- dat (tap-macro (cmd-button "date |xclip") C-V)
- tim (tap-macro (cmd-button "date \"+%Y-%m-%d %H:%M:%S\"|xclip") C-V)
- )
-
-(deflayer standard_layer
-  esc  @std f2   f3   f4   f5   f6  f7   f8   f9   f10  f11  f12  _   _  _
-  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc 
-  tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
-  @cesc a    s    d    f    g    h    j    k    l    ;    '    ret
-  lsft z    x    c    v    b    n    m    ,    .    /    rsft
-  lctl lmet lalt           spc            ralt rmet cmp  rctl
-)
-
-(deflayer numbers
-  esc  @std f2   f3   f4   f5   f6  f7  vold  volu f10  f11    @std  _   _  _
-  _  _  _   _   _   _   _    7    8    9    0    -    =    _
-  _  _  _   _   _   _   _    4    5    6    p    [    ]    \
-  _  _  _   -   _  \(   \)    1    2    3    ;    '    ret
-  _  _  _   _   _   _   _    0    ,    .    /    _
-  _ _ _           _            _ _ _  _
-)
-
-(deflayer colemak
-  esc @std  _    _      _   _   _    _    _    _    _    _   @std ins prnt del
-  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc 
-  tab  q    w    f    p    g    j    l    u    y   ;    [    ]    \
-  @cesc a   r    s    t    d    h    n    e    i   o    '    ret
-  lsft z    x    c    v    b    k    m    ,    .    /    rsft
-  lctl lmet lalt           spc            ralt rmet cmp  rctl
-  )
-
-(deflayer date
-   _    _   _     _    _    _    _    _     _    _    _    _    _    _   _  _
-   _    _   _     _    _    _    _    _     _    _    _    _    _    _ 
-   _    _   _     _    _    @tim _    _     _    _    _    _    _    _
-   _    _   _     @dat _    _    _    _     _    _    _    _    _
-   _    _   _     _    _    _    _    _     _    _    _    _
-   _    _   _                       _            _    _    _    _
-)

dot_config/task/gtd

@@ -1,50 +0,0 @@
-#Collection
-report.in.columns           = id,description
-report.in.description       = Inbox
-report.in.filter            = status:pending limit:page (+in)
-report.in.labels            = ID,Description
-
-
-#Reports
-
-#Next
-#report.next.description     = Most urgent tasks
-#report.next.columns         = id,urgency,depends,priority,project,tags,recur,scheduled.countdown,due.remaining,until.remaining,description
-#report.next.filter          = status:pending -sdm
-#report.next.labels          = ID,Urgency,Depends,Priority,Project,Tag,Recur,Scheduled,Due,Until,Description
-#report.next.sort            = project-,priority-,urgency-
-
-#Someday/Maybe
-report.sdm.description     = Someday/Maybe
-report.sdm.columns         = id,urgency,depends,priority,project,tags,recur,scheduled.countdown,due.remaining,until.remaining,description
-report.sdm.filter          = status:pending +sdm
-report.sdm.labels          = ID,Urgency,Depends,Priority,Project,Tag,Recur,Scheduled,Due,Until,Description
-
-#No Next action
-report.nna.description     = No Next Action
-report.nna.columns         = project
-report.nna.filter          = +PENDING +READY -next -waiting -sdm
-report.nna.labels          = Project
-
-#context.car=+@car or +@online or +@phone
-#context.online=+@ol
-
-#tasksh.autoclear=1
-#uda.reviewed.type=date
-#uda.reviewed.label=Reviewed
-report._reviewed.description=Tasksh review report.  Adjust the filter to your needs.
-report._reviewed.columns=uuid
-report._reviewed.sort=reviewed+,modified+
-report._reviewed.filter=( reviewed.none: or reviewed.before:now-6days ) and ( +PENDING or +WAITING )
-#
-#Brain Power
-
-#uda.brainpower.type=string
-#uda.brainpower.label=Brainpower
-#uda.brainpower.values=H,M,L
-#uda.brainpower.default=M
-
-#Estimate
-
-#uda.estimate.type=numeric
-#uda.estimate.label=Estimate

dot_config/task/intheam.tmpl

@@ -1,6 +0,0 @@
-taskd.certificate=/home/kellya/.config/task/intheam_certs/private.certificate.pem
-taskd.key=/home/kellya/.config/task/intheam_certs/private.key.pem
-taskd.ca=/home/kellya/.config/task/intheam_certs/ca.cert.pem
-taskd.server=inthe.am:53589
-taskd.credentials={{ onepasswordRead "op://Private/intheam_token/password" }}
-taskd.trust=strict

dot_config/task/taskrc

@@ -1,96 +0,0 @@
-
-# [Created by task 2.5.1 8/22/2016 14:01:12]
-# Taskwarrior program configuration file.
-# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-color',
-# 'man task-sync' or 'man taskrc'
-
-# Here is an example of entries that use the default, override and blank values
-#   variable=foo   -- By specifying a value, this overrides the default
-#   variable=      -- By specifying no value, this means no default
-#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default
-
-# Use the command 'task show' to see all defaults and overrides
-
-# Files
-data.location=~/.local/share/task/
-hooks.location=~/.config/task/hooks/
-
-# Color theme (uncomment one to use)
-
-#include /usr/share/task/dark-16.theme
-#dark256 is decent
-#include /usr/share/task/dark-256.theme
-#PICK dark-blue-256 if in doubt
-#include /usr/share/task/dark-blue-256.theme
-##This next one is the best guess so far
-####include /usr/share/task/dark-gray-256.theme
-#The active task on dark gray blue is too hard to read
-#include /usr/share/task/dark-gray-blue-256.theme
-#include /usr/share/task/dark-green-256.theme
-#include /usr/share/task/dark-red-256.theme
-#include /usr/share/task/dark-violets-256.theme
-## dark yellow green looks better than you'd think
-#include /usr/share/task/dark-yellow-green.theme
-#include /usr/share/task/light-16.theme
-# The ones below this line officially look like ass
-#include /usr/share/task/solarized-dark-256.theme
-#include /usr/share/task/solarized-light-256.theme
-#include /usr/share/task/light-256.theme
-#include /usr/share/task/no-color.theme
-
-include ~/.config/task/gtd
-include ~/projects/arachnitech/tw-spaceduck/spaceduck.theme
-
-# General config
-complete.all.tags=yes
-active.indicator=▸
-recurrence.indicator=♺
-nag=
-dateformat=Y-M-DTH:N
-verbose=no
-news.version=2.6.0
-
-#Reports
-report._reviewed.description=Tasksh review report.  Adjust the filter to your needs.
-report._reviewed.columns=uuid
-report._reviewed.sort=reviewed+,modified+
-report._reviewed.filter=( reviewed.none: or reviewed.before:now-6days ) and ( +PENDING or +WAITING )
-
-report.simple.description=Simple list of open tasks by project
-report.simple.columns=id,project,description.count
-report.simple.labels=ID,Proj,Desc
-report.simple.sort=project+\/,entry+
-report.simple.filter=status:pending
-
-#UDA
-uda.reviewed.type=date
-uda.reviewed.label=Reviewed
-
-uda.messageid.type=string
-uda.messageid.label=Message-ID
-
-uda.status_report.type=string
-uda.status_report.label=status_report
-uda.status_report.values=display,hide
-uda.status_report.default=display
-
-uda.delegated.type=string
-uda.delegated.label=Delegated to
-report.ready.filter=+READY delegated:
-report.delegated.description=Tasks delegated to others
-report.delegated.columns=id,project,description,delegated
-report.delegated.sort=delegated+,project+,description+
-report.delegated.filter=delegated.not: +PENDING
-
-report.next.columns=id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description.count,urgency
-
-#Context filters
-alias.@=context
-context.work.read=+work -home or -TAGGED
-context.work.write=+work
-context.home.read=-work +home or -TAGGED
-context.home.write=+home
-
-#include ~/.config/task/intheam
-#include ~/.config/task/wingtask
-context=work

dot_config/task/wingtask.tmpl

@@ -1,5 +0,0 @@
-taskd.server=app.wingtask.com:53589
-taskd.key=/home/kellya/.config/task/wingtask_certs/alex.kelly@arachnitech.com.key.pem
-taskd.ca=/home/kellya/.config/task/wingtask_certs/letsencrypt_root_cert.pem
-taskd.certificate=/home/kellya/.config/task/wingtask_certs/alex.kelly@arachnitech.com.cert.pem
-teaskd.credentials=WingTask/alex.kelly@arachnitech.com/{{- onepasswordRead "op://Private/wingtask_token/password" -}}

dot_direnvrc

@@ -1,21 +0,0 @@
-layout_virtualenv() {
-  local venv_path="$1"
-  source ${venv_path}/bin/activate
-}
-
-layout_virtualenvwrapper() {
-  local venv_path="${WORKON_HOME}/$1"
-  layout_virtualenv $venv_path
-}
-
-layout_poetry() {
-  if [[ ! -f pyproject.toml ]]; then
-    log_error 'No pyproject.toml found.  Use `poetry new` or `poetry init` to create one first.'
-    exit 2
-  fi
-
-  local VENV=$(dirname $(poetry run which python))
-  export VIRTUAL_ENV=$(echo "$VENV" | rev | cut -d'/' -f2- | rev)
-  export POETRY_ACTIVE=1
-  PATH_add "$VENV"
-}

dot_git-templates/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/main

dot_gitconfig.tmpl

@@ -1,54 +0,0 @@
-[core]
-    editor = nvim
-    quotepath = false
-    pager = delta
-[alias]
-    st = status
-    ci = commit
-    br = branch
-    co = checkout
-    df = diff
-    lg = log -p
-    hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
-[credential]
-    helper = cache --timeout=3600
-[push]
-    default = simple
-[github]
-    user = {{ onepasswordRead "op://Private/github.com/username" }}
-    token = {{ onepasswordRead "op://Private/github.com/password" }}
-[diff]
-    tool = meld
-[difftool]
-    prompt = false
-[color]
-    ui = auto
-[filter "lfs"]
-    clean = git-lfs clean -- %f
-    smudge = git-lfs smudge -- %f
-    process = git-lfs filter-process
-    required = true
-[pull]
-    rebase = false
-[user]
-    name = {{ .gitconfig.work.name }}
-    email = {{ .gitconfig.work.email }}
-[includeIf "gitdir:~/projects/{{- .gitconfig.home.config }}/"]
-    path = ~/.gitconfig-{{- .gitconfig.home.config }}
-
-[includeIf "gitdir:~/projects/{{- .gitconfig.work.config }}/"]
-    path = ~/.gitconfig-{{- .gitconfig.work.config }}
-[init]
-    defaultBranch = main
-	templatedir = /home/kellya/.git-templates
-[delta]
-    plus-style = "syntax #012800"
-    minus-style = "syntax #340001"
-    syntax-theme = Monokai Extended
-
-[interactive]
-    diffFilter = delta --color-only
-[help]
-	autocorrect = 20
-[merge]
-	conflictstyle = zdiff3

dot_ideavimrc

@@ -1,2 +0,0 @@
-set relativenumber
-set number

dot_muttrc

@@ -1,54 +0,0 @@
-#set record=~/Maildir/arachnitech/Sent
-set sidebar_visible = yes
-set sidebar_short_path                  # Shorten mailbox names
-set sidebar_delim_chars="/"             # Delete everything up to the last / character
-set sidebar_width=27
-#set sidebar_folder_indent               # Indent folders whose names we've shortened
-#set sidebar_indent_string="  "          # Indent with two spaces
-color sidebar_new yellow default
-color sidebar_indicator default color17         # Dark blue background
-color sidebar_highlight white   color238        # Grey background
-color sidebar_spoolfile yellow  default         # Yellow
-color sidebar_new       green   default         # Green
-color sidebar_ordinary  default default         # Default colors
-color sidebar_flagged   red     default         # Red
-color sidebar_divider   color8  default         # Dark grey
-## set record="~/Maildir/Sent Mail"
-set spoolfile="+franklin/INBOX"
-# set header cache
-set header_cache=~/Localmail/hcache
-set mbox_type=Maildir
-set folder=~/Maildir/
-set sort=reverse-date-received
-set pager_stop=yes
-set fast_reply
-set include=yes
-# IMAP and INBOX (this should map to any existing IMAP folders)
-folder-hook arachnitech/* source ~/.mutt/accounts/arachnitech
-folder-hook franklin/* source ~/.mutt/accounts/franklin
-# auto_view text/html
-#alternative_order text/plain text/enriched text/html
-auto_view text/html
-auto_view text/calendar
-
-# Just do what I tell you to, consequences be damned
-set noconfirmappend
-#set confirmappend=yes
-set delete=yes
-# Show new notification when mail arrives
-set new_mail_command="notify-send -t 2000 --icon='/home/kellya/images/mutt-1.png' -a mutt -c mail \
-   'New Emails' '%n new messages' &"
-
-#Remove annoying things
-set markers=no
-set smart_wrap=no
-set beep=no
-
-# Run a script to cat anything that has .rc as the extension to auto source things
-source ~/.mutt/sources.sh|
-
-# Addressbook lookup
-set query_command="khard email -p '%s'"
-bind editor <Tab> complete-query
-
-set editor="nvim -S ~/.mutt/vimrc"

dot_offlineimaprc

@@ -1,47 +0,0 @@
-[general]
-accounts = arachnitech, franklin
-maxsyncaccounts = 2
-fsync = true
-
-[Account arachnitech]
-localrepository = arachnitech-Local
-remoterepository = arachnitech-Remote
-postsynchook = notmuch new
-autorefresh = 5
-quick = 10
-
-[Repository arachnitech-Remote]
-type = IMAP
-remotehost = 192.168.0.125
-remoteuser = kellya
-remotepassfile = ~/.credentials/arachnitech_imap
-ssl = no
-idlefolders = ['INBOX',]
-
-[Repository arachnitech-Local]
-type = Maildir
-localfolders = ~/Maildir/arachnitech
-restoreatime = no
-
-[Account franklin]
-localrepository = franklin-Local
-remoterepository = franklin-Remote
-autorefresh = 5
-quick = 10
-
-postsynchook = notmuch new
-
-[Repository franklin-Remote]
-type = IMAP
-remotehost = 127.0.0.1
-remoteport = 1143
-remoteuser = alex.kelly@franklin.edu
-remotepassfile = ~/.credentials/franklin_imap
-ssl = no
-idlefolders = ['INBOX',]
-folderfilter = lambda foldername: foldername not in ['STFU','Newsletters', 'Clutter', 'Lego', 'Lego/Registrations', 'remote_addrbook', 'Conversation History', 'issues', 'spam', 'Windows crap', 'Sync Issues', 'Unsent Messages', 'Unsent Messages/Voicemessages', 'Junk', 'Unsent Messages/VoiceOutbox', 'Sync Issues/Server Failures', 'Sync Issues/Local Failures', 'Sync Issues/Conflicts']
-
-[Repository franklin-Local]
-type = Maildir
-localfolders = ~/Maildir/franklin
-restoreatime = no

dot_taskopenrc

@@ -1,31 +0,0 @@
-[General]
-taskbin=task
-taskargs
-no_annotation_hook="addnote $ID"
-task_attributes="priority,project,tags,description,joplin"
---sort:"urgency-,annot"
---active-tasks:"+PENDING"
-EDITOR=nvim
-path_ext=/usr/local/share/taskopen/scripts
-[Actions]
-files.target=annotations
-files.labelregex=".*"
-files.regex="^[\\.\\/~]+.*\\.(.*)"
-files.command="/usr/bin/xdg-open $FILE"
-files.modes="batch,any,normal"
-notes.target=annotations
-notes.labelregex=".*"
-notes.regex="^Notes(\\..*)?"
-notes.command="""editnote ~/Notes/tasknotes/$UUID$LAST_MATCH "$TASK_DESCRIPTION" $UUID"""
-notes.modes="batch,any,normal"
-url.target=annotations
-url.labelregex=".*"
-url.regex="((?:www|http).*)"
-url.command="/usr/bin/xdg-open $LAST_MATCH"
-url.modes="batch,any,normal"
-thunderlink.regex="(cb)?thunderlink:.*"
-thunderlink.command="/home/kellya/bin/cb_thunderlink/cb_thunderlink $FILE"
-joplin.regex="joplin:.*"
-joplin.command="/home/kellya/.joplin/Joplin.AppImage $FILE"
-logseq.regex="logseq:.*"
-logseq.command="logseq $FILE"

mutt/accounts/arachnitech

@@ -5,7 +5,7 @@ set postponed = "+arachnitech/drafts"
 set record=+arachnitech/sent
 
 
-color status color38 default
+color status green default
 
 macro index D \
     "<save-message>+arachnitech/Trash<enter>" \

mutt/gpg.rc

@@ -6,8 +6,7 @@ set crypt_autosign = yes
 set crypt_autoencrypt = no
 set crypt_autopgp = yes 
 set pgp_sign_as=738CA93A2DAD8D06C991CE4E5495537542CF2D94
-set pgp_sign_as=67F19F9C5A33D046A37ABA25B15716AE1B5A699A
 
 send2-hook . unset pgp_sign_as
-send2-hook '~f alex.kelly@franklin.edu' set pgp_sign_as=67F19F9C5A33D046A37ABA25B15716AE1B5A699A
+send2-hook '~f alex.kelly@franklin.edu' set pgp_sign_as=738CA93A2DAD8D06C991CE4E5495537542CF2D94
 send2-hook '~f kellya@arachnitech.com' set pgp_sign_as=15CD8B0B88DD99E8882B7A90DB2139896E9F21BD

mutt/macros.rc

@@ -5,7 +5,9 @@ macro index <F8> \
 macro index <F9> \
       "<enter-command>unset wait_key<enter><pipe-message>~/bin/mutt-notmuch thread<enter><change-folder-readonly>~/.cache/Maildir/<enter><enter-command>set wait_key<enter>" \
       "search and reconstruct owning thread (using notmuch)"
-macro index,browser,pager t "<pipe-message>/home/kellya/projects/arachnitech/mutt2tw/mutt2tw.py<enter>" "A"
+# macro index,browser t "<pipe-message>mutt2task<enter>"
+macro index,browser,pager t "<pipe-message>/home/kellya/projects/arachnitech/mutt2tw/mutt2tw.py<enter>"\
+"A"
 # 'L' performs a notmuch query, showing only the results
 macro index L "<enter-command>unset wait_key<enter><shell-escape>read -p 'notmuch query: ' x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;chomp@a;s/\^id:// for@a;$,=\"|\";print@a'\`\"<enter>" "show only messages matching a notmuch pattern"
 # 'a' shows all messages again (supersedes default <alias> binding)

mutt/muttrc

@@ -8,7 +8,7 @@ set sidebar_width=27
 color sidebar_new yellow default
 color sidebar_indicator default color17         # Dark blue background
 color sidebar_highlight white   color238        # Grey background
-#color sidebar_spoolfile yellow  default         # Yellow
+color sidebar_spoolfile yellow  default         # Yellow
 color sidebar_new       green   default         # Green
 color sidebar_ordinary  default default         # Default colors
 color sidebar_flagged   red     default         # Red
@@ -32,8 +32,7 @@ auto_view text/html
 auto_view text/calendar
 
 # Just do what I tell you to, consequences be damned
-set noconfirmappend
+set confirmappend=yes
-#set confirmappend=yes
 set delete=yes
 # Show new notification when mail arrives
 set new_mail_command="notify-send -t 2000 --icon='/home/kellya/images/mutt-1.png' -a mutt -c mail \
@@ -43,6 +42,5 @@ set new_mail_command="notify-send -t 2000 --icon='/home/kellya/images/mutt-1.png
 source ~/.mutt/sources.sh|
 
 # Addressbook lookup
-#set query_command="khard email -p '%s'"
+set query_command="khard email -p '%s'"
 bind editor <Tab> complete-query
-set editor="nvim -S ~/.mutt/vimrc"

nvim/init.vim

@@ -19,10 +19,6 @@ call plug#begin(g:plugged_home)
   Plug 'Chiel92/vim-autoformat'
   " Theme
   Plug 'pineapplegiant/spaceduck', { 'branch': 'main' }
-  Plug 'folke/tokyonight.nvim'
-  Plug 'EdenEast/nightfox.nvim'
-  Plug 'bluz71/vim-moonfly-colors'
-  Plug 'NLKNguyen/papercolor-theme'
   " Python Plugins
   Plug 'Valloric/YouCompleteMe'
   Plug 'vim-syntastic/syntastic'
@@ -38,10 +34,6 @@ call plug#begin(g:plugged_home)
   Plug 'ryanoasis/vim-webdevicons'
   Plug 'direnv/direnv.vim'
   Plug 'sheerun/vim-polyglot'
-  Plug 'tpope/vim-fugitive'
-  Plug 'psf/black', { 'branch': 'main' }
-  Plug 'junegunn/fzf.vim'
-  Plug 'navarasu/onedark.nvim'
   " This was fun and all, but getting data out sucked, so if they ever get an
   " update, maybe try again
   "Plugin 'ActivityWatch/aw-watcher-vim'
@@ -61,10 +53,6 @@ call plug#begin(g:plugged_home)
   Plug 'dbeniamine/cheat.sh-vim'
   Plug 'jacqueswww/vim-vyper'
   Plug 'tomlion/vim-solidity'
-  "  I'm a cheap bastard and am not paying for copilot...so let's shut it up
-"  Plug 'github/copilot.vim'
-"  hey..cheap option arrived for copilot alternative ;)
-  Plug 'Exafunction/codeium.vim'
 call plug#end()
 
 filetype plugin indent on
@@ -81,8 +69,7 @@ if exists('+termguicolors')
       set termguicolors
     endif
 
-" colorscheme spaceduck
+   colorscheme spaceduck
-colorscheme tokyonight-night
 
 " set the number style to hybrid
 set number relativenumber
@@ -220,14 +207,3 @@ let g:table_mode_header_fillchar='='
 let g:webdevicons_enable = 1
 let g:webdevicons_enable_nerdtree = 1
 autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
-autocmd BufWritePre *.py execute ':Black'
-let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.5, 'highlight': 'Comment' } }
-let g:indentLine_fileTypeExclude = ['markdown']
-set cursorline
-
-
-
-imap <silent><script><expr> <C-L> copilot#Accept("\<CR>")                                                                                                                                                 
-let g:copilot_no_tab_map = v:true
-
-autocmd FileType gitcommit call setpos('.', [0, 1, 1, 0])

private_dot_mutt/vimrc

@@ -1,4 +0,0 @@
-set textwidth=0
-set wrapmargin=0
-set spell spelllang=en_us
-Copilot disable

tmux/tmux.conf

@@ -23,7 +23,7 @@ set -g visual-activity on
 set -g mode-keys vi
 set -g history-limit 10000
 
-set -g status-bg default
+set -g status-bg blue
 set -g status-fg white
 
 # y and p as in vim
@@ -63,42 +63,6 @@ bind -r L resize-pane -R 5
 
 #set border colors
 #set -g pane-active-border-fg blue
-#Commented to enable spaceduck
+set-option -g pane-active-border-style fg=blue
-#set-option -g pane-active-border-style fg=blue
+set -g default-terminal "screen-256color"
-#set -g default-terminal "screen-256color"
+set-option -sa terminal-overrides ',XXX:RGB'                                                                                                                                                                                         
-#set-option -sa terminal-overrides ',XXX:RGB'                                                                                                                                                                                         
-
-
-
-# Basic color support setting
-  set-option -g default-terminal "screen-256color"
-
-  # Default bar color
-  set-option -g status-style bg='#1b1c36',fg='#ecf0c1'
-
-  # Active Pane
-  set -g pane-active-border-style "fg=#5ccc96"
-
-  # Inactive Pane
-  set -g pane-border-style "fg=#686f9a"
-
-  # Active window
-  set-option -g window-status-current-style bg='#686f9a',fg='#ffffff'
-
-  # Message
-  set-option -g message-style bg='#686f9a',fg='#ecf0c1'
-  set-option -g message-command-style bg='#686f9a',fg='#ecf0c1'
-
-  # When Commands are run
-  set -g message-style "fg=#0f111b,bg=#686f9a"
-
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-run -b '~/.tmux/plugins/tpm/tpm'
-# Temporarily not using activity-watcher
-#set -g @plugin 'akohlbecker/aw-watcher-tmux'
-source-file /home/kellya/projects/public/spaceduck-terminal/tmux/status-line-default.conf
-
-#disable status line
-set -g status off

vim/vimrc

@@ -65,7 +65,6 @@ Plugin 'dbeniamine/cheat.sh-vim'
 Plugin 'jacqueswww/vim-vyper'
 Plugin 'tomlion/vim-solidity'
 Plugin 'kien/ctrlp.vim'
-Plugin 'kmonad/kmonad-vim'
 
 
 "let g:deoplete#enable_at_startup = 1
@@ -178,4 +177,3 @@ let g:webdevicons_enable = 1
 let g:webdevicons_enable_nerdtree = 1
 set relativenumber
 set number
-let g:indentLine_fileTypeExclude = ['markdown']

zsh/functions/prompt_git.sh

@@ -0,0 +1,4 @@
+# Override the git prompt, because I don't want it in my left-hand prompt, and I can't use the variable to unset it for some reason
+prompt_git () {
+	:
+}

zsh/functions/qr.sh

@@ -0,0 +1,3 @@
+qrnet () {
+	echo "WIFI:S:$1;T:WPA;$2;;"|curl -F-=\<- qrenco.de
+}

zsh/functions/rand.sh

@@ -0,0 +1,4 @@
+#quick and dirty random string generator
+rand () {
+	    cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1|tr -d '\n'
+	}

zsh/zsh-git-prompt

@@ -0,0 +1 @@
+Subproject commit b4e0b2e39663fb8eee801f84cb577dadf055b44e

zsh/zshrc

@@ -1,10 +1,3 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
 # Path to your oh-my-zsh installation.
 export ZSH=/home/kellya/.oh-my-zsh
 
@@ -12,8 +5,7 @@ export ZSH=/home/kellya/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-#ZSH_THEME="agnoster"
+ZSH_THEME="agnoster"
-ZSH_THEME="powerlevel10k/powerlevel10k"
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -55,10 +47,9 @@ HIST_STAMPS="yyyy-mm-dd"
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 # plugins=(git)
-plugins=(sudo taskwarrior timewarrior common-aliases git-flow vi-mode fzf python poetry)
+plugins=(sudo taskwarrior common-aliases git-flow github vi-mode fzf python)
 #plugins+=(zsh-vi-mode)
 plugins+=(fzf-tab)
-plugins+=(docker)
 
 # User configuration
 export PATH="/usr/lib64/qt-3.3/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/home/kellya/bin:/home/kellya/incoming/git-annex.linux:/home/kellya/bin/keybase/bin:/home/kellya/.local/bin:/home/kellya/.cargo/bin"
@@ -87,32 +78,33 @@ show_virtual_env() {
 #--------- End of direnv block ------------------------------------------------  
 
 unsetopt histverify
+alias in='task add +in'
 alias rtask="task rc:/home/kellya/.taskrc_tinslin"
+alias atwork="task context work"
+alias athome="task context home"
+alias atschool="task context school"
+alias atnone="task context none;"
 alias icat="kitty +kitten icat"
 alias d="kitty +kitten diff"
 #eval "$(ntfy shell-integration)"
 #source /usr/share/gems/gems/tmuxinator-0.6.11/completion/tmuxinator.zsh
 source ~/.private_aliases
-#Load taskwarrior alias file
-source ~/.taskwarrior_aliases/taskwarrior_aliases
-
 source /usr/bin/virtualenvwrapper.sh
 
 
 #Aliases
 alias dum='du -sh *|egrep ".*\.?[0-9]M"'
+alias keploy='echo -e "\e[101;97mKeploy was removed, its functionality is already built in ssh-copy-id, just use that\e[49m"; ssh-copy-id'
 alias shrug='curl shrug.io|xclip'
 alias weather='curl wttr.in'
 alias ipython='ipython --no-confirm-exit'
 
 #Variable Exports
-export EDITOR='nvim'
+export EDITOR='vim'
 export PATH="$PATH:/home/kellya/go/bin"
 #export WORKON_HOME=/mnt/vdisks/projects/python_virtualenvs
 export LPASS_AGENT_TIMEOUT=0
 export PATH="/usr/local/heroku/bin:$PATH"
-export OPENCV_LOG_LEVEL=OFF
-export PATH="/home/kellya/node_modules/.bin/:$PATH"
 
 #Source all the custom functions
 # Load custom functions
@@ -135,11 +127,13 @@ alias ashow="litecli --auto-vertical-output /home/kellya/snap/accountable2you/co
 alias akill="litecli --auto-vertical-output /home/kellya/snap/accountable2you/common/storage.db -e \"delete from log;\""
 alias mutt="neomutt"
 fpath+=~/.zfunc
+compinit
 kitty + complete setup zsh | source /dev/stdin
 #
 # Enable 'z' tracking for directory speediness
-# Temporarily disabiling while using fasd
+source /usr/libexec/z.sh
-# source /usr/libexec/z.sh
+
+export PATH="$HOME/.poetry/bin:$PATH"
 
 #function chpwd() {
 #  if [ -r $PWD/.zsh_config ]; then
@@ -158,11 +152,6 @@ export FZF_DEFAULT_OPTS="--extended"
 export FZF_DEFAULT_COMMAND="fd --type f"
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 
-#XDG stuff
-export XDG_DATA_HOME=$HOME/.local/share
-export XDG_CONFIG_HOME=$HOME/.config
-export XDG_STATE_HOME=$HOME/.local/state
-
 #ZVM customizations
 # Cursors seem backwards, swap 'em
 ZVM_INSERT_MODE_CURSOR=$ZVM_CURSOR_BLOCK
@@ -170,34 +159,3 @@ ZVM_NORMAL_MODE_CURSOR=$ZVM_CURSOR_BEAM
 ZVM_OPPEND_MODE_CURSOR=$ZVM_CURSOR_UNDERLINE
 # defaults to last, make each line always insert
 ZVM_LINE_INIT_MODE=$ZVM_MODE_INSERT
-chezmoi completion zsh | source /dev/stdin
-
-#Trying out fasd over z.  There's nothing wrong with z, it just looks like fasd might add some more completion and stuff that might be useful
-#eval "$(fasd --init auto)"
-
-#Attempting to try zplug
-source ~/.zplug/init.zsh
-#zplug "wookayin/fzf-fasd"
-zplug "plugins/git",   from:oh-my-zsh
-autoload -U compinit
-compinit -i
-PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source /home/kellya/.config/tea/autocomplete.zsh
-
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
-
-export PATH="/home/kellya/.deta/bin:$PATH"
-export PATH="/home/kellya/local/share/JetBrains/Toolbox/scripts:$PATH"
-
-#eval $(thefuck --alias)
-eval "$(zoxide init zsh)"
-eval "$(op completion zsh)"; compdef _op op
-source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-. "/home/kellya/.acme.sh/acme.sh.env"
-
-# bun completions
-[ -s "/home/kellya/.local/share/reflex/bun/_bun" ] && source "/home/kellya/.local/share/reflex/bun/_bun"
-
-# bun
-export BUN_INSTALL="$HOME/.local/share/reflex/bun"
-export PATH="$BUN_INSTALL/bin:$PATH"