From fd1efa3aec15742f003254b427102b1e3cf12f6a Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Fri, 6 Oct 2023 11:16:12 +0200
Subject: [PATCH 1/4] MySQL: install mycli

---
 roles/school/services/mysql.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/school/services/mysql.nix b/roles/school/services/mysql.nix
index 49d686d..c4e08e9 100644
--- a/roles/school/services/mysql.nix
+++ b/roles/school/services/mysql.nix
@@ -26,5 +26,8 @@
 		})
 	'';
 
-	environment.systemPackages = [ pkgs.mysql-workbench ];
+	environment.systemPackages = with pkgs; [ 
+		mysql-workbench
+		mycli
+	];
 }

From 95c929bdf73f5730e8cc65dc3c412be05ceebcb8 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Fri, 6 Oct 2023 12:13:34 +0200
Subject: [PATCH 2/4] School: move intellij idea config to it's own file

---
 roles/school/programs/default.nix | 2 +-
 roles/school/programs/idea.nix    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 roles/school/programs/idea.nix

diff --git a/roles/school/programs/default.nix b/roles/school/programs/default.nix
index 9783006..2c5fd21 100644
--- a/roles/school/programs/default.nix
+++ b/roles/school/programs/default.nix
@@ -3,11 +3,11 @@
 {
 	imports = [
 		./virtualbox.nix
+		./idea.nix
 	];
 	
 	environment.systemPackages = with pkgs; [
 		dia
-		jetbrains.idea-ultimate
 		flakeSelf.packages.x86_64-linux.pseint
 	];
 }
diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix
new file mode 100644
index 0000000..4903bff
--- /dev/null
+++ b/roles/school/programs/idea.nix
@@ -0,0 +1,7 @@
+ { config, pkgs, flakeSelf, ... }:
+
+{
+	environment.systemPackages = with pkgs; with jetbrains; [
+		idea-ultimate
+	];
+}

From 46e73a0765263efc306af780a39aabda5ddafb77 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Fri, 6 Oct 2023 13:24:46 +0200
Subject: [PATCH 3/4] Intellij: remove unused parameter

---
 roles/school/programs/idea.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix
index 4903bff..3f363e2 100644
--- a/roles/school/programs/idea.nix
+++ b/roles/school/programs/idea.nix
@@ -1,4 +1,4 @@
- { config, pkgs, flakeSelf, ... }:
+ { config, pkgs, ... }:
 
 {
 	environment.systemPackages = with pkgs; with jetbrains; [

From 69ae27e713f89577130bb2007a48f3a6fb31835e Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Fri, 6 Oct 2023 13:25:41 +0200
Subject: [PATCH 4/4] Intellij: configure jdk8 as default java version

---
 roles/school/programs/idea.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix
index 3f363e2..65b355c 100644
--- a/roles/school/programs/idea.nix
+++ b/roles/school/programs/idea.nix
@@ -1,6 +1,11 @@
  { config, pkgs, ... }:
 
 {
+	programs.java = {
+		enable = true;
+		package = pkgs.jdk8;
+	};
+
 	environment.systemPackages = with pkgs; with jetbrains; [
 		idea-ultimate
 	];