aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiquel Sabaté Solà <msabate@suse.com>2020-04-22 12:22:47 +0200
committerMiquel Sabaté Solà <msabate@suse.com>2020-04-22 12:22:47 +0200
commitf05b0ce260add10233a24198b5baca3194bba317 (patch)
tree3f2dcc328e8dadd2bb16a99c62229c8cb89adf87
parentd4b1408e218f81c3e97848cacb578474877f66db (diff)
downloaddotfiles-f05b0ce260add10233a24198b5baca3194bba317.tar.gz
dotfiles-f05b0ce260add10233a24198b5baca3194bba317.zip
emacs: bring back to life the pre-push hook
Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
-rw-r--r--.emacs.d/init.org12
-rw-r--r--.emacs.d/org.css66
-rwxr-xr-x.emacs.d/pre-push3
3 files changed, 8 insertions, 73 deletions
diff --git a/.emacs.d/init.org b/.emacs.d/init.org
index f39e64d..4e4e441 100644
--- a/.emacs.d/init.org
+++ b/.emacs.d/init.org
@@ -1,8 +1,8 @@
#+TITLE: mssola's GNU Emacs configuration
#+AUTHOR: Miquel Sabaté Solà
#+EMAIL: mikisabate@gmail.com
-#+HTML_HEAD: <link rel="stylesheet" href="http://jo.mssola.com/static/style.css" type="text/css" />
-#+HTML_HEAD: <link rel="stylesheet" href="http://jo.mssola.com/static/org.css" type="text/css" />
+#+HTML_HEAD: <link rel="stylesheet" href="http://jo.mssola.com/stylesheets/main.css" type="text/css" />
+#+HTML_HEAD: <link rel="stylesheet" href="http://jo.mssola.com/stylesheets/emacs.css" type="text/css" />
#+BABEL: :cache yes
#+PROPERTY: header-args :tangle ~/.emacs.d/init.el
@@ -35,9 +35,7 @@ file *always*. The initial contents of the =init.el= are:
(byte-compile-file (concat user-emacs-directory "init.el"))
#+END_SRC
-There is no reason to track the init.el file, and no reason to change this
-file. In order to ensure this, make sure to apply the following command after
-cloning:
+There is no reason to track the =init.el= file, and no reason to change this file. In order to ensure this, make sure to apply the following command after cloning:
#+BEGIN_SRC sh :tangle no
git update-index --assume-unchanged emacs/init.el
@@ -104,6 +102,8 @@ on each change, the following function is provided:
(add-hook 'after-save-hook 'tangle-init)
#+END_SRC
+As you can see, this function will tangle and compile the resulting =init.el= file, and it will also produce an HTML version of it. This HTML version will be pushed into my [[https://jo.mssola.com][personal site]] thanks to a git [[https://github.com/mssola/dotfiles/blob/master/.emacs.d/pre-push][pre-push]] hook. The resulting version being hosted [[https://jo.mssola.com/static/init.html][here]].
+
* Introduction
I'm using GNU Emacs 27, but everything should be working since GNU Emacs 24. There are some exceptions to this (e.g. webkit support), but these cases are individually handled.
@@ -2631,6 +2631,8 @@ repositories. I have taken lots of pieces from here and there, but most notably:
- [[https://github.com/purcell/emacs.d][@purcell]]
- [[https://github.com/sachac/.emacs.d][@sachac]] ([[http://pages.sachachua.com/.emacs.d/Sacha.html][HTML version]])
- [[https://github.com/larstvei/dot-emacs][@larstvei]]
+- [[https://github.com/hlissner/doom-emacs][doom-emacs]]
+- [[https://gitlab.com/protesilaos/dotfiles][@protesilaos]]
* License
diff --git a/.emacs.d/org.css b/.emacs.d/org.css
deleted file mode 100644
index caa194b..0000000
--- a/.emacs.d/org.css
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017-2020 Miquel Sabaté Solà <mikisabate@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file tries to mimick what we have in the soria theme. That being said,
- * the HTML exporter of org-mode is not perfect, so there's tons of stuff that
- * are not highlighted in the same way as in GNU Emacs. Anyways, the colors are
- * as follows:
- *
- * soria-purple "#dfafdf"
- * soria-darkpurple "#875f87"
- * soria-white "#d0d0d0"
- * soria-darkgray "#1c1c1c"
- * soria-brightgreen "#81c13b"
- * soria-green "#b9dc92"
- * soria-darkgreen "#2f5361"
- * soria-gray "#808080"
- * soria-linegray "#3a3a3a"
- * soria-statusgray "#4e4e4e"
- * soria-statusncgray "#b2b2b2"
- * soria-black "#000000"
- * soria-whitest "#eeeeee"
- * soria-yellow "#ffffaf"
- * soria-orange "#d7af87"
- * soria-redpastel "#d78787"
- * soria-blue "#87afd7"
- */
-
-.org-src-container pre {
- color: #d0d0d0;
- background-color: #1c1c1c;
- border-left: 0px;
-}
-
-.org-warning { color: #b9dc92; }
-.org-keyword { color: #87afd7; }
-.org-function-name { color: #87afd7; }
-.org-builtin { color: #87afd7; }
-.org-constant { color: #ffffaf; }
-.org-string { color: #ffffaf; }
-.org-doc { color: #808080; }
-.org-comment { color: #808080; }
-.org-comment-delimiter { color: #808080; }
-.org-rainbow-delimiters-depth-1 { color: #81c13b; }
-.org-rainbow-delimiters-depth-2 { color: #d78787; }
-.org-rainbow-delimiters-depth-3 { color: #d7af87; }
-.org-rainbow-delimiters-depth-4 { color: #87afd7; }
-.org-rainbow-delimiters-depth-5 { color: #d0d0d0; }
-.org-rainbow-delimiters-depth-6 { color: #d0d0d0; }
-.org-rainbow-delimiters-depth-7 { color: #d0d0d0; }
-.org-rainbow-delimiters-depth-8 { color: #d0d0d0; }
-.org-rainbow-delimiters-depth-9 { color: #d0d0d0; }
diff --git a/.emacs.d/pre-push b/.emacs.d/pre-push
index 09bc2fc..88b26f3 100755
--- a/.emacs.d/pre-push
+++ b/.emacs.d/pre-push
@@ -44,7 +44,6 @@ __mssola_sync_cheato() {
# Copy the files that I want to my server.
__mssola_sync() {
__mssola_sync_cheato "init.html"
- __mssola_sync_cheato "org.css"
}
# This block iterates through all the given info provided by git. If there is
@@ -70,7 +69,7 @@ do
commit=`git rev-list -n 1 --grep '^emacs:' "$range"`
if [ -n "$commit" ]
then
- #__mssola_sync
+ __mssola_sync
exit 0
fi
fi