Skip to content

Commit 62c5e3b

Browse files
author
Andrew Gottemoller
committed
1. Remove CUA mode
2. Add org mode settings 3. Remove unused file modes
1 parent c93ac81 commit 62c5e3b

File tree

2 files changed

+22
-48
lines changed

2 files changed

+22
-48
lines changed

lib/bindings.el

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
(global-set-key (kbd "C-c a") 'org-agenda)
2+
(global-set-key (kbd "C-c c") 'org-capture)
3+
4+
15
(defvar bindings-c-mode-keymap (make-keymap) "bindings-c-mode keymap")
26

37
(define-key bindings-c-mode-keymap (kbd "C-\\") nil)

lib/settings.el

Lines changed: 18 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414

1515
(defalias 'yes-or-no-p 'y-or-n-p)
1616

17-
(cua-mode 1)
18-
(transient-mark-mode 1)
19-
(setq-default cua-auto-tabify-rectangles nil)
20-
(setq-default cua-keep-region-after-copy 1)
21-
2217
(setq-default whitespace-line-column nil)
2318
(setq-default whitespace-style '(face lines-tail))
2419
(global-whitespace-mode 1)
2520

21+
(setq org-directory (format "%s/%s" (getenv "dev_home") "org"))
22+
(setq org-agenda-files (list (format "%s/%s" (getenv "dev_home") "org")))
23+
(setq org-default-notes-file (format "%s/%s/%s" (getenv "dev_home") "org" "notes.org"))
24+
2625
(normal-erase-is-backspace-mode 1)
2726
(show-paren-mode 1)
2827
(menu-bar-mode 0)
@@ -69,37 +68,6 @@
6968
(sanitize-explicit-utf-8-unix)))
7069

7170

72-
(defun settings-scala-mode-config ()
73-
(when(eq major-mode 'scala-mode)
74-
(set-buffer-file-coding-system 'utf-8-unix nil 1)
75-
(bindings-dev-mode 1)
76-
77-
(setq tab-width 4)
78-
(setq require-final-newline 'visit-save)))
79-
80-
(defun settings-scala-mode-sanitize ()
81-
(when(eq major-mode 'scala-mode)
82-
(sanitize-implicit-utf-8-unix)))
83-
84-
85-
(defun settings-java-mode-config ()
86-
(when(eq major-mode 'java-mode)
87-
(set-buffer-file-coding-system 'utf-8-unix nil 1)
88-
(bindings-dev-mode 1)
89-
(styles-c-mode)
90-
91-
(setq c-syntactic-indentation 1)
92-
(setq c-basic-offset 4)
93-
(setq tab-width 4)
94-
(setq indent-tabs-mode nil)
95-
(setq c-tab-always-indent 1)
96-
(setq require-final-newline 'visit-save)))
97-
98-
(defun settings-java-mode-sanitize ()
99-
(when(eq major-mode 'java-mode)
100-
(sanitize-implicit-utf-8-unix)))
101-
102-
10371
(defun settings-js-mode-config ()
10472
(when(eq major-mode 'js-mode)
10573
(set-buffer-file-coding-system 'utf-8-unix nil 1)
@@ -163,6 +131,15 @@
163131
(sanitize-implicit-utf-8-unix)))
164132

165133

134+
(defun settings-org-mode-config ()
135+
(when(eq major-mode 'org-mode)
136+
(setq org-log-done 'time)))
137+
138+
(defun settings-org-mode-sanitize ()
139+
(when(eq major-mode 'org-mode)
140+
(sanitize-explicit-utf-8-unix)))
141+
142+
166143
(defun settings-text-mode-config ()
167144
(when(eq major-mode 'text-mode)
168145
(set-buffer-file-coding-system 'utf-8-unix nil 1)
@@ -185,33 +162,30 @@
185162

186163
(add-hook 'c-mode-hook 'settings-c-mode-config)
187164
(add-hook 'makefile-gmake-mode-hook 'settings-gmake-mode-config)
188-
(add-hook 'scala-mode-hook 'settings-scala-mode-config)
189-
(add-hook 'java-mode-hook 'settings-java-mode-config)
190165
(add-hook 'js-mode-hook 'settings-js-mode-config)
191166
(add-hook 'sgml-mode-hook 'settings-sgml-mode-config)
192167
(add-hook 'latex-mode-hook 'settings-latex-mode-config)
193168
(add-hook 'lisp-mode-hook 'settings-lisp-mode-config)
169+
(add-hook 'org-mode-hook 'settings-org-mode-config)
194170
(add-hook 'text-mode-hook 'settings-text-mode-config)
195171
(add-hook 'minibuffer-setup-hook 'settings-minibuffer-mode-config)
196172

197173
(add-hook 'after-change-major-mode-hook 'settings-c-mode-sanitize)
198174
(add-hook 'after-change-major-mode-hook 'settings-gmake-mode-sanitize)
199-
(add-hook 'after-change-major-mode-hook 'settings-scala-mode-sanitize)
200-
(add-hook 'after-change-major-mode-hook 'settings-java-mode-sanitize)
201175
(add-hook 'after-change-major-mode-hook 'settings-js-mode-sanitize)
202176
(add-hook 'after-change-major-mode-hook 'settings-sgml-mode-sanitize)
203177
(add-hook 'after-change-major-mode-hook 'settings-latex-mode-sanitize)
204178
(add-hook 'after-change-major-mode-hook 'settings-lisp-mode-sanitize)
179+
(add-hook 'after-change-major-mode-hook 'settings-org-mode-sanitize)
205180
(add-hook 'after-change-major-mode-hook 'settings-text-mode-sanitize)
206181

207182
(add-hook 'before-save-hook 'settings-c-mode-sanitize)
208183
(add-hook 'before-save-hook 'settings-gmake-mode-sanitize)
209-
(add-hook 'before-save-hook 'settings-scala-mode-sanitize)
210-
(add-hook 'before-save-hook 'settings-java-mode-sanitize)
211184
(add-hook 'before-save-hook 'settings-js-mode-sanitize)
212185
(add-hook 'before-save-hook 'settings-sgml-mode-sanitize)
213186
(add-hook 'before-save-hook 'settings-latex-mode-sanitize)
214187
(add-hook 'before-save-hook 'settings-lisp-mode-sanitize)
188+
(add-hook 'before-save-hook 'settings-org-mode-sanitize)
215189
(add-hook 'before-save-hook 'settings-text-mode-sanitize)
216190

217191

@@ -228,24 +202,20 @@
228202
("Makefile$" . makefile-gmake-mode)
229203
("makefile$" . makefile-gmake-mode)
230204

231-
("\\.scala$" . scala-mode)
232-
233-
("\\.java$" . java-mode)
234-
235205
("\\.js$" . js-mode)
236206

237207
("\\.html$" . sgml-mode)
238208
("\\.htm$" . sgml-mode)
239209
("\\.css$" . sgml-mode)
240210
("\\.xml$" . sgml-mode)
241211
("\\.xsd$" . sgml-mode)
242-
("\\.csproj$" . sgml-mode)
243-
("\\.sln$" . sgml-mode)
244212

245213
("\\.tex$" . latex-mode)
246214

247215
("\\.el$" . lisp-mode)
248216
("\\.emacs$" . lisp-mode)
249217

218+
("\\.org$" . org-mode)
219+
250220
("\\.stab$" . text-mode)
251221
("\\.txt$" . text-mode))))

0 commit comments

Comments
 (0)