diff options
-rw-r--r-- | config.org | 50 | ||||
-rw-r--r-- | init.el | 2 |
2 files changed, 41 insertions, 11 deletions
diff --git a/config.org b/config.org index 02fc297..c31b821 100644 --- a/config.org +++ b/config.org | |||
@@ -1266,6 +1266,12 @@ contents of the files the represent on-disk. Thus, we have | |||
1266 | (setq-default fill-column 80) | 1266 | (setq-default fill-column 80) |
1267 | #+end_src | 1267 | #+end_src |
1268 | 1268 | ||
1269 | I also want to display the fill-column: | ||
1270 | |||
1271 | #+begin_src emacs-lisp :noweb-ref modes | ||
1272 | (global-display-fill-column-indicator-mode +1) | ||
1273 | #+end_src | ||
1274 | |||
1269 | By default, Emacs uses =C-x f= to set the =fill-column=. I think it's | 1275 | By default, Emacs uses =C-x f= to set the =fill-column=. I think it's |
1270 | pretty dumb that such an easy-to-reach binding (for Emacs) is set to a function | 1276 | pretty dumb that such an easy-to-reach binding (for Emacs) is set to a function |
1271 | that I /literally/ never use. So I'm going to bind it to =find-file= ... since | 1277 | that I /literally/ never use. So I'm going to bind it to =find-file= ... since |
@@ -2869,22 +2875,46 @@ Emacs (or the [[https://chrome.google.com/webstore/detail/edit-with-emacs/ljobjl | |||
2869 | (add-hook 'after-init-hook #'edit-server-start) | 2875 | (add-hook 'after-init-hook #'edit-server-start) |
2870 | #+end_src | 2876 | #+end_src |
2871 | 2877 | ||
2872 | *** =git-sync= ~/org | 2878 | *** =git-sync= stuff |
2873 | 2879 | ||
2874 | I don't know where else to put this, but it's just a little command to | 2880 | This function require [[https://github.com/simonthum/git-sync][git-sync]]. |
2875 | run =git-sync= in =org-directory=. | ||
2876 | 2881 | ||
2877 | #+begin_src emacs-lisp :noweb-ref functions | 2882 | #+begin_src emacs-lisp :noweb-ref functions |
2878 | (defun acdw/org-sync () | 2883 | (defun acdw/git-sync (directory) |
2879 | "Run git-sync in `org-directory'. | 2884 | "Run git-sync in DIRECTORY." |
2885 | (interactive) | ||
2886 | (message "Git-Syncing %s..." directory) | ||
2887 | (let ((proc (start-process "git-sync" | ||
2888 | (get-buffer-create (format "*git-sync:%s*" directory)) | ||
2889 | "git" "-C" (expand-file-name directory) "sync"))) | ||
2890 | (add-function :after (process-sentinel proc) | ||
2891 | (lambda (proc ev) | ||
2892 | (cond | ||
2893 | ((string-match "finished\n\\'" ev) | ||
2894 | (message "Git-Syncing %s...Done." directory))))))) | ||
2895 | #+end_src | ||
2896 | |||
2897 | **** ~/org | ||
2880 | 2898 | ||
2881 | Requires git-sync." | 2899 | #+begin_src emacs-lisp :noweb-ref bindings |
2900 | (defun acdw/git-sync-org () | ||
2901 | "Run `acdw/git-sync' on `org-directory'." | ||
2902 | (interactive) | ||
2903 | (acdw/git-sync org-directory)) | ||
2904 | |||
2905 | (define-key acdw/leader (kbd "C-M-o") #'acdw/git-sync-org) | ||
2906 | #+end_src | ||
2907 | |||
2908 | **** ~/.cache/elfeed/db | ||
2909 | |||
2910 | #+begin_src emacs-lisp :noweb-ref bindings | ||
2911 | (defun acdw/git-sync-elfeed-db () | ||
2912 | "Run `acdw/git-sync' on `elfeed-db-directory'." | ||
2882 | (interactive) | 2913 | (interactive) |
2883 | (save-some-buffers :no-query nil) | 2914 | (save-some-buffers :no-query nil) |
2884 | (async-shell-command | 2915 | (acdw/git-sync elfeed-db-directory)) |
2885 | (format "git -C %s sync" (expand-file-name org-directory)))) | ||
2886 | 2916 | ||
2887 | (define-key acdw/leader (kbd "C-M-o") #'acdw/org-sync) | 2917 | (define-key acdw/leader (kbd "C-M-f") #'acdw/git-sync-elfeed-db) |
2888 | #+end_src | 2918 | #+end_src |
2889 | 2919 | ||
2890 | ** Linux (home) | 2920 | ** Linux (home) |
@@ -3196,7 +3226,7 @@ the needed boolean expression to tangle config.org. Booleans, yall! | |||
3196 | #+begin_src emacs-lisp | 3226 | #+begin_src emacs-lisp |
3197 | (let* (;; Speed up init | 3227 | (let* (;; Speed up init |
3198 | (gc-cons-threshold most-positive-fixnum) | 3228 | (gc-cons-threshold most-positive-fixnum) |
3199 | (gc-cons-percentage 0.6) | 3229 | ;; (gc-cons-percentage 0.6) |
3200 | (file-name-handler-alist nil) | 3230 | (file-name-handler-alist nil) |
3201 | ;; Config file names | 3231 | ;; Config file names |
3202 | (config (expand-file-name "config" | 3232 | (config (expand-file-name "config" |
diff --git a/init.el b/init.el index cadfaca..405bf9b 100644 --- a/init.el +++ b/init.el | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | (let* (;; Speed up init | 19 | (let* (;; Speed up init |
20 | (gc-cons-threshold most-positive-fixnum) | 20 | (gc-cons-threshold most-positive-fixnum) |
21 | (gc-cons-percentage 0.6) | 21 | ;; (gc-cons-percentage 0.6) |
22 | (file-name-handler-alist nil) | 22 | (file-name-handler-alist nil) |
23 | ;; Config file names | 23 | ;; Config file names |
24 | (config (expand-file-name "config" | 24 | (config (expand-file-name "config" |