@@ -43,27 +43,27 @@ Obelisk assumes basic knowledge of [Haskell](https://www.haskell.org/) and [Refl
4343 If you already have Nix installed, make sure you have version 2.0 or higher. To check your current version, run `nix-env --version`.
44441. Set up nix caches
4545 1. If you are running NixOS, add this to `/etc/nixos/configuration.nix`:
46− ```
46+ ```nix
4747 nix.binaryCaches = [ "https://nixcache.reflex-frp.org" ];
4848 nix.binaryCachePublicKeys = [ "ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=" ];
4949 ```
5050 and rebuild your NixOS configuration (e.g. `sudo nixos-rebuild switch`).
51− 1. If you are using another operating system or linux distribution, ensure that these lines are present in your Nix configuration file (`/etc/nix/nix.conf` on most systems; [see full list](https://nixos.org/nix/manual/#sec-conf-file)):
52− ```
53− binary-caches = https://cache.nixos.org https://nixcache.reflex-frp.org
54− binary-cache-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=
55− binary-caches-parallel-connections = 40
51+ 1. If you are using another operating system or Linux distribution, ensure that these lines are present in your Nix configuration file (`/etc/nix/nix.conf` on most systems; [see full list](https://nixos.org/nix/manual/#sec-conf-file)):
52+ ```nix
53+ binary-caches = https://cache.nixos.org https://nixcache.reflex-frp.org
54+ binary-cache-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=
55+ binary-caches-parallel-connections = 40
5656 ```
57− * other Linux: enable sandboxing (see these [issue172](https://github.com/obsidiansystems/obelisk/issues/172#issuecomment-411507818) or [issue6](https://github.com/obsidiansystems/obelisk/issues/6) if you run into build problems)
58− ```
57+ * If you're on a Linux distribution other than NixOS, enable sandboxing (see these [issue 172](https://github.com/obsidiansystems/obelisk/issues/172#issuecomment-411507818) or [issue 6](https://github.com/obsidiansystems/obelisk/issues/6) if you run into build problems) by adding the following:
58+ ```nix
5959 sandbox = true
6060 ```
61− * MacOS: disable sandboxing (there are still some impure dependencies for now)
62− ```
61+ * If you're on MacOS, disable sandboxing (there are still some impure dependencies for now) by adding the following:
62+ ```nix
6363 sandbox = false
6464 ```
6565 then restart the nix daemon
66− ```
66+ ```bash
6767 sudo launchctl stop org.nixos.nix-daemon
6868 sudo launchctl start org.nixos.nix-daemon
6969 ```
@@ -119,7 +119,7 @@ At this stage your instance should be booting and become accessible shortly. Not
119119Now go to your Obelisk project directory (`~/code/myapp`), and initialize a deployment config (`~/code/myapp-deploy`):
120120Your project directory must be "thunkable", i.e. something on which `ob thunk pack` can be called. Usually it will be a git repository whose current revision has been pushed upstream.
121121
122−```
122+```bash
123123cd ~/code/myapp
124124SERVER=ec2-35-183-22-197.ca-central-1.compute.amazonaws.com
125125ROUTE=https://myapp.com # Publicly accessible route to your app
@@ -138,7 +138,7 @@ This step will also require that you manually verify the authenticity of the hos
138138
139139Next, go to the deployment directory that you just initialized and deploy!
140140
141−```
141+```bash
142142cd ~/code/myapp-deploy
143143ob deploy push
144144```