Merge branch 'master' of gitlab.com:codertilldeath/emacs-config

This commit is contained in:
Benson Chu 2018-04-26 19:48:05 -05:00
commit 61f672870f
3 changed files with 89 additions and 80 deletions

View file

@ -78,8 +78,8 @@
** Config
#+BEGIN_SRC emacs-lisp
(use-package exwm)
(use-package exwm-systemtray)
(use-package exwm-config)
(require 'exwm-systemtray)
(require 'exwm-config)
(exwm-config-default)
;(setq exwm-input-line-mode-passthrough t)
#+END_SRC
@ -223,7 +223,7 @@
#+END_SRC
** xrandr
#+BEGIN_SRC emacs-lisp
(use-package exwm-randr)
(require 'exwm-randr)
;No dash when using intel driver
(setq exwm-randr-workspace-output-plist '(1 "HDMI1" 3 "HDMI1"))
(exwm-randr-enable)
@ -726,7 +726,7 @@
** Navigation
*** Helm & counsel
#+BEGIN_SRC emacs-lisp
(use-package helm-config)
(require 'helm-config)
(use-package company)
(helm-mode 1)
;(setq ivy-initial-inputs-alist nil)
@ -759,7 +759,7 @@
#+END_SRC
***** Config
#+BEGIN_SRC emacs-lisp
(use-package ibuf-ext)
(require 'ibuf-ext)
(autoload 'ibuffer "ibuffer" "List buffers." t)
(add-to-list 'ibuffer-never-show-predicates
'(lambda (buf)
@ -839,7 +839,7 @@
* Tools
** Encryption
#+BEGIN_SRC emacs-lisp
(use-package epa-file)
(require 'epa-file)
(epa-file-enable)
(setq epa-pinentry-mode 'loopback)
(setq epa-file-cache-passphrase-for-symmetric-encryption t)
@ -1058,7 +1058,7 @@
#+END_SRC
**** Norang Projects code
#+BEGIN_SRC emacs-lisp
(use-package org-habit)
(require 'org-habit)
(defun bh/find-project-task ()
"Move point to the parent (project) task if any"
@ -1474,6 +1474,9 @@
#+END_SRC
**** calfw-org
#+BEGIN_SRC emacs-lisp
(use-package calfw)
(use-package calfw-ical)
(use-package calfw-gcal)
(use-package calfw-org)
(global-set-key (kbd "C-c A") 'cfw:open-org-calendar)
(setq cfw:org-overwrite-default-keybinding t)
@ -1515,8 +1518,8 @@
#+END_SRC
*** Code-blocks
#+BEGIN_SRC emacs-lisp
(use-package ob-core)
(use-package ob-clojure)
(require 'ob-core)
(require 'ob-clojure)
(setq org-babel-clojure-backend 'cider)
(org-babel-do-load-languages
'org-babel-load-languages
@ -1548,7 +1551,7 @@
#+END_SRC
*** Require org-protocol
#+BEGIN_SRC emacs-lisp
(use-package org-protocol)
(require 'org-protocol)
#+END_SRC
*** Allow alphabetic lists
#+BEGIN_SRC emacs-lisp
@ -1561,69 +1564,6 @@
(add-to-list 'org-structure-template-alist
'("so" "#+BEGIN_SRC ? :results output\n\n#+END_SRC"))
#+END_SRC
** mu4e
*** General config
#+BEGIN_SRC emacs-lisp
(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
(setq mu4e-msg2pdf "~/.emacs.d/el-get/mu4e/toys/msg2pdf/msg2pdf")
(use-package mu4e)
(add-to-list 'mu4e-view-actions
'("ViewInBrowser" . mu4e-action-view-in-browser) t)
(global-set-key (kbd "<f8>") 'mu4e)
#+END_SRC
*** Multiple accounts
#+BEGIN_SRC emacs-lisp
(setq mu4e-sent-folder "/Gmail/[Gmail].Sent Mail"
mu4e-drafts-folder "/Gmail/[Gmail].Drafts"
mu4e-refile-folder "/Gmail/[Gmail].Archive"
user-mail-address "bensonchu457@gmail.com"
smtpmail-default-smtp-server "smtp.gmail.com"
smtpmail-smtp-server "smtp.gmail.com")
(defvar my-mu4e-account-alist
'(("Gmail"
(mu4e-sent-folder "/work/Sent Mail")
(mu4e-drafts-folder "/Gmail/[Gmail].Drafts")
(mu4e-refile-folder "/Gmail/[Gmail].Archive")
(user-mail-address "bensonchu457@gmail.com")
(smtpmail-default-smtp-server "smtp.gmail.com")
(smtpmail-smtp-user "bensonchu457")
(smtpmail-smtp-server "smtp.gmail.com"))
("work"
(mu4e-sent-folder "/work/Sent")
(mu4e-drafts-folder "/work/Drafts")
(mu4e-refile-folder "/work/Archive")
(user-mail-address "bchu3@uh.edu")
(smtpmail-default-smtp-server "smtp.account2.example.com")
(smtpmail-smtp-user "bchu3")
(smtpmail-smtp-server "smtp.account2.example.com"))))
;(defun my-mu4e-set-account ()
; "Set the account for composing a message."
; (let* ((account
; (if mu4e-compose-parent-message
; (let ((maildir (mu4e-message-field mu4e-compose-parent-message :maildir)))
; (string-match "/\\(.*?\\)/" maildir)
; (match-string 1 maildir))
; (completing-read (format "Compose with account: (%s) "
; (mapconcat #'(lambda (var) (car var))
; my-mu4e-account-alist "/"))
; (mapcar #'(lambda (var) (car var)) my-mu4e-account-alist)
; nil t nil nil (caar my-mu4e-account-alist))))
; (account-vars (cdr (assoc account my-mu4e-account-alist))))
; (if account-vars
; (mapc #'(lambda (var)
; (set (car var) (cadr var)))
; account-vars)
; (error "No email account found"))))
; (add-hook 'mu4e~headers-jump-to-maildir 'my-mu4e-set-account)
#+END_SRC
** Elfeed
#+BEGIN_SRC emacs-lisp
;; Load elfeed-org
@ -1670,7 +1610,7 @@
(define-key elfeed-search-mode-map "d" 'elfeed-search-youtube-dl)
(setq youtube-dl-directory "~/big_files/Videos/youtube-dl")
(use-package dired-aux)
(require 'dired-aux)
(defvar dired-filelist-cmd
'(("vlc" "-L")))
@ -1804,7 +1744,7 @@
** Youtube-dl
#+BEGIN_SRC emacs-lisp
(add-to-list 'load-path "~/.emacs.d/custom/youtube-dl-emacs/")
(use-package youtube-dl)
(require 'youtube-dl)
#+END_SRC
** Spaces
#+BEGIN_SRC emacs-lisp
@ -1819,6 +1759,70 @@
(add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode))
(add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode))
#+END_SRC
* Broken
** mu4e
*** General config
#+BEGIN_SRC emacs-lisp
(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
(setq mu4e-msg2pdf "~/.emacs.d/el-get/mu4e/toys/msg2pdf/msg2pdf")
(require 'mu4e)
(add-to-list 'mu4e-view-actions
'("ViewInBrowser" . mu4e-action-view-in-browser) t)
(global-set-key (kbd "<f8>") 'mu4e)
#+END_SRC
*** Multiple accounts
#+BEGIN_SRC emacs-lisp
(setq mu4e-sent-folder "/Gmail/[Gmail].Sent Mail"
mu4e-drafts-folder "/Gmail/[Gmail].Drafts"
mu4e-refile-folder "/Gmail/[Gmail].Archive"
user-mail-address "bensonchu457@gmail.com"
smtpmail-default-smtp-server "smtp.gmail.com"
smtpmail-smtp-server "smtp.gmail.com")
(defvar my-mu4e-account-alist
'(("Gmail"
(mu4e-sent-folder "/work/Sent Mail")
(mu4e-drafts-folder "/Gmail/[Gmail].Drafts")
(mu4e-refile-folder "/Gmail/[Gmail].Archive")
(user-mail-address "bensonchu457@gmail.com")
(smtpmail-default-smtp-server "smtp.gmail.com")
(smtpmail-smtp-user "bensonchu457")
(smtpmail-smtp-server "smtp.gmail.com"))
("work"
(mu4e-sent-folder "/work/Sent")
(mu4e-drafts-folder "/work/Drafts")
(mu4e-refile-folder "/work/Archive")
(user-mail-address "bchu3@uh.edu")
(smtpmail-default-smtp-server "smtp.account2.example.com")
(smtpmail-smtp-user "bchu3")
(smtpmail-smtp-server "smtp.account2.example.com"))))
;(defun my-mu4e-set-account ()
; "Set the account for composing a message."
; (let* ((account
; (if mu4e-compose-parent-message
; (let ((maildir (mu4e-message-field mu4e-compose-parent-message :maildir)))
; (string-match "/\\(.*?\\)/" maildir)
; (match-string 1 maildir))
; (completing-read (format "Compose with account: (%s) "
; (mapconcat #'(lambda (var) (car var))
; my-mu4e-account-alist "/"))
; (mapcar #'(lambda (var) (car var)) my-mu4e-account-alist)
; nil t nil nil (caar my-mu4e-account-alist))))
; (account-vars (cdr (assoc account my-mu4e-account-alist))))
; (if account-vars
; (mapc #'(lambda (var)
; (set (car var) (cadr var)))
; account-vars)
; (error "No email account found"))))
; (add-hook 'mu4e~headers-jump-to-maildir 'my-mu4e-set-account)
#+END_SRC
* Disabled
** nnreddit
#+BEGIN_SRC emacs-lisp#

View file

@ -16,7 +16,7 @@
'(org-export-backends (quote (ascii beamer html icalendar latex)))
'(package-selected-packages
(quote
(use-package glsl-mode oauth2 ng2-mode transpose-frame org clj-refactor clojure-snippets common-lisp-snippets company-auctex go-snippets haskell-snippets java-snippets ensime yasnippet-bundle yasnippet helm-exwm csharp-mode smex dashboard matlab-mode beacon company-flx dired-du diredful free-keys elfeed-goodies exwm-surf el-autoyas flycheck-clojure flycheck-haskell flycheck-irony flycheck-pycheckers company-erlang company-ghc company-ghci company-go company-lua company-arduino company-c-headers company-cmake company-distel company-lsp company-irony ac-c-headers ac-html ac-html-angular ac-slime ac-cider ace-window exwm angular-mode neotree smart-mode-line-powerline-theme smart-mode-line airline-themes counsel-projectile helm-projectile projectile ace-jump-mode ace-jump-buffer ace-jump-helm-line resize-window volume babel babel-repl lua-mode pocket-reader el-pocket magit-svn magit dirtree mu4e-alert habitica scala-mode auto-complete w3m wanderlust calfw calfw-gcal org-gcal nlinum nlinum-relative color-theme-modern linum-relative helm i3wm org-bullets auctex windresize slime powerline-evil persistent-soft pdf-tools multi-term ergoemacs-mode epresent engine-mode cyberpunk-theme cider)))
(youtube-dl irony dired-aux elfeed-org elfeed calfw-ical mu4e org-protocol ox-reveal ob-clojure ob-core org-caldav calfw-org org-habit epa-file switch-window ibuf-ext evil company helm-config exwm-randr exwm-config exwm-systemtray which-key use-package glsl-mode oauth2 ng2-mode transpose-frame org clj-refactor clojure-snippets common-lisp-snippets company-auctex go-snippets haskell-snippets java-snippets ensime yasnippet-bundle yasnippet helm-exwm csharp-mode smex dashboard matlab-mode beacon company-flx dired-du diredful free-keys elfeed-goodies exwm-surf el-autoyas flycheck-clojure flycheck-haskell flycheck-irony flycheck-pycheckers company-erlang company-ghc company-ghci company-go company-lua company-arduino company-c-headers company-cmake company-distel company-lsp company-irony ac-c-headers ac-html ac-html-angular ac-slime ac-cider ace-window exwm angular-mode neotree smart-mode-line-powerline-theme smart-mode-line airline-themes counsel-projectile helm-projectile projectile ace-jump-mode ace-jump-buffer ace-jump-helm-line resize-window volume babel babel-repl lua-mode pocket-reader el-pocket magit-svn magit dirtree mu4e-alert habitica scala-mode auto-complete w3m wanderlust calfw calfw-gcal org-gcal nlinum nlinum-relative color-theme-modern linum-relative helm i3wm org-bullets auctex windresize slime powerline-evil persistent-soft pdf-tools multi-term ergoemacs-mode epresent engine-mode cyberpunk-theme cider)))
'(send-mail-function (quote mailclient-send-it))
'(show-paren-mode t)
'(sml/mode-width

13
init.el
View file

@ -1,15 +1,17 @@
(setq package-list '(org use-package))
; list the repositories containing them
(setq package-archives '(("elpa" . "http://tromey.com/elpa/")
("gnu" . "http://elpa.gnu.org/packages/")
("marmalade" . "http://marmalade-repo.org/packages/")
(setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/")
("melpa" . "http://melpa.org/packages/")
("org" . "https://orgmode.org/elpa/")))
("org" . "https://orgmode.org/elpa/")
("elpa" . "http://tromey.com/elpa/")
("marmalade" . "http://marmalade-repo.org/packages/")))
; activate all the packages (in particular autoloads)
(package-initialize)
(when (not package-archive-contents)
(package-refresh-contents))
; fetch the list of packages available
(unless package-archive-contents
(package-refresh-contents))
@ -21,6 +23,9 @@
(require 'org)
(require 'use-package)
(setq use-package-always-ensure t)
(org-babel-load-file
(expand-file-name "config.org"
user-emacs-directory))