From 6e3a5c915027d4b5f4bf97af6927563cf9316d50 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 12 Mar 2017 15:40:53 -0500 Subject: [PATCH] I validated poorly --- etangle | 2 +- nix.org | 2 +- readme.org | 2 +- tmux.org | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etangle b/etangle index e00d594..7e15621 100755 --- a/etangle +++ b/etangle @@ -5,7 +5,7 @@ (require 'org) (defun tangle/yn (p) (if (bound-and-true-p p) "yes" "no")) -(defun tangle/file (file p) (if (bound-and-true-p p) (concat "tmp/" file) "no")) +(defun tangle/file (file p) (if (eval p) (concat "tmp/" file) "no")) (if (getenv "USEROPTS") (dolist (fnam (split-string (getenv "USEROPTS") ":")) diff --git a/nix.org b/nix.org index 639da44..52b094e 100644 --- a/nix.org +++ b/nix.org @@ -11,7 +11,7 @@ Nix user config.nix setup. -#+BEGIN_SRC conf :tangle (tangle/file ".nixpkgs/config.nix" (bound-and-true-p nix-p)) +#+BEGIN_SRC conf :mkdirp yes :tangle (tangle/file ".nixpkgs/config.nix" (bound-and-true-p nix-p)) let pkgs = import {}; in diff --git a/readme.org b/readme.org index 9fde623..7d08ce1 100644 --- a/readme.org +++ b/readme.org @@ -41,7 +41,7 @@ you try to edit the source block. #+BEGIN_SRC emacs-lisp :tangle no (defun tangle/yn (p) (if (bound-and-true-p p) "yes" "no")) - (defun tangle/file (file p) (if (bound-and-true-p p) (concat "tmp/" file) "no")) + (defun tangle/file (file p) (if (eval p) (concat "tmp/" file) "no")) #+END_SRC This is also all the "magique" that this whole stupid repo entails. diff --git a/tmux.org b/tmux.org index f630cfa..549272a 100644 --- a/tmux.org +++ b/tmux.org @@ -10,7 +10,7 @@ Tmux configuration. Pretty boring in most ways. -#+BEGIN_SRC conf :tangle (tangle/file "tmux.conf" (bound-and-true-p tmux-p)) +#+BEGIN_SRC conf :tangle (tangle/file ".tmux.conf" (bound-and-true-p tmux-p)) # Setup vi mode by default set-window-option -g mode-keys vi set-window-option -g aggressive-resize on @@ -147,7 +147,7 @@ Tmux configuration. Pretty boring in most ways. Only set xclip for x setup. -#+BEGIN_SRC conf :tangle (tangle/file (and (bound-and-true-p tmux-p) (bound-and-true x-p))) +#+BEGIN_SRC conf :tangle (tangle/file ".tmux.conf" (and (bound-and-true-p tmux-p) (bound-and-true-p x-p))) bind C-p run "tmux set-buffer \"$(xclip -o)\"; tmux paste-buffer" bind C-y run "tmux save-buffer - | xclip -i" #+END_SRC