Add ghostty & fixes

flake.nix

@@ -19,14 +19,10 @@
 
     # Nix Homebrew
     nix-homebrew.url = "github:zhaofengli/nix-homebrew";
-    homebrew-core = {
-      url = "github:homebrew/homebrew-core";
-      flake = false;
-    };
-    homebrew-cask = {
-      url = "github:homebrew/homebrew-cask";
-      flake = false;
-    };
+    homebrew-core.url = "github:homebrew/homebrew-core";
+    homebrew-core.flake = false;
+    homebrew-cask.url = "github:homebrew/homebrew-cask";
+    homebrew-cask.flake = false;
   };
 
   outputs =
@@ -68,7 +64,7 @@
                 (import-tree ./hosts/nixos/system)
               ]
               ++ [
-                ./hosts/nixos/overlays.nix
+                (import-tree ./overlays/nixos)
                 home-manager.nixosModules.home-manager
 
                 (import-tree ./hosts/common)

hosts/darwin/home/alistreaza.nix

@@ -1,4 +1,4 @@
-{ import-tree, ... }:
+{ lib, import-tree, ... }:
 {
   home-manager.users.alistreaza = {
     imports = [
@@ -9,6 +9,17 @@
     home = {
       username = "alistreaza";
       homeDirectory = /Users/alistreaza;
+      sessionVariables = {
+        XDG_CACHE_HOME = "$HOME/.cache";
+        XDG_CONFIG_HOME = "$HOME/.config";
+        XDG_DATA_HOME = "$HOME/.local/share";
+        XDG_STATE_HOME = "$HOME/.local/state";
+      };
+      file = {
+        "$HOME/.config/ghostty/config" = {
+          source = lib.file.mkOutOfStoreSymlink ./config/ghostty;
+        };
+      };
     };
 
     # Shell apps
@@ -19,6 +30,9 @@
 
     # Nix & languages env deps
     home.env.nix.enable = true;
+    home.env.jdk.enable = true;
+    home.env.rust.enable = true;
+    home.env.python.enable = true;
 
     # No Home Application Folders
     targets.darwin.linkApps.enable = false;

hosts/darwin/home/config/ghostty

@@ -0,0 +1,11 @@
+# macOS specific
+macos-titlebar-style = "tabs"
+
+# Window padding & size
+window-padding-x = 8
+window-padding-y = 0,2
+
+# Themes
+background-blur=true
+background-opacity = 0.75
+theme = Spacegray Eighties

hosts/darwin/system/os.nix

@@ -4,7 +4,7 @@
   nixpkgs.hostPlatform = "aarch64-darwin";
 
   # Homebrew apps
-  os.homebrew.iterm.enable = true;
+  os.homebrew.ghostty.enable = true;
   os.homebrew.zed.enable = true;
   os.homebrew.jetbrain.enable = true;
   os.homebrew.iina.enable = true;

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,28 @@
+{
+  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
+    ];
+
+    home.sessionVariables = {
+      JAVA_HOME = "${pkgs.jdk25_headless}";
+      M2_HOME = "${config.home.sessionVariables.XDG_DATA_HOME}/m2";
+    };
+
+  };
+}

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 = {
-    enable = mkEnableOption "Zen Editor options";
+  options.home.env.python = {
+    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; [ rustup ];
+
+    home.sessionVariables = {
+      CARGO_HOME = "${config.home.sessionVariables.XDG_DATA_HOME}/cargo";
+      RUSTUP_HOME = "${config.home.sessionVariables.XDG_DATA_HOME}/rustup";
+    };
+
+  };
+}

modules/system/darwin/ghostty.nix

@@ -0,0 +1,17 @@
+{ lib, config, ... }:
+with lib;
+let
+  cfg = config.os.homebrew.ghostty;
+in
+{
+  options.os.homebrew.ghostty = {
+    enable = mkEnableOption "System iterm homebrew service";
+  };
+  config = mkIf cfg.enable {
+
+    homebrew.casks = [
+      "ghostty"
+    ];
+
+  };
+}