From 4b9674d7c6d4db30bd9384406e6ceb09cabd982f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 8 Oct 2023 23:00:39 +0300
Subject: [PATCH] starting with some scala

---
 flake.nix                        |  1 +
 hosts/fwminex/configuration.nix  |  1 -
 hosts/vno1-oh2/configuration.nix |  1 -
 modules/base/users/default.nix   |  7 ++-----
 shared/home/default.nix          | 31 +++++++++++++++++++++++++++----
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index e9ee88b..f87ce48 100644
--- a/flake.nix
+++ b/flake.nix
@@ -256,6 +256,7 @@
         extraSpecialArgs = {
           stateVersion = "23.05";
           email = "motiejusja@wix.com";
+          devEnvironment = true;
         };
       };
 
diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 67829d0..1bcefd0 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -52,7 +52,6 @@ in {
     base = {
       zfs.enable = true;
       users = {
-        devEnvironment = true;
         passwd = {
           root.passwordFile = config.age.secrets.root-passwd-hash.path;
           motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path;
diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix
index 96d3fed..54cdea0 100644
--- a/hosts/vno1-oh2/configuration.nix
+++ b/hosts/vno1-oh2/configuration.nix
@@ -41,7 +41,6 @@
     base = {
       zfs.enable = true;
       users = {
-        devEnvironment = true;
         passwd = {
           root.passwordFile = config.age.secrets.root-passwd-hash.path;
           motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path;
diff --git a/modules/base/users/default.nix b/modules/base/users/default.nix
index 93af6d6..fc5e3f9 100644
--- a/modules/base/users/default.nix
+++ b/modules/base/users/default.nix
@@ -7,11 +7,6 @@
   cfg = config.mj.base.users;
 in {
   options.mj.base.users = with lib.types; {
-    devEnvironment = lib.mkOption {
-      type = bool;
-      default = false;
-    };
-
     passwd = lib.mkOption {
       type = attrsOf (submodule {
         options = {
@@ -63,9 +58,11 @@ in {
     home-manager.users.motiejus = {pkgs, ...}:
       lib.mkMerge [
         (import ../../../shared/home/default.nix {
+          inherit lib;
           inherit pkgs;
           inherit (config.mj) stateVersion;
           email = "motiejus@jakstys.lt";
+          devEnvironment = false;
         })
         {
           programs.bash = {
diff --git a/shared/home/default.nix b/shared/home/default.nix
index fcc7972..86beb36 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -2,6 +2,7 @@
   pkgs,
   stateVersion,
   email,
+  devEnvironment,
   ...
 }: {
   home = {
@@ -11,7 +12,16 @@
     homeDirectory = "/home/motiejus";
   };
 
-  #home.packages = lib.mkIf cfg.devEnvironment [pkgs.go];
+  home.packages =
+    if devEnvironment
+    then
+      (with pkgs; [
+        go
+
+        scala_2_12
+        coursier
+      ])
+    else [];
 
   programs.direnv.enable = true;
 
@@ -20,9 +30,22 @@
     vimAlias = true;
     vimdiffAlias = true;
     defaultEditor = true;
-    plugins = with pkgs.vimPlugins; [
-      fugitive
-    ];
+    plugins = with pkgs.vimPlugins;
+      [
+        fugitive
+      ]
+      ++ (
+        if devEnvironment
+        then [
+          vim-go
+
+          zig-vim
+
+          nvim-metals
+          plenary-nvim
+        ]
+        else []
+      );
     extraConfig = builtins.readFile ./vimrc;
   };