diff options
| author | Alan Pearce | 2018-07-21 14:58:48 +0200 |
|---|---|---|
| committer | Alan Pearce | 2018-07-21 14:58:48 +0200 |
| commit | 7b43b6b564c4468ca8abef72a8d3ba4b8f1d96fc (patch) | |
| tree | 9cfa9bdc18feab927832be5bca8b758b423732b5 | |
| parent | 454d3c333e7424c62247c38fbbe681ccdb422bd2 (diff) | |
| parent | 86de06ed1db69588d5290c9e679f675ab12ad6ae (diff) | |
| download | nixfiles-7b43b6b564c4468ca8abef72a8d3ba4b8f1d96fc.tar.lz nixfiles-7b43b6b564c4468ca8abef72a8d3ba4b8f1d96fc.tar.zst nixfiles-7b43b6b564c4468ca8abef72a8d3ba4b8f1d96fc.zip | |
Merge branch 'master' of https://git.alanpearce.eu/nixos-configuration
| -rw-r--r-- | modules/satoshipay.nix | 1 | ||||
| -rw-r--r-- | packages/emacs.nix | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix index e51ba8e4..68fe6e3c 100644 --- a/modules/satoshipay.nix +++ b/modules/satoshipay.nix @@ -27,6 +27,7 @@ docker_compose meteor minikube + unstable.google-cloud-sdk unstable.kubernetes unstable.redis-desktop-manager unstable.kubernetes-helm diff --git a/packages/emacs.nix b/packages/emacs.nix index f685c01b..a76ce649 100644 --- a/packages/emacs.nix +++ b/packages/emacs.nix @@ -91,6 +91,7 @@ in json-mode kubernetes kubernetes-evil + kubernetes-tramp ledger-mode lsp-javascript-typescript lsp-mode @@ -111,6 +112,7 @@ in paredit password-store php-mode + prettier-js projectile projectile-ripgrep quickrun |