From 5e42a1aa3740aba548efa8928a08bd7726c13491 Mon Sep 17 00:00:00 2001
From: Laurent Gueret <gueretlob@pm.me>
Date: Mon, 16 Feb 2026 12:27:29 +0100
Subject: [PATCH] Clean of env files

---
 hosts/darwin/home/alistreaza.nix             |  9 ++----
 hosts/darwin/system/partials/system.nix      |  8 ++----
 modules/home/common/env/openjdk.nix          | 29 --------------------
 modules/home/common/env/python.nix           | 23 ----------------
 modules/home/common/env/rust.nix             | 27 ------------------
 modules/home/common/{env => }/nix.nix        |  0
 modules/home/common/{env/r.nix => shell.nix} |  6 ++--
 modules/system/darwin/jetbrain.nix           |  1 -
 8 files changed, 7 insertions(+), 96 deletions(-)
 delete mode 100644 modules/home/common/env/openjdk.nix
 delete mode 100644 modules/home/common/env/python.nix
 delete mode 100644 modules/home/common/env/rust.nix
 rename modules/home/common/{env => }/nix.nix (100%)
 rename modules/home/common/{env/r.nix => shell.nix} (72%)

diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/alistreaza.nix
index c7d0248..4901de6 100644
--- a/hosts/darwin/home/alistreaza.nix
+++ b/hosts/darwin/home/alistreaza.nix
@@ -17,14 +17,9 @@
     home.shell.git.enable = true;
     home.shell.neovim.enable = true;
 
-    # Nix env deps
+    # Nix & languages env deps
     home.env.nix.enable = true;
-
-    # Languages env deps
-    home.env.r.enable = true;
-    home.env.jdk.enable = true;
-    home.env.rust.enable = true;
-    home.env.python.enable = true;
+    home.env.shell.enable = false;
 
     # No Home Application Folders
     targets.darwin.linkApps.enable = false;
diff --git a/hosts/darwin/system/partials/system.nix b/hosts/darwin/system/partials/system.nix
index ddca1b3..488699a 100644
--- a/hosts/darwin/system/partials/system.nix
+++ b/hosts/darwin/system/partials/system.nix
@@ -14,7 +14,7 @@
         minimize-to-application = true;
         show-recents = false;
         tilesize = 30;
-        autohide = true;
+        autohide = false;
         orientation = "bottom";
         persistent-apps = [
           { app = "/System/Applications/Apps.app"; }
@@ -28,12 +28,8 @@
           { app = "/Applications/Zed.app"; }
           { app = "/Applications/IntelliJ IDEA.app"; }
           { app = "/Applications/PyCharm.app"; }
-          { app = "/Applications/PhpStorm.app"; }
-          { app = "/Applications/RustRover.app"; }
           { app = "/Applications/CLion.app"; }
-          { app = "/Applications/GoLand.app"; }
-          { app = "/Applications/DataGrip.app"; }
-          { app = "/Applications/DataSpell.app"; }
+          { app = "/Applications/RustRover.app"; }
           { app = "/Applications/iTerm.app"; }
         ];
         persistent-others = [ ];
diff --git a/modules/home/common/env/openjdk.nix b/modules/home/common/env/openjdk.nix
deleted file mode 100644
index fc3c55f..0000000
--- a/modules/home/common/env/openjdk.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-let
-  cfg = config.home.env.jdk;
-in
-{
-  options.home.env.jdk = {
-    enable = mkEnableOption "Zen Editor options";
-  };
-  config = mkIf cfg.enable {
-
-    home.packages = with pkgs; [
-      jdk25
-    ];
-
-    home.sessionVariables = {
-      JAVA_HOME = "${pkgs.jdk25}";
-      M2_HOME = "${config.xdg.dataHome}/maven";
-      MVN_HOME = "${config.xdg.dataHome}/maven";
-      MAVEN_HOME = "${config.xdg.dataHome}/maven";
-    };
-
-  };
-}
diff --git a/modules/home/common/env/python.nix b/modules/home/common/env/python.nix
deleted file mode 100644
index 3928dbf..0000000
--- a/modules/home/common/env/python.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-let
-  cfg = config.home.env.python;
-in
-{
-  options.home.env.python = {
-    enable = mkEnableOption "Zen Editor options";
-  };
-  config = mkIf cfg.enable {
-
-    home.packages = with pkgs; [
-      python3
-      uv
-    ];
-
-  };
-}
diff --git a/modules/home/common/env/rust.nix b/modules/home/common/env/rust.nix
deleted file mode 100644
index 19680d1..0000000
--- a/modules/home/common/env/rust.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-let
-  cfg = config.home.env.rust;
-in
-{
-  options.home.env.rust = {
-    enable = mkEnableOption "Zen Editor options";
-  };
-  config = mkIf cfg.enable {
-
-    home.packages = with pkgs; [
-      rustup
-    ];
-
-    home.sessionVariables = {
-      CARGO_HOME = "${config.xdg.dataHome}/cargo";
-      RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
-    };
-
-  };
-}
diff --git a/modules/home/common/env/nix.nix b/modules/home/common/nix.nix
similarity index 100%
rename from modules/home/common/env/nix.nix
rename to modules/home/common/nix.nix
diff --git a/modules/home/common/env/r.nix b/modules/home/common/shell.nix
similarity index 72%
rename from modules/home/common/env/r.nix
rename to modules/home/common/shell.nix
index b3fe534..cadc426 100644
--- a/modules/home/common/env/r.nix
+++ b/modules/home/common/shell.nix
@@ -6,16 +6,16 @@
 }:
 with lib;
 let
-  cfg = config.home.env.r;
+  cfg = config.home.env.shell;
 in
 {
-  options.home.env.r = {
+  options.home.env.shell = {
     enable = mkEnableOption "Zen Editor options";
   };
   config = mkIf cfg.enable {
 
     home.packages = with pkgs; [
-      R
+      devenv
     ];
 
   };
diff --git a/modules/system/darwin/jetbrain.nix b/modules/system/darwin/jetbrain.nix
index 04658d6..eebd6f0 100644
--- a/modules/system/darwin/jetbrain.nix
+++ b/modules/system/darwin/jetbrain.nix
@@ -14,7 +14,6 @@ in
       "pycharm"
       "clion"
       "rustrover"
-      "dataspell"
     ];
 
   };