diff --git a/Makefile b/Makefile index a7483f7..2476a24 100644 --- a/Makefile +++ b/Makefile @@ -14,13 +14,6 @@ all: clean tangle-next tmp: install -dm755 $@ - $(MAKE) emacs - -#special target to handle emacs configuration -emacs: - install -dm755 tmp/.emacs.d - install -m400 init.el tmp/emacs.d/init.el - install -m400 emacs.org tmp/emacs.d/emacs.org $(NEXTGEN): install -dm755 $@ diff --git a/etangle b/etangle index dd3fce6..4e61976 100755 --- a/etangle +++ b/etangle @@ -1,9 +1,6 @@ ;;-*-mode: emacs-lisp; coding: utf-8;-*- ;; Copyright: 2016 Mitchell Tishmack ;; Tangle an org mode file with babel using emacs. -(let ((default-directory "~/.emacs.d")) - (normal-top-level-add-subdirs-to-load-path)) - (load-file (if (getenv "OPTIONS") (concat (concat "./" (getenv "OPTIONS")) ".el") "./options.el")) diff --git a/readme.org b/readme.org index 6c11e40..c8ad042 100644 --- a/readme.org +++ b/readme.org @@ -416,6 +416,22 @@ nix_env_setup() nix_env_setup #+END_SRC + +Workaround stupid ssl crap with recent nix. + +#+BEGIN_SRC sh :tangle (when (and (eq nix-p t) (eq osx-p t)) "tmp/.profile") +SSL_CERT_FILE="${HOME}/.nix-profile/etc/ssl/certs/ca-bundle.crt" +GIT_SSL_CAINFO=$SSL_CERT_FILE +export SSL_CERT_FILE +export GIT_SSL_CAINFO +#+END_SRC + +TODO Add linux ca-bundle detection + if test -e /etc/ssl/certs/ca-bundle.crt ; # Fedora, NixOS + set -xg SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt ; + else if test -e /etc/ssl/certs/ca-certificates.crt ; # Ubuntu, Debian + set -xg SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt + *** tmux #+BEGIN_SRC sh :tangle (when (eq tmux-p t) "tmp/.profile") t() @@ -1877,10 +1893,6 @@ General git configuration. [http] postBuffer = 209715200 #+END_SRC -*** nix -#+BEGIN_SRC conf :tangle (when (eq nix-p t) "tmp/.gitconfig") - sslcainfo = ~/.nix-profile/etc/ca-bundle.crt -#+END_SRC *** push #+BEGIN_SRC conf [push]