Don't step on each other's feet

config-ext.org

@@ -73,6 +73,8 @@
                  (slot . 6)
                  (window-width . 80)))
 
+  (require 'org-capture)
+
   (defun my/is-org-capture-buffer (buffer &optional _rest)
     (with-current-buffer buffer
       (and (eq major-mode 'org-mode)

lisp/git-auto-sync/my-org-autosync.el

@@ -38,7 +38,10 @@
                                    (list (file-name-as-directory (my/plaintext-file "ledger-finance"))
                                          "origin/gaming-laptop" "origin/puppet")))
 
-(run-at-time nil 300 #'gaff/trigger)
+;; TODO: apparently this messes with exwm initialization somehow. Not
+;; sure how. Even running 10 seconds after messes with exwm init.
+
+;;(run-at-time nil 300 #'gaff/trigger)
 
 (setq gac-automatically-add-new-files-p nil)
 (setq-default gac-debounce-interval 120)
@@ -67,7 +70,8 @@
 
 (when my/puppet-p
   (add-to-list 'emacs-startup-hook
-               #'gaff/trigger)
+               #'(lambda ()
+                   (run-at-time 30 300 #'gaff/trigger)))
 
   (add-hook 'emacs-startup-hook
             #'gac-run-ssh-add)

lisp/my-keymap.el

@@ -65,7 +65,8 @@
                                        (org-time-stamp-inactive t))))
 
 (define-prefix-command '*lazy-map*)
-(exwm-global-set-key (kbd "<f1>") '*lazy-map*)
+(unless my/puppet-p
+  (exwm-global-set-key (kbd "<f1>") '*lazy-map*))
 
 (define-key *lazy-map* (kbd "1") #'org-capture)
 (define-key *lazy-map* (kbd "2") #'org-agenda)