From f401e327ac0c9e80ca5d98546afcc6013b00ff1c Mon Sep 17 00:00:00 2001
From: earnest ma <me@earne.link>
Date: Sat, 30 Oct 2021 17:19:32 -0400
Subject: [PATCH] changes from migration to fedora

---
 .config/aerc/aerc.conf | 10 +++++-----
 .config/git/config     |  4 ++--
 .config/shell/start.sh | 11 +----------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 6b43657..968e1f0 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -71,7 +71,7 @@ next-message-on-delete=true
 # list of directories.
 #
 # default: /usr/local/share/aerc/stylesets/
-stylesets-dirs=@SHAREDIR@/stylesets/
+stylesets-dirs=/usr/share/aerc/stylesets/
 
 # Sets the styleset to use for the aerc ui elements.
 #
@@ -163,9 +163,9 @@ address-book-cmd=khard email --parsable --search-in-source-files --remove-first-
 # You can also match on non-mimetypes, by prefixing with the header to match
 # against (non-case-sensitive) and a comma, e.g. subject,text will match a
 # subject which contains "text". Use header,~regex to match against a regex.
-subject,~^\[PATCH=awk -f @SHAREDIR@/filters/hldiff
-text/html=@SHAREDIR@/filters/html
-text/*=awk -f @SHAREDIR@/filters/plaintext
+subject,~^\[PATCH=awk -f /usr/share/aerc/filters/hldiff
+text/html=/usr/share/aerc/filters/html
+text/*=awk -f /usr/share/aerc/filters/plaintext
 #image/*=catimg -w $(tput cols) -
 
 [triggers]
@@ -187,7 +187,7 @@ new-email=exec notify-send "aerc: you have a new email"
 # list of directories.
 #
 # default: /usr/local/share/aerc/templates/
-template-dirs=/home/earne/.config/aerc/templates:@SHAREDIR@/templates/
+template-dirs=/home/earne/.config/aerc/templates:/usr/share/aerc/templates/
 
 # The template to be used for quoted replies.
 #
diff --git a/.config/git/config b/.config/git/config
index ac83b74..c468c4f 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -34,8 +34,8 @@
 	default = current
 
 # sudo apt install libsecret-1-0 libsecret-1-dev -y && sudo make --directory=/usr/share/doc/git/contrib/credential/libsecret
-[credential]
-	helper = /usr/share/doc/git/contrib/credential/libsecret/git-credential-libsecret
+# [credential]
+# 	helper = /usr/share/doc/git/contrib/credential/libsecret/git-credential-libsecret
 
 #[sendemail]
 #	smtpserver = mail.example.com
diff --git a/.config/shell/start.sh b/.config/shell/start.sh
index 7aaf09e..4cca854 100755
--- a/.config/shell/start.sh
+++ b/.config/shell/start.sh
@@ -12,7 +12,7 @@ export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CACHE_HOME="$HOME/.cache"
 
 # Make nix's desktop files show up
-export XDG_DATA_DIRS="$HOME/.nix-profile/share:$XDG_DATA_DIRS"
+# export XDG_DATA_DIRS="$HOME/.nix-profile/share:$XDG_DATA_DIRS"
 
 export LANG=en_CA.UTF-8
 # TZ
@@ -32,24 +32,15 @@ path_add_end(){
 path_add "$HOME/.local/bin"
 path_add "$HOME/.config/shell/bin"
 
-# Doom Emacs
-path_add "$HOME/.config/emacs/bin"
-
 # Rust, cargo
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 [ -f $CARGO_HOME/env ] && . "$CARGO_HOME/env"
 
 # golang
-path_add "/usr/local/go/bin"
 export GOPROXY=direct
 export GOPATH="$XDG_DATA_HOME/go"
 path_add "$GOPATH/bin"
 
-# node, npm, yarn
-export NVM_DIR="$HOME/.config/nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
 
 export PATH # just in case