commit 17ef0eee6a9518b114160ac8a75f7f40ac302813
parent a965b85bcbc81b6dd59c389be30d823fff9348cf
Author: Yuval Langer <yuval.langer@gmail.com>
Date: Wed, 27 Jun 2018 15:45:58 +0300
Remove org myinit, quote a bunch of packages and fix package-archives
Diffstat:
3 files changed, 8 insertions(+), 765 deletions(-)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
@@ -1,7 +1,5 @@
-
;; start emacs server
;; (from https://github.com/edvorg/emacs-configs/blob/master/init-real.el)
-
(require 'server)
(unless (server-running-p)
(server-start))
@@ -12,9 +10,10 @@
(setq package-enable-at-startup nil)
-;; (add-to-list 'package-archives '("gnu" . "https://elpa.gnu.org/packages/"))
-(add-to-list 'package-archives '("melpa-bleeding-edge" . "https://melpa.org/packages/"))
-;; (add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/"))
+(setq package-archives '())
+(add-to-list 'package-archives '("gnu" . "https://elpa.gnu.org/packages/") t)
+(add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t)
+(add-to-list 'package-archives '("melpa-bleeding-edge" . "https://melpa.org/packages/") t)
(package-initialize)
diff --git a/.emacs.d/myinit.el b/.emacs.d/myinit.el
@@ -352,7 +352,7 @@
(setq proof-shell-quiet-errors nil)
)
-(use-package magit
+'(use-package magit
:config
(setq magit-log-section-arguments (quote ("--graph" "--color" "--decorate" "-n256")))
@@ -382,14 +382,14 @@
(setq erc-log-write-after-send t)
)
-(use-package circe
+'(use-package circe
:config
(setq log-mode t)
(setq erc-log-write-after-insert t)
(setq erc-log-write-after-send t)
)
-(use-package helm-circe
+'(use-package helm-circe
)
'(use-package matrix-client)
@@ -397,7 +397,7 @@
(use-package thumb-through
)
-(use-package eloud
+'(use-package eloud
:config
(setq eloud-mode t)
(setq eloud-speech-rate 200)
diff --git a/.emacs.d/myinit.org b/.emacs.d/myinit.org
@@ -1,756 +0,0 @@
-#+STARTUP: overview
-
-* myinit
-** globals
-
-#+BEGIN_SRC emacs-lisp
- (add-to-list 'auto-mode-alist '("\\.ipy\\'" . python-mode))
-#+END_SRC
-
-** shell
-*** better-shell
-#+BEGIN_SRC emacs-lisp
- (use-package better-shell
- :bind
- (
- ("C-'" . better-shell-shell)
- ("C-;" . better-shell-remote-open)
- )
- )
-#+END_SRC
-*** bash-completion
-#+BEGIN_SRC emacs-lisp
- (use-package bash-completion)
-#+END_SRC
-** User Interface tweaks
-
-#+BEGIN_SRC emacs-lisp
- (setq column-number-mode t)
- (setq display-battery-mode t)
- (setq electric-indent-mode nil)
- (setq indent-tabs-mode nil)
- (setq semantic-mode t)
- (setq show-paren-mode t)
- (setq word-wrap t)
- (setq inhibit-startup-message t)
-#+END_SRC
-
-*** Custom face
-
-#+BEGIN_SRC emacs-lisp
- (custom-set-faces
- '(default ((t (:inherit nil :stipple
- nil :background "white" :foreground "black" :inverse-video
- nil :box nil :strike-through nil :overline nil :underline
- nil :slant normal :weight normal :height 200 :width
- normal :foundry "PfEd" :family "Inconsolata" ))))
- '(aw-leading-char-face ((t (:inherit
- ace-jump-face-foreground :height 3.0))))
- )
-#+END_SRC
-
-*** Customize keys
-**** A quick way to reload the file contents into the buffer
-
-- [X] What is revert-buffer?
- - Reload file into its buffer.
-
-#+BEGIN_SRC emacs-lisp
- (global-set-key (kbd "<f5>") 'revert-buffer)
-#+END_SRC
-
-*** Customize buffer list
-
-#+BEGIN_SRC emacs-lisp
- (defalias 'list-buffers 'ibuffer-other-window
- )
-#+END_SRC
-
-*** Customize menu
-
-#+BEGIN_SRC emacs-lisp
- (setq gnus-group-update-tool-bar t)
- (setq menu-bar-mode nil)
- (setq tool-bar-mode nil)
-#+END_SRC
-
-*** Wrap and truncation
-
-#+BEGIN_SRC emacs-lisp
- (setq word-wrap t)
- (setq truncate-lines t)
-#+END_SRC
-
-** semantic-mode
-
-#+BEGIN_SRC emacs-lisp
- (use-package semantic
- :config
- (semantic-mode 1)
- )
-#+END_SRC
-
-** multiple-curses.el
-
-#+BEGIN_SRC emacs-lisp
- (use-package multiple-cursors
- :bind
- (
- ("C-S-c C-S-c" . mc/edit-lines)
- ("C->" . mc/mark-next-like-this)
- ("C-<" . mc/mark-previous-like-this)
- ("C-c C-<" . mc/mark-all-like-this)
- ))
-#+END_SRC
-
-** undo-tree-mode
-
-#+BEGIN_SRC emacs-lisp
- (use-package undo-tree
- :config
- (global-undo-tree-mode)
- )
-#+END_SRC
-
-** ede-mode
-
-#+BEGIN_SRC emacs-lisp
- (setq global-ede-mode t)
-#+END_SRC
-
-** Ido-mode
-
-#+BEGIN_SRC emacs-lisp
- (setq ido-enable-flex-matching t)
- (setq ido-everywhere t)
-
- (ido-mode 1)
-#+END_SRC
-
-** COMMENT projectile
-
-#+BEGIN_SRC emacs-lisp
- (use-package projectile
- )
-#+END_SRC
-
-** winner-mode
-
-#+BEGIN_SRC emacs-lisp
- (winner-mode 1)
- (windmove-default-keybindings)
-#+END_SRC
-
-** swiper-mode
-
-#+BEGIN_SRC emacs-lisp
- (use-package counsel
- )
-
- (use-package swiper-helm
- :config
- (ivy-mode 1)
- (setq ivy-use-virtual-buffers t)
-
- :bind
- (
- ("<f1> f" . counsel-describe-function)
- ("<f1> l" . counsel-find-library)
- ("<f1> v" . counsel-describe-variable)
- ("<f2> i" . counsel-info-lookup-symbol)
- ("<f2> u" . counsel-unicode-char)
- ("<f6>" . ivy-resume)
- ("C-S-o" . counsel-rhythmbox)
- ("C-c C-r" . ivy-resume)
- ("C-c g" . counsel-git)
- ("C-c j" . counsel-git-grep)
- ("C-c k" . counsel-ag)
- ("C-r" . counsel-expression-history)
- ("C-x C-f" . counsel-find-file)
- ("C-x l" . counsel-locate)
- ("C-s" . swiper)
- )
- )
-#+END_SRC
-
-** ace-window-mode
-
-#+BEGIN_SRC emacs-lisp
- (use-package ace-window
- :init
- (global-set-key [remap other-window] 'ace-window)
- )
-#+END_SRC
-
-** tabber-mode
-
-#+BEGIN_SRC emacs-lisp
- (use-package tabbar
- :config
- (tabbar-mode 1)
- )
-#+END_SRC
-
-** Evil-mode
-
-Turn Emacs into a VIM clone.
-
-#+BEGIN_SRC emacs-lisp
- '(use-package evil
- :config
- (evil-mode 1)
- (add-to-list 'evil-emacs-state-modes 'elfeed-show-mode)
- (add-to-list 'evil-emacs-state-modes 'elfeed-search-mode)
- )
-#+END_SRC
-*** COMMENT evil-goggles
-
-#+BEGIN_SRC emacs-lisp
- '(use-package evil-goggles
- :config
- (evil-goggles-mode)
- )
-#+END_SRC
-** try-mode
-
-Try packages by temporarily installing them.
-
-#+BEGIN_SRC emacs-lisp
- (use-package try
- )
-#+END_SRC
-
-** which key
-
-Brings up some help in the middle of a key sequence.
-
-#+BEGIN_SRC emacs-lisp
- (use-package which-key
- :config (which-key-mode)
- )
-#+END_SRC
-
-** Helm-mode
-
-#+BEGIN_SRC emacs-lisp
- (use-package helm
- :bind
- (
- ("C-x c f" . helm-multi-files)
- ("M-x" . helm-M-x)
- )
- )
-#+END_SRC
-
-** org-mode
-
-- What is [0/4]:
- - [ ] org-export-html-postamble
- - [ ] org-hide-leading-stars
- - [ ] org-startup-folded and (quote overview)
- - [ ] org-startup-indented
-
-#+BEGIN_SRC emacs-lisp
- (use-package org
- :requires ob-ditaa ob-ipython htmlize
-
- :config
- ;; Don't prompt me to confirm every time I want to evaluate a block.
- (setq org-confirm-babel-evaluate nil)
-
- (setq org-directory "~/foo/my-org-mode-notes")
- (setq org-default-notes-file (concat org-directory "/main.org"))
- (setq org-export-html-postamble nil)
- (setq org-hide-leading-stars t)
- (setq org-startup-folded 'overview)
- (setq org-startup-indented t)
-
- (add-to-list 'org-agenda-files "~/foo/my-org-mode-notes/")
- (add-to-list 'org-agenda-files "~/mine/orgmode/")
- (add-to-list 'org-agenda-files "~/mine/syncthing/sg3/shared/orgmode/")
- (add-to-list 'org-agenda-files "~/mine/syncthing/sg3/shared/orgzly/")
-
- (setq org-habit-following-days 30)
- (setq org-habit-show-all-today t)
- (setq org-habit-show-habits-only-for-today nil)
-
- (add-to-list 'org-modules 'org-bbdb)
- (add-to-list 'org-modules 'org-bibtex)
- (add-to-list 'org-modules 'org-docview)
- (add-to-list 'org-modules 'org-gnus)
- (add-to-list 'org-modules 'org-habit)
- (add-to-list 'org-modules 'org-info)
- (add-to-list 'org-modules 'org-irc)
- (add-to-list 'org-modules 'org-mhe)
- (add-to-list 'org-modules 'org-rmail)
- (add-to-list 'org-modules 'org-w3m)
-
- (add-to-list 'org-babel-load-languages '(emacs-lisp . t))
- (add-to-list 'org-babel-load-languages '(ipython . t))
- (add-to-list 'org-babel-load-languages '(python . t))
- (add-to-list 'org-babel-load-languages '(ditaa . t))
-
- (setq org-ditaa-jar-path "/usr/share/ditaa/ditaa.jar")
-
-
- (add-to-list 'org-babel-tangle-lang-exts '("haskell" . "hs"))
- (add-to-list 'org-babel-tangle-lang-exts '("ipython" . "ipy"))
-
-
- (defun org-babel-tangle-block ()
- (interactive)
- (let ((current-prefix-arg '(4)))
- (call-interactively 'org-babel-tangle))
- )
-
- (setq org-use-property-inheritance (list "STYLE"))
-
- (defun yuvallanger-org-find-main-file ()
- (interactive)
- (find-file "~/foo/my-org-mode-notes/main.org")
- )
-
- :bind
- (
- ("C-c a" . org-agenda)
- ;; ("C-c b" . org-babel-tangle-block)
- ("C-c b" . org-iswitchb)
- ("C-c c" . org-capture)
- ("C-c l" . org-store-link)
- ("C-c o" . yuvallanger-org-find-main-file)
- )
- )
-#+END_SRC
-
-*** org-ref
-
-#+BEGIN_SRC emacs-lisp
- (use-package org-ref
- :config
- ;; The following is from the README.org
- ;; https://github.com/jkitchin/org-ref/blob/master/README.org
- (setq reftex-default-bibliography '("~/ownCloud/bibliography/references.bib"))
- (setq org-ref-bibliography-notes "~/ownCloud/bibliography/notes.org")
- (setq org-ref-default-bibliography '("~/ownCloud/bibliography/references.bib"))
- (setq org-ref-pdf-directory "~/ownCloud/bibliography/bibtex-pdfs/")
- (setq bibtex-completion-bibliography "~/ownCloud/bibliography/references.bib")
- (setq bibtex-completion-library-path "~/ownCloud/bibliography/bibtex-pdfs")
- (setq bibtex-completion-notes-path "~/ownCloud/bibliography/helm-bibtex-notes")
- )
-#+END_SRC
-
-*** org-bullets
-
-Org bullets makes things look pretty.
-
-#+BEGIN_SRC emacs-lisp
- (use-package org-bullets
- :config
- (add-hook 'org-mode-hook
- (lambda () (org-bullets-mode 1)))
- )
-#+END_SRC
-
-*** org-caldav
-
-#+BEGIN_SRC emacs-lisp
- '(use-package org-caldav
- :config
- (setq org-caldav-url "https://owncloud.kaka.farm/remote.php/caldav/calendars/yuvallanger")
- (setq org-caldav-calendar-id "org-mode")
- (setq org-caldav-calendars '((:url "https://owncloud.kaka.farm/remote.php/caldav/calendars/yuvallanger"
- :calendar-id "org-mode"
- :files ("~/mine/orgmode/calendar.org")
- :inbox "~/mine/orgmode/caldav-sync-calendar-inbox.org")
-
- (:url "https://owncloud.kaka.farm/remote.php/dav/calendars/yuvallanger"
- :calendar-id "org-mode"
- :files ("~/mine/orgmode/tasks.org")
- :inbox "~/mine/orgmode/caldav-sync-tasks-inbox.org"))))
-#+END_SRC
-
-*** orgnav
-
-#+BEGIN_SRC emacs-lisp
- (use-package orgnav
- )
-#+END_SRC
-
-** Programming modes
-*** flymake
-
-#+BEGIN_SRC emacs-lisp
- (use-package flymake
- :config
- (setq flymake-start-syntax-check-on-find-file nil)
- )
-#+END_SRC
-
-*** COMMENT geiser
-#+BEGIN_SRC emacs-lisp
- (use-package geiser
- )
-#+END_SRC
-*** COMMENT racket-mode
-#+BEGIN_SRC emacs-lisp
- '(use-package racket-mode
- )
-#+END_SRC
-*** COMMENT arduino-mode
-
-#+BEGIN_SRC emacs-lisp
- '(use-package arduino-mode
- )
-#+END_SRC
-
-*** lispy
-
-#+BEGIN_SRC emacs-lisp
- (use-package lispy
- :config
- (add-hook 'lisp-mode-hook (lambda () (lispy-mode 1)))
- (add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1)))
- )
-#+END_SRC
-
-*** COMMENT smartparens
-
-#+BEGIN_SRC emacs-lisp
- (use-package smartparens
- :config
- (add-hook 'hy-mode-hook #'smartparens-strict-mode)
- )
-#+END_SRC
-
-*** rainbow-delimiters
-
-#+BEGIN_SRC emacs-lisp
- (use-package rainbow-delimiters
- :config
- (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)
- )
-#+END_SRC
-
-*** COMMENT kivy-mode
-
-#+BEGIN_SRC emacs-lisp
- (use-package kivy-mode
- )
-#+END_SRC
-
-*** yasnippet
-
-#+BEGIN_SRC emacs-lisp
- (use-package yasnippet
- :config
- (setq yas-snippet-dirs "~/foo/myasnippets")
- (yas-reload-all)
- (yas-global-mode 1)
- )
-#+END_SRC
-
-*** elisp
-
-**** COMMENT paredit
-
-#+begin_src emacs-lisp
- (use-package paredit
- )
-#+end_src
-
-*** Python
-
-**** python mode
-
-#+BEGIN_SRC elisp
- (use-package python
- :config
- (setq python-shell-interpreter "ipython")
- (setq python-shell-interpreter-args "-i --simple-prompt")
- (setq python-shell-interpreter-interactive-arg "-i --simple-prompt")
- )
-#+END_SRC
-
-**** COMMENT python-x
-
-#+BEGIN_SRC emacs-lisp
- (use-package python-x
- :config
- (python-x-setup))
-#+END_SRC
-
-**** pyvenv
-
-
-- pyvenv-mode
- - Responsible of entering and using virtualenvs.
-- pyvenv-tracking-mode
- - Responsible of entering a virtualenv as requested in an
- add-dir-local-variable or an add-file-local-variable.
-
-#+BEGIN_SRC emacs-lisp
- (use-package pyvenv
- :config
- (pyvenv-mode)
- (pyvenv-tracking-mode)
- ;; Let's try commenting this out.
- ;; (setq pyvenv-virtualenvwrapper-python "/usr/bin/env python")
- )
-#+END_SRC
-
-**** COMMENT live-py-mode
-
-#+BEGIN_SRC emacs-lisp
- (use-package live-py-mode
- )
-#+END_SRC
-
-**** elpy
-
-#+BEGIN_SRC emacs-lisp
- (use-package elpy
- :config
- (elpy-enable)
-
- (setq python-shell-interpreter "jupyter"
- python-shell-interpreter-args "console --simple-prompt")
-
- (setq elpy-rpc-python-command "python3.6")
- (setq elpy-syntax-check-command "flake8")
-
- ;; XXX TODO
- ;; (setq elpy-disable-backend-error-display nil)
- )
-#+END_SRC
-
-**** ob-ipython
-
-org-babel for Jupyter.
-
-#+BEGIN_SRC emacs-lisp
- (use-package ob-ipython
- :config
- ;; display/update images in the buffer after I evaluate.
- (add-hook 'org-babel-after-execute-hook
- 'org-display-inline-images 'append
- )
- )
-#+END_SRC
-
-**** EIN
-
-#+BEGIN_SRC emacs-lisp
- (use-package ein
- :requires markdown-mode
- )
-#+END_SRC
-
-**** hylang
-
-#+BEGIN_SRC emacs-lisp
- (use-package hy-mode
- :config
- (add-hook 'hy-mode-hook (lambda () (lispy-mode 1)))
- (add-hook 'hy-mode-hook #'rainbow-delimiters-mode)
- )
-#+END_SRC
-
-**** Customize
-
-#+BEGIN_SRC emacs-lisp
- (setq python-check-command "flake8")
- (setq python-indent-offset 4)
-#+END_SRC
-
-*** Haskell
-
-#+BEGIN_SRC emacs-lisp
- (use-package haskell-mode
- :config
- (setq haskell-hoogle-url "https://www.fpcomplete.com/hoogle?q=%s")
- (setq haskell-stylish-on-save t)
- (setq haskell-tags-on-save t)
- )
-#+END_SRC
-
-*** Coq (hehehe… it says "coq"…)
-
-#+BEGIN_SRC emacs-lisp
- '(use-package proof
- :config
- (setq proof-autosend-enable t)
- (setq proof-electric-terminator-enable t)
- (setq proof-shell-quiet-errors nil)
- )
-#+END_SRC
-
-**** Customize
-
-*** Magit
-
-A git mode recommended on the [[https://www.emacswiki.org/emacs/Git][Emacs wiki]].
-
-#+BEGIN_QUOTE
-Magit is the most popular front end for Git. If you are new to Git and
-do not need support for other vcs this is likely the package you
-should try first.
-#+END_QUOTE
-
-#+BEGIN_SRC emacs-lisp
- (use-package magit
- :config
- (setq magit-log-section-arguments (quote ("--graph" "--color" "--decorate" "-n256")))
-
- :bind
- (
- ("C-x g" . magit-status)
- ("C-x M-g" . magit-dispatch-popup)
- )
- )
-#+END_SRC
-
-*** COMMENT vc-fossil
-
-#+BEGIN_SRC emacs-lisp
- (use-package vc-fossil
- )
-#+END_SRC
-
-*** flycheck
-
-#+BEGIN_SRC emacs-lisp
- '(use-package flycheck
- :init (global-flycheck-mode)
- )
-#+END_SRC
-
-*** company-mode
-
-#+BEGIN_SRC emacs-lisp
- (use-package company
- :config
- (global-company-mode)
- )
-#+END_SRC
-
-** Communication
-*** COMMENT IRC
-**** ERC
-***** Customize
-
-#+BEGIN_SRC emacs-lisp
- (use-package erc
- :config
- (setq log-mode t)
- (setq erc-log-write-after-insert t)
- (setq erc-log-write-after-send t)
- )
-#+END_SRC
-**** COMMENT circe
-
-#+BEGIN_SRC emacs-lisp
- (use-package circe
- :config
- (setq log-mode t)
- (setq erc-log-write-after-insert t)
- (setq erc-log-write-after-send t)
- )
-#+END_SRC
-
-***** helm-circe
-
-#+BEGIN_SRC emacs-lisp
- (use-package helm-circe
- )
-#+END_SRC
-*** Matrix
-**** matrix-client
-
-#+BEGIN_SRC emacs-lisp
- '(use-package matrix-client)
-#+END_SRC
-
-** Accessability
-
-*** TODO COMMENT thumb-through
-
-Skim web pages? XXX
-
-#+begin_src emacs-lisp
- (use-package thumb-through
- )
-#+end_src
-
-*** COMMENT eloud
-
-Reads bits off the buffer.
-
-#+begin_src emacs-lisp
- (use-package eloud
- :config
- (setq eloud-mode t)
- (setq eloud-speech-rate 200)
- )
-#+end_src
-
-*** TODO COMMENT ereader
-
-XXX
-
-#+begin_src emacs-lisp
- '(use-package ereader
- )
-#+end_src
-
-*** COMMENT spray
-
-A speed reader.
-
-#+begin_src emacs-lisp
- (use-package spray
- :config
- (setq spray-save-point t)
- )
-#+end_src
-
-*** emacspeak
-
-How do we make this work? XXX
-
-#+begin_src emacs-lisp
- '(use-package emacspeak)
-#+end_src
-
-** RSS
-
-*** elfeed-org
-
-#+BEGIN_SRC emacs-lisp
- '(use-package elfeed-org
- :config
- (setq elfeed-curl-max-connections 10)
- (setq rmh-elfeed-org-files '("~/foo/my-org-mode-notes/elfeed.org" "~/mine/elfeed/private.org"))
- (elfeed-org)
-
- :bind
- (
- ("C-x w" . elfeed)
- )
- )
-#+END_SRC
-
-*** elfeed-goodies
-
-#+BEGIN_SRC emacs-lisp
- '(use-package elfeed-goodies
- )
-#+END_SRC
-
-** uptimes
-
-#+BEGIN_SRC emacs-lisp
- (use-package uptimes
- )
-#+END_SRC
-
-
