From 21b441cfd6e8bab90cbfdafafebd0acb7d63430b Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Fri, 24 Jul 2020 17:26:32 -0500 Subject: [PATCH] Some minor fixes for new systems --- Makefile | 5 ++- emacs.org | 119 ++++++++++++++++++++++++++++++++---------------------- nix.org | 8 ++-- 3 files changed, 79 insertions(+), 53 deletions(-) diff --git a/Makefile b/Makefile index 5e36d91..988640b 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,12 @@ tangle-next: $(MAKE) generation $(MAKE) next $(MAKE) copy GEN=$(NEXT) - @echo $(NEXT) > .last + $(MAKE) set-last NEXT=$(NEXT) @echo Tangled for hostname $(HOST) +set-last: + @echo $(NEXT) > .last + copy: cd $(PWD)/generation/$(GEN) && find . -type f -exec rm -f $(DEST)/{} \; cd $(PWD)/generation/$(GEN) && cp -r . $(DEST) diff --git a/emacs.org b/emacs.org index 1d59b13..9394785 100644 --- a/emacs.org +++ b/emacs.org @@ -414,26 +414,27 @@ Also have the scratch buffer be empty instead of have the derp message I never r List of fonts in order of preference. Set preferred font list when we're in a gui emacs session. -#+BEGIN_SRC emacs-lisp - (defvar my/gui-fonts - '( - "ComicCode" - "Comic Code" - "PragmataPro" - "Pragmata Pro" ;; Seems to register differently on osx than X - "Source Code Pro" - "Menlo" - "Monaco" - ) - ) - (with-no-warnings - (when window-system - (if (find-font (font-spec :name (car my/gui-fonts))) - (progn (set-frame-font (car my/gui-fonts)) - (set-face-attribute 'default nil :height 180)) - (progn (set-gui-font (cdr my/gui-fonts)))) +#+BEGIN_SRC emacs-lisp :tangle no + (defvar my/gui-fonts + '( + "ComicCode" + "Comic Code" + "PragmataPro" + "Pragmata Pro" ;; Seems to register differently on osx than X + "Source Code Pro" + "Menlo" + "Monaco" + ) ) - ) + (with-no-warnings + (when window-system + (if (find-font (font-spec :name (car my/gui-fonts))) + (progn (set-frame-font (car my/gui-fonts)) + (set-face-attribute 'default nil :height 180)) + (when (eq system-type 'darwin) + (progn (set-gui-font (cdr my/gui-fonts)))) + ) + ) #+END_SRC *** tty @@ -658,7 +659,7 @@ Highlight matching ()'s []'s etc... ) #+END_SRC -*** org-mode +*** org-mode and ob Org-mode keybindings and settings, pretty sparse really. @@ -685,29 +686,18 @@ Org-mode keybindings and settings, pretty sparse really. "* TODO %?, Link: %a") ("u" "Url" entry (file+headline "~/src/bitbucket.org/mitchty/org/urls.org" "Urls") "* %u\n\n %i" :prepend t) - )) - ) + ))) ;; typing stuff like the mode for a snippet is for chumps (add-to-list 'org-structure-template-alist '("el" "#+BEGIN_SRC emacs-lisp\n?\n#+END_SRC" "")) (add-to-list 'org-structure-template-alist '("hs" "#+BEGIN_SRC haskell\n?\n#+END_SRC" "")) (add-to-list 'org-structure-template-alist '("pl" "#+BEGIN_SRC perl\n?\n#+END_SRC" "")) (add-to-list 'org-structure-template-alist '("py" "#+BEGIN_SRC python\n?\n#+END_SRC" "")) + (add-to-list 'org-structure-template-alist '("rb" "#+BEGIN_SRC ruby\n?\n#+END_SRC" "")) + ;; LATER + ;; (add-to-list 'org-structure-template-alist '("rs" "#+BEGIN_SRC rust\n?\n#+END_SRC" "")) (add-to-list 'org-structure-template-alist '("sh" "#+BEGIN_SRC sh\n?\n#+END_SRC" "")) - (org-babel-do-load-languages 'org-babel-load-languages - (append org-babel-load-languages - '( - (C . t) - (ditaa . t) - (emacs-lisp . t) - (haskell . t) - (latex . t) - (perl . t) - (python . t) - (ruby . t) - (sh . t) - ))) (add-hook 'after-init-hook (lambda () (org-reload))) ) ) @@ -741,20 +731,51 @@ Org-mode keybindings and settings, pretty sparse really. (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•")))))) ) ) - (use-package org-roam - :hook - (after-init . org-roam-mode) - :init - (custom-set-variables '(org-roam-directory "~/.emacs.d")) - :bind (:map org-roam-mode-map - (("C-c n l" . org-roam) - ("C-c n f" . org-roam-find-file) - ("C-c n j" . org-roam-jump-to-index) - ("C-c n b" . org-roam-switch-to-buffer) - ("C-c n g" . org-roam-graph)) - :map org-mode-map - (("C-c n i" . org-roam-insert)))) - (use-package ob-async) +#+END_SRC + +Note ob is a builtin not really an external package. + +#+BEGIN_SRC emacs-lisp + (use-package ob + :custom (org-confirm-babel-evaluate nil) + :after org + :config + (use-package ob-async :defer 10) ;; For whatever reason not deferring causes issues. + (org-babel-do-load-languages 'org-babel-load-languages + (append org-babel-load-languages + '( + (C . t) + (calc . t) + (ditaa . t) + (emacs-lisp . t) + (haskell . t) + (latex . t) + (perl . t) + (python . t) + (ruby . t) + ;; (rust . t) + (shell . t) + ))) + :hook ((org-babel-after-execute . org-display-inline-images))) +#+END_SRC + + +#+BEGIN_SRC emacs-lisp :tangle no + (use-package org-roam + :after org + :defer 10 + :hook + (after-init . org-roam-mode) + :init + (custom-set-variables '(org-roam-directory "~/.emacs.d")) + :bind (:map org-roam-mode-map + (("C-c n l" . org-roam) + ("C-c n f" . org-roam-find-file) + ("C-c n j" . org-roam-jump-to-index) + ("C-c n b" . org-roam-switch-to-buffer) + ("C-c n g" . org-roam-graph)) + :map org-mode-map + (("C-c n i" . org-roam-insert)))) #+END_SRC #+BEGIN_SRC emacs-lisp :tangle no diff --git a/nix.org b/nix.org index 9244c48..8c45a02 100644 --- a/nix.org +++ b/nix.org @@ -15,7 +15,8 @@ Nix user config.nix setup. { packageOverrides = pkgs: with pkgs; let in rec { - custom-pinentry = pinentry.override { gtk2 = null; ncurses = null; }; + # TODO: do I still care about this? + # custom-pinentry = pinentry.override { gtk2 = null; ncurses = null; }; custom-youtube-dl = python27Packages.youtube-dl.override { pandoc = null; }; default = buildEnv { @@ -25,13 +26,14 @@ Nix user config.nix setup. aria aspell aspellDicts.en - cacert + # TODO: New installs have this conflict with another package, still neeeded? + # cacert clang cloc cscope ctags curl - custom-pinentry + # custom-pinentry custom-youtube-dl diffutils docbook5