aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Kavanagh <rak@rak.ac>2023-02-03 11:29:45 -0500
committerRyan Kavanagh <rak@rak.ac>2023-02-03 11:29:45 -0500
commit0099b1dacebc7c5a0e03b6942795e7d7b3ddf895 (patch)
tree4a11f933fbfc479a020df38c42a0cdc038421bc8
parentmpd.conf (diff)
parentzeta xinitrc (diff)
Merge remote-tracking branch 'refs/remotes/origin/master'
-rw-r--r--.chezmoiremove3
-rw-r--r--dot_emacs.tmpl4
-rw-r--r--dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.ascbin1842 -> 2556 bytes
-rw-r--r--executable_dot_xinitrc.tmpl3
-rw-r--r--private_dot_ssh/cm_socket/.keep0
5 files changed, 7 insertions, 3 deletions
diff --git a/.chezmoiremove b/.chezmoiremove
index f982262..4ef2a8b 100644
--- a/.chezmoiremove
+++ b/.chezmoiremove
@@ -1,4 +1,7 @@
.gnupg/dirmngr.conf
.lbdbrc
.pulse
+.screenlayout/zeta-home.sh
+.screenlayout/zeta-solo.sh
+.screenlayout/zeta-work.sh
bin/mutt
diff --git a/dot_emacs.tmpl b/dot_emacs.tmpl
index 2999235..8fc67a1 100644
--- a/dot_emacs.tmpl
+++ b/dot_emacs.tmpl
@@ -1,4 +1,3 @@
-;; -*- emacs-lisp -*-
;; (setq debug-on-error t)
(require 'package)
@@ -311,6 +310,9 @@ Extended Format date in the date field and return it as a string obeing
(use-package dune-format
:ensure t)
+(use-package eldoc
+ :diminish)
+
(use-package elpher
:ensure t)
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc b/dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc
index 0762b66..10b596c 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc
+++ b/dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc
Binary files differ
diff --git a/executable_dot_xinitrc.tmpl b/executable_dot_xinitrc.tmpl
index 9ad3c74..e0d0db8 100644
--- a/executable_dot_xinitrc.tmpl
+++ b/executable_dot_xinitrc.tmpl
@@ -35,8 +35,7 @@ case `uname` in
[ -d /usr/local/share/fonts/spleen ] && xset +fp /usr/local/share/fonts/spleen/
redshift &
${HOME}/bin/icd
- ${HOME}/.screenlayout/{{ .chezmoi.hostname }}-work.sh
- xidle -delay 2 -se -timeout 180 -program "/usr/X11R6/bin/xlock" &
+ xidle -delay 2 -se -timeout 600 -program "/usr/X11R6/bin/xlock" &
exec xmonad
;;
diff --git a/private_dot_ssh/cm_socket/.keep b/private_dot_ssh/cm_socket/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/private_dot_ssh/cm_socket/.keep