Add env file

flake.lock

@@ -199,7 +199,28 @@
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771297684,
+        "narHash": "sha256-wieWskQxZLPlNXX06JEB0bMoS/ZYQ89xBzF0RL9lyLs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "755d3669699a7c62aef35af187d75dc2728cfd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -19,14 +19,14 @@
 
     # Nix Homebrew
     nix-homebrew.url = "github:zhaofengli/nix-homebrew";
-    homebrew-core = {
+    homebrew-core.url = "github:homebrew/homebrew-core";
-      url = "github:homebrew/homebrew-core";
+    homebrew-core.flake = false;
-      flake = false;
+    homebrew-cask.url = "github:homebrew/homebrew-cask";
-    };
+    homebrew-cask.flake = false;
-    homebrew-cask = {
+
-      url = "github:homebrew/homebrew-cask";
+    # Rust Overlay
-      flake = false;
+    rust-overlay.url = "github:oxalica/rust-overlay";
-    };
+    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -38,6 +38,7 @@
       import-tree,
       home-manager,
       nix-homebrew,
+      rust-overlay,
       homebrew-core,
       homebrew-cask,
       nixpkgs-unstable,
@@ -68,7 +69,7 @@
                 (import-tree ./hosts/nixos/system)
               ]
               ++ [
-                ./hosts/nixos/overlays.nix
+                (import-tree ./overlays/nixos)
                 home-manager.nixosModules.home-manager
 
                 (import-tree ./hosts/common)
@@ -81,6 +82,7 @@
               specialArgs = {
                 self = self;
                 import-tree = import-tree;
+                rust-overlay = rust-overlay;
                 home-manager = home-manager;
                 homebrew-core = homebrew-core;
                 homebrew-cask = homebrew-cask;

hosts/darwin/home/alistreaza.nix

@@ -19,6 +19,7 @@
 
     # Nix & languages env deps
     home.env.nix.enable = true;
+    home.env.rust.enable = true;
 
     # No Home Application Folders
     targets.darwin.linkApps.enable = false;

hosts/nixos/home/users/alistreaza.nix

@@ -13,13 +13,11 @@
     };
 
     # Shell apps
+    home.shell.nh.enable = true;
     home.shell.zsh.enable = true;
     home.shell.git.enable = true;
     home.shell.neovim.enable = true;
 
-    home.shell.nh.enable = true;
-    home.shell.env.enable = true;
-
     # Code editor
     home.ide.zed.enable = true;
 

modules/home/darwin/env/jdk.nix

@@ -0,0 +1,23 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.home.env.jdk;
+in
+{
+  options.home.env.jdk = {
+    enable = mkEnableOption "System nh service";
+  };
+  config = mkIf cfg.enable {
+
+    home.packages = with pkgs; [
+      jdk25_headless
+      maven
+    ];
+
+  };
+}

modules/home/darwin/env/python.nix

@@ -6,16 +6,17 @@
 }:
 with lib;
 let
-  cfg = config.home.env.shell;
+  cfg = config.home.env.python;
 in
 {
-  options.home.env.shell = {
+  options.home.env.python = {
-    enable = mkEnableOption "Zen Editor options";
+    enable = mkEnableOption "System nh service";
   };
   config = mkIf cfg.enable {
 
     home.packages = with pkgs; [
-      devenv
+      python315
+      uv
     ];
 
   };

modules/home/darwin/env/rust.nix

@@ -0,0 +1,25 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.home.env.rust;
+in
+{
+  options.home.env.rust = {
+    enable = mkEnableOption "System nh service";
+  };
+  config = mkIf cfg.enable {
+
+    home.packages = with pkgs; [
+      rust-bin.stable.latest.default.override
+      {
+        extensions = [ "rust-src" ];
+      }
+    ];
+
+  };
+}

overlays/darwin/rust.nix

@@ -0,0 +1,6 @@
+{ rust-overlay, ... }:
+{
+  nixpkgs.overlays = [
+    rust-overlay.overlays.default
+  ];
+}