diff options
| -rw-r--r-- | emacs/.emacs.d/init.org | 12 | ||||
| -rw-r--r-- | nix/.config/nixpkgs/emacs.nix | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index b4d7c87b..841fa9d8 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -1198,14 +1198,6 @@ Don’t show uninteresting files in dired listings. (add-hook 'dired-mode-hook #'turn-on-dired-omit-mode))) #+END_SRC -#+BEGIN_SRC emacs-lisp -(use-package dired+ - :defer 5 - :config (progn - (diredp-toggle-find-file-reuse-dir 1) - (unbind-key "C-h C-m" dired-mode-map))) -#+END_SRC - Expand subfolders like a tree inside the parent #+BEGIN_SRC emacs-lisp @@ -1791,7 +1783,8 @@ I can use this to keep a journal. I should use it. :bind ("s-j" . org-journal-new-entry) :defer 20 :config (progn - (setq org-journal-date-format "%A, %d %B %Y") + (setq org-journal-date-format "%A, %d %B %Y" + org-journal-dir "~/Sync/Default/Documents/journal") (defun org-journal-display-entry-yesterday () "Show org-journal entry for yesterday" (interactive) @@ -2399,6 +2392,7 @@ Sometimes I might want to show off my emacs usage. :if (executable-find "vale") :config (progn (add-to-list 'flycheck-vale-modes 'org-mode) + (add-to-list 'flycheck-vale-modes 'org-journal-mode) (flycheck-vale-setup))) #+END_SRC diff --git a/nix/.config/nixpkgs/emacs.nix b/nix/.config/nixpkgs/emacs.nix index cb879a5d..1e439b6d 100644 --- a/nix/.config/nixpkgs/emacs.nix +++ b/nix/.config/nixpkgs/emacs.nix @@ -1,11 +1,11 @@ { pkgs ? import <nixpkgs> {}, + emacs ? pkgs.emacs, stdenv, - withMacPort ? stdenv.isDarwin }: let - myEmacs = if withMacPort then pkgs.emacs25Macport else pkgs.emacs; + myEmacs = emacs; emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages; elpaBuild = import <nixpkgs/pkgs/build-support/emacs/elpa.nix> { @@ -78,7 +78,6 @@ in crux cyphejor dired-narrow - dired-plus dired-subtree discover-my-major dockerfile-mode |