Merge branch 'master' of https://git.alanpearce.eu/nixos-configuration
Alan Pearce alan@alanpearce.eu
Sat, 21 Jul 2018 14:58:48 +0200
2 files changed, 3 insertions(+), 0 deletions(-)
M modules/satoshipay.nix → modules/satoshipay.nix
@@ -27,6 +27,7 @@ google-chrome docker_compose meteor minikube + unstable.google-cloud-sdk unstable.kubernetes unstable.redis-desktop-manager unstable.kubernetes-helm
M packages/emacs.nix → packages/emacs.nix
@@ -91,6 +91,7 @@ js2-refactor json-mode kubernetes kubernetes-evil + kubernetes-tramp ledger-mode lsp-javascript-typescript lsp-mode @@ -111,6 +112,7 @@ page-break-lines paredit password-store php-mode + prettier-js projectile projectile-ripgrep quickrun