aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiquel Sabaté Solà <msabate@suse.com>2016-08-25 11:03:00 +0200
committerMiquel Sabaté Solà <msabate@suse.com>2016-08-25 11:03:00 +0200
commit66876d142b908b37f32063c74dbe43f1aa116978 (patch)
treee1be008aad5604390ab852e148a0e9148edb2856
parent26a8832147a1df28ba57f4de7c5a38575613691f (diff)
downloaddotfiles-66876d142b908b37f32063c74dbe43f1aa116978.tar.gz
dotfiles-66876d142b908b37f32063c74dbe43f1aa116978.zip
emacs: added dockerfile mode and removed the .service file
Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
-rw-r--r--README.md14
-rw-r--r--emacs/emacs.service11
-rw-r--r--emacs/init.el6
3 files changed, 11 insertions, 20 deletions
diff --git a/README.md b/README.md
index 13d2b02..7afe88c 100644
--- a/README.md
+++ b/README.md
@@ -8,20 +8,16 @@ a submodule). Vim plugins will also get installed automatically.
And that's about it. Use this at your own risk ;)
-## Emacs
+## GNU Emacs
For the configuration of Emacs I'm trying out using symlinks instead of copying
files into the right places. For this reason, for now I'm not providing an
automatical way to install everything (this is left to be done in the near
-future). These are the files:
+future). The `emacs/init.el` and `emacs/gtkrc` files should be symlinked into
+`~/.emacs.d`.
-- `emacs/init.el` and `emacs/gtkrc`: should be symlinked into `~/.emacs.d`.
-- `emacs/emacs.service`: should be symlinked into `~/.config/systemd/user`.
-
-Note that `emacs/emacs.service` should be used with the `--user` flag and it's
-used to get Emacs to work in **daemon mode** using systemd. This does **not**
-work properly for now (e.g. the user's `PATH` is not loaded). For this, in the
-`i3/config` file you'll see that I'm using `-a ""` as an argument of
+I run GNU Emacs in daemon mode, but I don't use systemd for that. Instead, in
+the `i3/config` file you'll see that I'm using `-a ""` as an argument of
`emacsclient`. This instructs `emacsclient` to spawn a new server if there
isn't one already. This means that the first time around it will take some
time, but in the next time everything will be alright.
diff --git a/emacs/emacs.service b/emacs/emacs.service
deleted file mode 100644
index d611118..0000000
--- a/emacs/emacs.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Emacs: the extensible, self-documenting text editor
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/emacs --daemon
-ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)"
-Restart=always
-
-[Install]
-WantedBy=default.target
diff --git a/emacs/init.el b/emacs/init.el
index 7818185..9949e47 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -581,4 +581,10 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(add-hook 'cmake-mode-hook 'cmake-font-lock-activate)
(add-hook 'yaml-mode-hook 'warnings-mode-hook)))
+(use-package dockerfile-mode
+ :ensure t
+ :config
+
+ (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode)))
+
;;; init.el ends here