Skip to content

Commit

Permalink
split config to separate files
Browse files Browse the repository at this point in the history
  • Loading branch information
lnfiniteMonkeys committed Aug 12, 2018
1 parent d9daefd commit c531cbf
Show file tree
Hide file tree
Showing 6 changed files with 344 additions and 380 deletions.
3 changes: 3 additions & 0 deletions additional-settings.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(use-package magit)
(use-package pdf-tools)
(use-package org-pdfview)
56 changes: 19 additions & 37 deletions init.el
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,23 @@
(require 'use-package)
(setq use-package-always-ensure t))

(global-set-key [tab] 'indent-for-tab-command)
;;unindent?

(global-set-key (kbd "C-w") 'kill-whole-line)

(org-babel-load-file (expand-file-name "~/.emacs.d/setup.org"))

(require 'timelines "~/.emacs.d/timelines.el")

(require 'ox-latex)
(add-to-list (quote org-latex-classes) (quote ("dissertation" "\\documentclass{report}" ("\\chapter{%s}" . "\\chapter*{%s}") ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}") ("\\paragraph{%s}" . "\\paragraph*{%s}"))))


(org-babel-do-load-languages
'org-babel-load-languages
'((emacs-lisp . t)
(python . t)
(haskell . t)))


(setq exec-path (append exec-path '("C:/Users/Carl/AppData/Local/Programs/MiKTeX 2.9/miktex/bin/x64")))

(use-package elpy)
(elpy-enable)
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(package-selected-packages
(quote
(intero elpy yasnippet which-key use-package smartparens scroll-restore org-pdfview monokai-theme magit ido-vertical-mode hydra ghc avy))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
;; load the timelines mode
(require 'timelines "timelines-mode.el")

;; load the TimeLines setup file
(org-babel-load-file (expand-file-name "~/.emacs.d/timelines-setup.org"))

;; load any additional files if they exist
(let ((qwerty-to-dvorak "qwerty-to-dvorak.el")
(additional-settings "additional-settings.el")
(local-settings "local-settings.el"))
(when (file-exists-p qwerty-to-dvorak)
(load-file qwerty-to-dvorak))
(when (file-exists-p additional-settings)
(load-file additional-settings))
(when (file-exists-p local-settings)
(load-file local-settings))
)

(global-set-key [tab] 'indent-for-tab-command)

83 changes: 83 additions & 0 deletions qwerty-to-dvorak.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
;;;;;; QWERTY -> DVORAK while keeping all keybindngs the same
;; First row
(define-key key-translation-map (kbd "q") (kbd "'"))
(define-key key-translation-map (kbd "w") (kbd ","))
(define-key key-translation-map (kbd "e") (kbd "."))
(define-key key-translation-map (kbd "r") (kbd "p"))
(define-key key-translation-map (kbd "t") (kbd "y"))
(define-key key-translation-map (kbd "y") (kbd "f"))
(define-key key-translation-map (kbd "u") (kbd "g"))
(define-key key-translation-map (kbd "i") (kbd "c"))
(define-key key-translation-map (kbd "o") (kbd "r"))
(define-key key-translation-map (kbd "p") (kbd "l"))
(define-key key-translation-map (kbd "[") (kbd "/"))
(define-key key-translation-map (kbd "]") (kbd "="))

(define-key key-translation-map (kbd "Q") (kbd "\""))
(define-key key-translation-map (kbd "W") (kbd "<"))
(define-key key-translation-map (kbd "E") (kbd ">"))
(define-key key-translation-map (kbd "R") (kbd "P"))
(define-key key-translation-map (kbd "T") (kbd "Y"))
(define-key key-translation-map (kbd "Y") (kbd "F"))
(define-key key-translation-map (kbd "U") (kbd "G"))
(define-key key-translation-map (kbd "I") (kbd "C"))
(define-key key-translation-map (kbd "O") (kbd "R"))
(define-key key-translation-map (kbd "P") (kbd "L"))
(define-key key-translation-map (kbd "{") (kbd "?"))
(define-key key-translation-map (kbd "}") (kbd "+"))

;; Second row
(define-key key-translation-map (kbd "a") (kbd "a"))
(define-key key-translation-map (kbd "s") (kbd "o"))
(define-key key-translation-map (kbd "d") (kbd "e"))
(define-key key-translation-map (kbd "f") (kbd "u"))
(define-key key-translation-map (kbd "g") (kbd "i"))
(define-key key-translation-map (kbd "h") (kbd "d"))
(define-key key-translation-map (kbd "j") (kbd "h"))
(define-key key-translation-map (kbd "k") (kbd "t"))
(define-key key-translation-map (kbd "l") (kbd "n"))
(define-key key-translation-map (kbd ";") (kbd "s"))
(define-key key-translation-map (kbd "'") (kbd "-"))

(define-key key-translation-map (kbd "A") (kbd "A"))
(define-key key-translation-map (kbd "S") (kbd "O"))
(define-key key-translation-map (kbd "D") (kbd "E"))
(define-key key-translation-map (kbd "F") (kbd "U"))
(define-key key-translation-map (kbd "G") (kbd "I"))
(define-key key-translation-map (kbd "H") (kbd "D"))
(define-key key-translation-map (kbd "J") (kbd "H"))
(define-key key-translation-map (kbd "K") (kbd "T"))
(define-key key-translation-map (kbd "L") (kbd "N"))
(define-key key-translation-map (kbd ":") (kbd "S"))
(define-key key-translation-map (kbd "\"") (kbd "_"))

;; Third row
(define-key key-translation-map (kbd "z") (kbd ";"))
(define-key key-translation-map (kbd "x") (kbd "q"))
(define-key key-translation-map (kbd "c") (kbd "j"))
(define-key key-translation-map (kbd "v") (kbd "k"))
(define-key key-translation-map (kbd "b") (kbd "x"))
(define-key key-translation-map (kbd "n") (kbd "b"))
(define-key key-translation-map (kbd "m") (kbd "m"))
(define-key key-translation-map (kbd ",") (kbd "w"))
(define-key key-translation-map (kbd ".") (kbd "v"))
(define-key key-translation-map (kbd "/") (kbd "z"))

(define-key key-translation-map (kbd "Z") (kbd ":"))
(define-key key-translation-map (kbd "X") (kbd "Q"))
(define-key key-translation-map (kbd "C") (kbd "J"))
(define-key key-translation-map (kbd "V") (kbd "K"))
(define-key key-translation-map (kbd "B") (kbd "X"))
(define-key key-translation-map (kbd "N") (kbd "B"))
(define-key key-translation-map (kbd "M") (kbd "M"))
(define-key key-translation-map (kbd "<") (kbd "W"))
(define-key key-translation-map (kbd ">") (kbd "V"))
(define-key key-translation-map (kbd "?") (kbd "Z"))

;; Misc
(define-key key-translation-map (kbd "-") (kbd "["))
(define-key key-translation-map (kbd "=") (kbd "]"))

(define-key key-translation-map (kbd "_") (kbd "{"))
(define-key key-translation-map (kbd "+") (kbd "}"))

Loading

0 comments on commit c531cbf

Please sign in to comment.