aboutsummaryrefslogtreecommitdiff
path: root/Emacs/.config/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'Emacs/.config/emacs')
-rw-r--r--Emacs/.config/emacs/app.org4
-rw-r--r--Emacs/.config/emacs/config.org3
-rw-r--r--Emacs/.config/emacs/core.org3
-rw-r--r--Emacs/.config/emacs/lang.org19
4 files changed, 13 insertions, 16 deletions
diff --git a/Emacs/.config/emacs/app.org b/Emacs/.config/emacs/app.org
index 347c25f..d108e8d 100644
--- a/Emacs/.config/emacs/app.org
+++ b/Emacs/.config/emacs/app.org
@@ -546,9 +546,7 @@ using.
(interactive)
(let ((dir (if buffer-file-name
(file-name-directory buffer-file-name)
- (if default-directory
- default-directory
- nil)))
+ default-directory))
(buf (eshell)))
(if dir
(with-current-buffer buf
diff --git a/Emacs/.config/emacs/config.org b/Emacs/.config/emacs/config.org
index 996ccfc..d2bce28 100644
--- a/Emacs/.config/emacs/config.org
+++ b/Emacs/.config/emacs/config.org
@@ -752,7 +752,8 @@ text. That's what this is mainly for.
#+end_src
** Licensing
Loads [[file:elisp/license.el][license.el]] for inserting licenses.
-Licenses are important for distribution and attribution to be defined clearly.
+Licenses are important for distribution and attribution to be defined
+clearly.
#+begin_src emacs-lisp
(use-package license
:straight nil
diff --git a/Emacs/.config/emacs/core.org b/Emacs/.config/emacs/core.org
index 26be8ab..53cff6d 100644
--- a/Emacs/.config/emacs/core.org
+++ b/Emacs/.config/emacs/core.org
@@ -116,8 +116,7 @@ Some bindings that I couldn't fit elsewhere easily.
(use-package emacs
:straight nil
:general
- (general-def
- "C-x d" #'delete-frame)
+ ("C-x d" #'delete-frame)
(nmmap
"C--" #'text-scale-decrease
diff --git a/Emacs/.config/emacs/lang.org b/Emacs/.config/emacs/lang.org
index ce4e6de..da59f1d 100644
--- a/Emacs/.config/emacs/lang.org
+++ b/Emacs/.config/emacs/lang.org
@@ -34,7 +34,7 @@ all: $(OUT)
$(OUT): $(DIST)/$(OUT)
-$(DIST)/$(OUT): $(OBJECTS) $(SRC)/main.o | $(DIST)
+$(DIST)/$(OUT): $(OBJECTS) $(DIST)/main.o | $(DIST)
$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
$(DIST)/%.o: $(SRC)/%.c | $(DIST) $(DEPDIR)
@@ -141,9 +141,7 @@ the [[https://elpa.gnu.org/packages/nhexl-mode.html][page]] yourself.
:mode "\\.bin")
#+end_src
* C/C++
-Setup for C and C++ modes via the cc-mode package. C and C++ are
-great languages for general purpose programming. My preferred choice
-when I want greater control over memory management.
+Setup for C and C++ modes, using Emacs' default package: cc-mode.
** cc-mode
Tons of stuff, namely:
+ ~auto-fill-mode~ for 80 char limit
@@ -453,9 +451,9 @@ points there.
Here I configure the REPL for Haskell via the
~haskell-interactive-mode~. I also load my custom package
-[[file:elisp/haskell-multiedit.el][haskell-multiedit]] which allows a user to create temporary
-~haskell-mode~ buffers that, upon completion, will run in the REPL.
-Even easier than making your own buffer.
+[[file:elisp/haskell-multiedit.el][haskell-multiedit]] which allows a
+user to create temporary ~haskell-mode~ buffers that, upon completion,
+will run in the REPL. Even easier than making your own buffer.
#+begin_src emacs-lisp
(use-package haskell-mode
:hook
@@ -571,7 +569,7 @@ Emmet for super speed code writing.
(("\\.html\\'" . "HTML Skeleton")
""
"<!doctype html>
-<html class='no-js' lang=''>
+<html lang=''>
<head>
<meta charset='utf-8'>
<meta http-equiv='x-ua-compatible' content='ie=edge'>
@@ -598,8 +596,8 @@ Emmet for super speed code writing.
" </body>
</html>"))
#+end_src
-* Typescript
-Kinda expressive, interesting.
+** Typescript
+A child language of javascript which compiles to it.
#+begin_src emacs-lisp
(use-package typescript-mode
:defer t
@@ -610,6 +608,7 @@ Kinda expressive, interesting.
Common Lisp is a dialect of Lisp, the most /common/ one around. Emacs
comes with builtin Lisp support of course, but a REPL would be nice.
+** Sly
Enter /SLY/. Sly is a fork of /SLIME/ and is *mandatory* for lisp
development on Emacs.