From 347d406ea99a7979c429f9a1ed95c39c471cf399 Mon Sep 17 00:00:00 2001
From: derped <derped@ophanim.de>
Date: Sat, 22 Jun 2019 20:52:55 +0200
Subject: [PATCH] Added java section; various other small changes.

---
 pkgs/pkgsets.nix | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkgs/pkgsets.nix b/pkgs/pkgsets.nix
index 4521372..954b6d7 100644
--- a/pkgs/pkgsets.nix
+++ b/pkgs/pkgsets.nix
@@ -10,6 +10,7 @@ let
   # Programms I'm likely to want on every machine and/or may execute as root
   base = with pkgs; [
     alsaUtils
+    finger_bsd
     ccze
     cksfv
     cryptsetup
@@ -74,7 +75,7 @@ let
   dict = with pkgs; [
     translate-shell
     ( hunspellWithDicts (with pkgs.hunspellDicts; [ de-de en-us ] ))
-    ( aspellWithDicts   (d: [ d.de d.en d.en-computers d.en-science ] ))
+    ( aspellWithDicts   (d: with d; [ de en en-computers en-science ] ))
   ];
 
   emacs = gitpkgs.emacsWithPackages (epkgs: with epkgs; [
@@ -124,6 +125,10 @@ let
     visual-fill-column
     web-mode
     melpaStablePackages.idris-mode helm-idris
+    /* Java */
+#    projectile yasnippet lsp-mode hydra company-lsp lsp-ui lsp-java dap-mode
+    cl-lib meghanada autodisass-java-bytecode google-c-style realgud
+    weechat
   ]);
 
   extra = with pkgs; [
@@ -149,19 +154,24 @@ let
   ];
 
   haskell = pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [
+    hindent
     mtl
     random
   ]);
 
+  haskell-tools = with pkgs; [ cabal-install hlint]; # ghcid
+
   java = with pkgs; [
     openjdk11
-    (with pkgs.eclipses; eclipseWithPlugins {
+    maven
+    (with gitpkgs.eclipses; eclipseWithPlugins {
       eclipse = eclipse-platform;
       jvmArgs = [ "-Xmx2048m" ];
-      plugins = [ 
-        plugins.color-theme
-        plugins.emacsplus
-        plugins.checkstyle 
+      plugins = with plugins; [ 
+        color-theme
+        # emacsplus
+        checkstyle
+        eclemma
       ];
     })
   ];
@@ -169,12 +179,15 @@ let
   python3 = gitpkgs.python3Full.withPackages(ps: with ps; [
     GitPython
     bpython
+    cairosvg cairocffi
     configparser
     django
     elpy
     emoji
     epc
+    flake8
     genanki
+    mypy
     numpy
     opencv3
     paho-mqtt
@@ -183,6 +196,7 @@ let
     pip
     plotly
     pyflakes
+    pygame pygame_sdl2
     pylama
     pylint
     pyopengl
@@ -216,7 +230,7 @@ let
 #    flask_testing    
 #    flask_wtf
 #    flaskbabel
-    ] ++ optionals (elem "i3" cfg.desktop.wms) [ py3status pytz tzlocal ]);
+  ] ++ optionals (elem "i3" cfg.desktop.wms) [ py3status pytz tzlocal ]);
 
   rustpkgs = with pkgs; [ 
     rustup
@@ -245,6 +259,8 @@ let
     gnome3.gnome-terminal
     gnome3.gvfs
     gvfs
+    gitpkgs.krita gitpkgs.gmic_krita_qt
+    oneko
     pcmanfm lxmenu-data shared_mime_info
     pavucontrol
     xclip