aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/.config/emacs/tools.org8
-rw-r--r--common/gitconfig.org18
-rw-r--r--common/gitconfig.org.gpgbin0 -> 929 bytes
l---------gentoo/gitconfig.org1
l---------gentoo/gitconfig.org.gpg1
-rwxr-xr-xinstall8
l---------macos/gitconfig.org1
l---------macos/gitconfig.org.gpg1
8 files changed, 17 insertions, 21 deletions
diff --git a/common/.config/emacs/tools.org b/common/.config/emacs/tools.org
index ddbf80c..bd6f3ae 100644
--- a/common/.config/emacs/tools.org
+++ b/common/.config/emacs/tools.org
@@ -148,6 +148,14 @@ Tangle on save.
(add-hook 'after-save-hook #'org-babel-tangle-config)))
#+end_src
+Enable Org Crypt.
+#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
+ (org-crypt-use-before-save-magic)
+ (setq org-tags-exclude-from-inheritance '("crypt"))
+ (setq org-crypt-key nil)
+ (setq auto-save-default nil)
+#+end_src
+
* Shell
Use =eshell= as an integrated shell.
#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
diff --git a/common/gitconfig.org b/common/gitconfig.org
deleted file mode 100644
index c907204..0000000
--- a/common/gitconfig.org
+++ /dev/null
@@ -1,18 +0,0 @@
-#+title: Git Configuration
-Define my full name and email.
-#+begin_src conf :tangle ~/.gitconfig
- [user]
- name = Jacob Janzen
- email = jjanzenn@proton.me
-#+end_src
-Use =main= over =master=.
-#+begin_src conf :tangle ~/.gitconfig
- [init]
- defaultBranch = main
-#+end_src
-
-Make =pull= rebase on conflict.
-#+begin_src conf :tangle ~/.gitconfig
- [pull]
- rebase = true
-#+end_src
diff --git a/common/gitconfig.org.gpg b/common/gitconfig.org.gpg
new file mode 100644
index 0000000..12954b7
--- /dev/null
+++ b/common/gitconfig.org.gpg
Binary files differ
diff --git a/gentoo/gitconfig.org b/gentoo/gitconfig.org
deleted file mode 120000
index e4e5534..0000000
--- a/gentoo/gitconfig.org
+++ /dev/null
@@ -1 +0,0 @@
-../common/gitconfig.org \ No newline at end of file
diff --git a/gentoo/gitconfig.org.gpg b/gentoo/gitconfig.org.gpg
new file mode 120000
index 0000000..e4cb6ab
--- /dev/null
+++ b/gentoo/gitconfig.org.gpg
@@ -0,0 +1 @@
+../common/gitconfig.org.gpg \ No newline at end of file
diff --git a/install b/install
index 51ad486..e55979e 100755
--- a/install
+++ b/install
@@ -29,10 +29,16 @@ else
fi
echo 'installing configuration files...'
-find -L -- . -type f -name "*.org" | while read -r file; do
+find -L -- . -type f -name "*\.org" | while read -r file; do
echo " installing $file..."
emacs --batch "$file" -f package-initialize --eval '(org-babel-tangle)' >> ~/.update-home.log 2>&1
done
+find -L -- . -type f -name "*\.org\.gpg" | while read -r file; do
+ echo " installing $file..."
+ gpg -d "$file" > tmp.org
+ emacs --batch tmp.org -f package-initialize --eval '(org-babel-tangle)' >> ~/.update-home.log 2>&1
+ rm tmp.org
+done
echo 'installing wallpaper...'
cp .wallpaper ~/.wallpaper
diff --git a/macos/gitconfig.org b/macos/gitconfig.org
deleted file mode 120000
index e4e5534..0000000
--- a/macos/gitconfig.org
+++ /dev/null
@@ -1 +0,0 @@
-../common/gitconfig.org \ No newline at end of file
diff --git a/macos/gitconfig.org.gpg b/macos/gitconfig.org.gpg
new file mode 120000
index 0000000..e4cb6ab
--- /dev/null
+++ b/macos/gitconfig.org.gpg
@@ -0,0 +1 @@
+../common/gitconfig.org.gpg \ No newline at end of file