summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bookmarks8
-rw-r--r--myinit.org30
2 files changed, 33 insertions, 5 deletions
diff --git a/bookmarks b/bookmarks
index 5e2197b..7f6ca60 100644
--- a/bookmarks
+++ b/bookmarks
@@ -1,4 +1,4 @@
-;;;; Emacs Bookmark Format Version 1;;;; -*- coding: utf-8; mode: lisp-data -*-
+;;;; Emacs Bookmark Format Version 1 ;;;; -*- coding: utf-8 -*-
;;; This format is meant to be slightly human-readable;
;;; nevertheless, you probably don't want to edit it.
;;; -*- End Of Bookmark File Format Version Stamp -*-
@@ -40,7 +40,7 @@
(position . 2261))
("org-capture-last-stored"
(filename . "~/org/home.org")
- (front-context-string . "** TODO Book tic")
- (rear-context-string . " Single Actions\n")
- (position . 18))
+ (front-context-string . "** NEXT Fix emac")
+ (rear-context-string . "+TAGS:\n\n* Tasks\n")
+ (position . 89))
)
diff --git a/myinit.org b/myinit.org
index 85fd37f..d855c35 100644
--- a/myinit.org
+++ b/myinit.org
@@ -73,12 +73,25 @@
;; auto revert files
(global-auto-revert-mode t)
+ ;; BACKUPS/LOCKFILES --------
+ ;; Don't generate backups or lockfiles.
+ (setq create-lockfiles nil
+ make-backup-files nil
+ ;; But in case the user does enable it, some sensible defaults:
+ version-control t ; number each backup file
+ backup-by-copying t ; instead of renaming current file (clobbers links)
+ delete-old-versions t ; clean up after itself
+ kept-old-versions 5
+ kept-new-versions 5
+ backup-directory-alist (list (cons "." (concat user-emacs-directory "backup/"))))
+
;; Display the current time
(display-time-mode t)
(setq visible-bell t)
- (set-frame-font "Hack-10" nil t)
+ ;; (set-face-attribute 'default t :font "Hack-10")
+ (set-face-attribute 'default nil :font "-SRC-Hack-normal-normal-normal-*-26-*-*-*-m-0-iso10646-1")
(use-package gruber-darker-theme
:ensure t
@@ -146,6 +159,7 @@
(ignore-errors (yas-next-field))))))
#+END_SRC
** company
+
#+BEGIN_SRC emacs-lisp
;; this config works better with yasnippet
(use-package company
@@ -188,6 +202,20 @@ If failed try to complete the common part with `company-complete-common'"
(company-complete-common))))
(company-complete-common))))
#+END_SRC
+** deft
+#+begin_src emacs-lisp
+ (use-package deft
+ :ensure t
+ :config
+ (defun mrl/kill-deft ()
+ (kill-buffer "*Deft*"))
+ (setq deft-directory "~/Notes/Archive"
+ deft-extensions '("org" "md" "txt")
+ deft-recursive t
+ deft-file-limit 40
+ deft-use-filename-as-title t)
+ (add-hook 'deft-open-file-hook 'mrl/kill-deft))
+#+end_src
** ace-jump
#+BEGIN_SRC emacs-lisp
;; Ace Jump