Skip to content

Commit 6fc09dc

Browse files
committed
[Emacs] inline .emacs-custom.el
1 parent e093395 commit 6fc09dc

File tree

4 files changed

+58
-97
lines changed

4 files changed

+58
-97
lines changed

.emacs

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@
9191
(whitespace-mode 1)
9292
(add-to-list 'write-file-functions 'delete-trailing-whitespace))
9393

94-
(custom-set-variables
95-
'(whitespace-style (quote (face tabs spaces trailing space-before-tab
96-
newline indentation empty space-after-tab
97-
space-mark tab-mark))))
98-
9994
(let ((whitespace-enabled-modes
10095
'(
10196
tuareg-mode-hook
@@ -285,5 +280,61 @@
285280

286281
(load "~/.emacs.shadow/shadow-rc.el" t)
287282

288-
(setq custom-file "~/.emacs-custom.el")
289-
(load custom-file)
283+
(custom-set-variables
284+
;; custom-set-variables was added by Custom.
285+
;; If you edit it by hand, you could mess it up, so be careful.
286+
;; Your init file should contain only one such instance.
287+
;; If there is more than one, they won't work right.
288+
'(org-agenda-dim-blocked-tasks nil)
289+
'(org-agenda-exporter-settings (quote ((org-agenda-tag-filter-preset (list "+personal")))))
290+
'(org-cliplink-transport-implementation (quote url-el))
291+
'(org-enforce-todo-dependencies nil)
292+
'(org-modules
293+
(quote
294+
(org-bbdb org-bibtex org-docview org-gnus org-habit org-info org-irc org-mhe org-rmail org-w3m)))
295+
'(org-refile-use-outline-path (quote file))
296+
'(package-selected-packages
297+
(quote
298+
(zeal-at-point yaml-mode xquery-mode uuidgen tuareg tt-mode toml-mode tide smex slime rtags rainbow-mode racket-mode racer qml-mode purescript-mode powershell picolisp-mode php-mode paredit pacmacs package-lint org-pomodoro org-cliplink openwith nsis-mode nodejs-repl nix-mode nim-mode nginx-mode neotree nasm-mode multiple-cursors morganey-mode markdown-mode magit love-minor-mode less-css-mode kotlin-mode js2-mode jira-markup-mode jinja2-mode jade-mode jabber ido-ubiquitous htmlize helm-ls-git helm-git-grep helm-cmd-t haskell-mode handlebars-mode gruber-darker-theme groovy-mode graphviz-dot-mode gradle-mode google-translate go-mode glsl-mode ggtags fsharp-mode flycheck-rust fixmee evil erlang ensime emojify elpy elm-mode elfeed editorconfig dropdown-list dockerfile-mode d-mode csv-nav csharp-mode crux cmake-mode clojure-mode cil-mode buffer-move bnfc batch-mode ag ack)))
299+
'(safe-local-variable-values
300+
(quote
301+
((haskell-process-args-cabal-new-repl "--ghc-option=-ferror-spans" "--ghc-option=-Wno-missing-home-modules" "exe:HyperNerd")
302+
(haskell-process-args-cabal-repl "--ghc-option=-ferror-spans" "--ghc-option=-Wno-missing-home-modules" "exe:poutro")
303+
(haskell-process-args-cabal-repl "--ghc-option=-ferror-spans" "--ghc-option=-Wno-missing-home-modules" "exe:HyperNerd")
304+
(fixmee-mode . t)
305+
(eval progn
306+
(auto-revert-mode 1)
307+
(rc/autopull-changes)
308+
(add-hook
309+
(quote after-save-hook)
310+
(quote rc/autocommit-changes)
311+
nil
312+
(quote make-it-local)))
313+
(eval progn
314+
(rc/autopull-changes)
315+
(add-hook
316+
(quote after-save-hook)
317+
(quote rc/autocommit-changes)
318+
nil
319+
(quote make-it-local)))
320+
(eval when
321+
(eq system-type
322+
(quote gnu/linux))
323+
(rc/autopull-changes)
324+
(add-hook
325+
(quote after-save-hook)
326+
(quote rc/autocommit-changes)
327+
nil
328+
(quote make-it-local)))
329+
(eval rc/autocommit-dir-locals)
330+
(eval when
331+
(fboundp
332+
(quote flymake-mode))
333+
(flymake-mode 1))
334+
(eval when
335+
(fboundp
336+
(quote rainbow-mode))
337+
(rainbow-mode 1)))))
338+
'(whitespace-style
339+
(quote
340+
(face tabs spaces trailing space-before-tab newline indentation empty space-after-tab space-mark tab-mark))))

.emacs-custom.el

Lines changed: 0 additions & 66 deletions
This file was deleted.

.emacs.rc/org-mode-rc.el

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,6 @@
55

66
(setq org-export-backends '(md))
77

8-
(custom-set-variables
9-
'(org-modules
10-
(quote
11-
(org-bbdb
12-
org-bibtex
13-
org-docview
14-
org-gnus
15-
org-habit
16-
org-info
17-
org-irc
18-
org-mhe
19-
org-rmail
20-
org-w3m)))
21-
'(org-enforce-todo-dependencies nil)
22-
'(org-agenda-dim-blocked-tasks nil)
23-
'(org-agenda-exporter-settings
24-
(quote ((org-agenda-tag-filter-preset (list "+personal")))))
25-
'(org-refile-use-outline-path (quote file)))
26-
278
(defun rc/org-increment-move-counter ()
289
(interactive)
2910

@@ -62,10 +43,6 @@
6243

6344
(rc/require 'org-cliplink)
6445

65-
(when (eq system-type 'gnu/linux)
66-
(custom-set-variables
67-
'(org-cliplink-transport-implementation (quote url-el))))
68-
6946
(global-set-key (kbd "C-x p i") 'org-cliplink)
7047

7148
(defun rc/cliplink-task ()

MANIFEST

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
.emacs.rc|symlink|
33
.emacs.snippets|symlink|
44
.emacs.local|symlink|
5-
.emacs-custom.el|symlink|
65
.gitconfig|symlink|
76
.rexim|symlink|

0 commit comments

Comments
 (0)