diff --git a/roles/school/programs/default.nix b/roles/school/programs/default.nix
index 2bbc214..24452c0 100644
--- a/roles/school/programs/default.nix
+++ b/roles/school/programs/default.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   imports = [
     ./virtualbox.nix
-    ./idea.nix
+    ./jetbrains.nix
     ./vscode.nix
     ./helix.nix
     ./unity.nix
diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix
deleted file mode 100644
index 7f818a5..0000000
--- a/roles/school/programs/idea.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{pkgs, ...}:
-with pkgs; {
-  environment.systemPackages = with jetbrains; [
-    idea-ultimate
-  ];
-
-  home-manager.users.toast = {
-    # Install plugins
-    home.file = {
-      ".local/share/JetBrains/IntelliJIdea2023.3/catppuccin.jar".source = fetchurl {
-        url = "https://github.com/catppuccin/jetbrains/releases/download/v3.2.3/Catppuccin.Theme-3.2.3.jar";
-        hash = "sha256-v5BZ2UKEBA/0DHKGwmprmuu0RcJCDsxzWmCdnX9aXpE=";
-      };
-      ".local/share/JetBrains/IntelliJIdea2023.3/rainbow-brackets".source = fetchzip {
-        url = "https://github.com/izhangzhihao/intellij-rainbow-brackets/releases/download/latest/intellij-rainbow-brackets-2023.3.9-233.zip";
-        hash = "sha256-faMDP6kU21WOHVjY5Aj4/Glqymo1iUCTuUJdHsq1N/s=";
-      };
-      ".local/share/JetBrains/IntelliJIdea2023.3/catppuccin-icons.jar".source = fetchurl {
-        url = "https://github.com/catppuccin/jetbrains-icons/releases/download/v1.1.1/Catppuccin.Icons-1.1.1.jar";
-        hash = "sha256-Bn0Yn0RlNmJQCSC0MJQrKjeERzfHhupWnyYm0YjXFwY=";
-      };
-    };
-
-    /*
-    If you use programs.java.enable intellij picks up the jdk package directly, which is not ideal
-    This adds the jdks I want to use to a directory intellij expects jdks to be
-    */
-    home.file.".jdks/jdk8".source = "${pkgs.jdk8}/lib/openjdk";
-    home.file.".jdks/jdk17".source = "${pkgs.jdk17}/lib/openjdk";
-  };
-}
diff --git a/roles/school/programs/jetbrains.nix b/roles/school/programs/jetbrains.nix
new file mode 100644
index 0000000..ecf5c90
--- /dev/null
+++ b/roles/school/programs/jetbrains.nix
@@ -0,0 +1,16 @@
+{pkgs, ...}:
+with pkgs; {
+  environment.systemPackages = with jetbrains; [
+    idea-ultimate
+    datagrip
+  ];
+
+  home-manager.users.toast = {
+    /*
+    If you use programs.java.enable intellij picks up the jdk package directly, which is not ideal
+    This adds the jdks I want to use to a directory intellij expects jdks to be
+    */
+    home.file.".jdks/jdk8".source = "${pkgs.jdk8}/lib/openjdk";
+    home.file.".jdks/jdk17".source = "${pkgs.jdk17}/lib/openjdk";
+  };
+}