From bce916fbcd90eb20fbb1a2affd86d3c5cc9ea844 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sat, 28 May 2016 21:42:50 -0500 Subject: [PATCH 1/8] Update iso8601 to output non : separated times --- bin.org | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bin.org b/bin.org index d592840..78b3349 100644 --- a/bin.org +++ b/bin.org @@ -655,12 +655,19 @@ generally without depending on gnu date. use strict; use warnings; use POSIX qw(strftime); +use Getopt::Long; + +my $short = 0; +GetOptions('short' => \$short, + 's' => \$short + ); my $now = time; -my $tz = strftime(('%z', (localtime $now))); -$tz =~ s/(\d{2})(\d{2})/$1:$2/smx; -my $time = strftime('%Y-%m-%dT%H:%M:%S', (localtime $now)); -print "$time$tz\n"; +if ($short) { + print strftime('%Y%m%dT%H%M%SZ', (gmtime $now)) . "\n"; +} else { + print strftime('%Y-%m-%dT%H:%M:%SZ', (gmtime $now)) . "\n"; +} exit 0; #+END_SRC From a730d2a27248721b11d0768c8bb54551c6edd027 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sat, 28 May 2016 21:46:36 -0500 Subject: [PATCH 2/8] Speed up emacs gc --- emacs.org | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/emacs.org b/emacs.org index 6cf89ca..b6ac390 100644 --- a/emacs.org +++ b/emacs.org @@ -38,6 +38,19 @@ Add in the standard package archive urls. (add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/") t) #+END_SRC +*** emacs gc speedup + +#+BEGIN_SRC emacs-lisp + (defun my-minibuffer-setup-hook () + (setq gc-cons-threshold most-positive-fixnum)) + + (defun my-minibuffer-exit-hook () + (setq gc-cons-threshold 8000000)) + + (add-hook 'minibuffer-setup-hook #'my-minibuffer-setup-hook) + (add-hook 'minibuffer-exit-hook #'my-minibuffer-exit-hook) +#+END_SRC + *** use-package bootstrap This configuration is using *use-package* extensively. Install it straight away. From 4d70753f1768a9e9c1090ad4452ed6ab35c51182 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sat, 28 May 2016 21:46:49 -0500 Subject: [PATCH 3/8] Add yasnippet back into the fold --- emacs.org | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/emacs.org b/emacs.org index b6ac390..0c091ce 100644 --- a/emacs.org +++ b/emacs.org @@ -504,6 +504,28 @@ Turns out that someone wrote this exact thing already. Yay get to drop my own cr ) #+END_SRC +*** yasnippet +#+BEGIN_SRC emacs-lisp + (use-package yasnippet + :ensure t + :init + (progn + (setq yas-snippet-dirs + '("~/.emacs.d/snippets" + "~/.emacs.d/snippets-upstream" + ))) + :config + (progn + (yas/reload-all) + (add-hook 'prog-mode-hook + '(lambda () + (yas-minor-mode))) + (add-hook 'org-mode-hook + '(lambda () + (yas-minor-mode)))) + ) +#+END_SRC + *** semantic #+BEGIN_SRC emacs-lisp From e89d0cefcb1b17a8ada8762176f069d9a95b4598 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sat, 28 May 2016 21:47:03 -0500 Subject: [PATCH 4/8] Add LaTeX to babel languages --- emacs.org | 1 + 1 file changed, 1 insertion(+) diff --git a/emacs.org b/emacs.org index 0c091ce..0e2a40c 100644 --- a/emacs.org +++ b/emacs.org @@ -671,6 +671,7 @@ Org-mode keybindings and settings, pretty sparse really. (emacs-lisp . t) (sh . t) (haskell . t) + (latex . t) (ditaa . t) (perl . t) (python . t) From bae94cd6568cc50d4e6187fa60dd19529ee695db Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sat, 28 May 2016 21:47:26 -0500 Subject: [PATCH 5/8] Load ~/.emacs.d/local.el at end of emacs startup Allows for local customization outside of customize --- emacs.org | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emacs.org b/emacs.org index 0e2a40c..e731836 100644 --- a/emacs.org +++ b/emacs.org @@ -1297,3 +1297,8 @@ Load this up last to allow for local customization if needed and to keep from cu (setq custom-file "~/.emacs.d/custom.el") (load custom-file 'noerror) #+END_SRC + +* Load any local definitions +#+BEGIN_SRC emacs-lisp +(load-file "~/.emacs.d/local.el") +#+END_SRC From f121972bf297827733d58f11f12661222f7ffe08 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sat, 28 May 2016 21:48:41 -0500 Subject: [PATCH 6/8] Update git aliases and add a few more --- git.org | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/git.org b/git.org index 367caf6..a79cbad 100644 --- a/git.org +++ b/git.org @@ -41,13 +41,15 @@ General git configuration split out into sections mostly. [alias] begin = !git init && git commit --allow-empty -m 'Initial empty commit' up = !git pull --rebase && git push - wsdiff = diff --color-words --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-all-space - wdiff = diff --color-words + wsd = diff --color-words --ignore-space-at-eol --ignore-space-change --ignore-all-space + wd = diff --color-words + fa = fetch --all ci = commit ciu = commit --all co = checkout ds = diff --stat ba = branch --all + b = branch st = status --short --branch s = status --short --branch --untracked-files=no unstage = reset HEAD @@ -59,13 +61,14 @@ General git configuration split out into sections mostly. ri = rebase --interactive --autosquash ra = rebase --abort effit = reset --hard + cp = log --no-merges --cherry --graph --oneline # What commits differ between branches, note, equivalent commits are omitted. # Use this with three dot operator aka master...origin/master - cpdiff = log --no-merges --left-right --graph --cherry-pick --oneline + cpd = log --no-merges --left-right --graph --cherry-pick --oneline # Same as ^ only equivalent commits are listed with a = sign. - cmdiff = log --no-merges --left-right --graph --cherry-mark --oneline + cmd = log --no-merges --left-right --graph --cherry-mark --oneline # git update with submodule update - sup = git pull && git submodule update --init --recursive + sup = git pull --rebase && git submodule update --init --recursive # git clone with submodules sc = !git clone --recursive $1 # what files are getting updated a lot From 211f711f188e7e465ee31095b4425bdfb59bc893 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sat, 28 May 2016 21:49:04 -0500 Subject: [PATCH 7/8] Sigh, this is really annoying when things break Disable cscope/pylint from building. --- nix.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix.org b/nix.org index 6b7f7a5..f019475 100644 --- a/nix.org +++ b/nix.org @@ -46,7 +46,7 @@ Nix user config.nix setup. curl clang clang-analyzer - cscope +# cscope ctags diffutils patchutils @@ -102,7 +102,7 @@ Nix user config.nix setup. nox mutt duply - pylint +# pylint Also broken now. Nix is really not my friend here # xhyve compiles normally, figure out hypervisor framework issue lastpass-cli python27Packages.howdoi From 6a2311d5b3a0b18856fba4d167b5af38c1060267 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sat, 28 May 2016 21:49:41 -0500 Subject: [PATCH 8/8] Switch to new texlive derivation. --- nix.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix.org b/nix.org index f019475..4eace56 100644 --- a/nix.org +++ b/nix.org @@ -85,7 +85,7 @@ Nix user config.nix setup. readline rsync sqlite -# texLiveFull and now this things broken on osx nix, sigh + texlive.combined.scheme-full tmux tree wget