diff --git a/roles/school/programs/default.nix b/roles/school/programs/default.nix index 2c5fd21..9783006 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 deleted file mode 100644 index 65b355c..0000000 --- a/roles/school/programs/idea.nix +++ /dev/null @@ -1,12 +0,0 @@ - { config, pkgs, ... }: - -{ - programs.java = { - enable = true; - package = pkgs.jdk8; - }; - - environment.systemPackages = with pkgs; with jetbrains; [ - idea-ultimate - ]; -} diff --git a/roles/school/services/mysql.nix b/roles/school/services/mysql.nix index c4e08e9..49d686d 100644 --- a/roles/school/services/mysql.nix +++ b/roles/school/services/mysql.nix @@ -26,8 +26,5 @@ }) ''; - environment.systemPackages = with pkgs; [ - mysql-workbench - mycli - ]; + environment.systemPackages = [ pkgs.mysql-workbench ]; }