From e1d05fded62a57bee06551110bdb6c965f4555e6 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Mon, 2 May 2022 18:06:11 +0200
Subject: [PATCH] Change dodona devshell a little

---
 flake.nix | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2e4b7840..6cb76bbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -142,19 +142,39 @@
               ];
               commands = [
                 {
-                  name = "start-dockers";
+                  name = "memcached";
                   category = "general commands";
-                  help = "Start mysql and memcached in docker containers";
+                  help = "Start caching server";
+                  package = pkgs.memcached;
+                }
+                {
+                  name = "mysql";
+                  category = "general commands";
+                  help = "Start mysql (in docker container)";
                   command = ''
-                    trap "systemd-run --user --no-block docker stop dodona-db dodona-cache" 0
+                    trap "systemd-run --user --no-block docker stop dodona-db" 0
                     docker run -d --name dodona-db -p 3306:3306 --rm -v dodona-db-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest
-                    docker run -d --name dodona-cache -p 11211:11211 --rm memcached:latest
                     while [ 1 -eq 1 ]
                     do
                       sleep 1000
                     done
                   '';
                 }
+                {
+                  name = "server";
+                  category = "general commands";
+                  help = "Run everything";
+                  command = ''
+                    memcached &
+                    mysql &
+                    bundle install
+                    yarn install
+                    rails s &
+                    rails jobs:work &
+                    yarn build:css --watch &
+                    yarn build:js --watch
+                  '';
+                }
               ];
               language.c = {
                 compiler = pkgs.gcc;