From 3abad17a3d582e21c2fc7f909fae9b420cf57a8c Mon Sep 17 00:00:00 2001
From: Maddie H <maddie@spyhoodle.me>
Date: Sun, 6 Oct 2024 21:29:49 +0100
Subject: [PATCH] feat: add jdk17 & add homebrew to path

---
 flake.nix                   | 2 ++
 homes/common/java.nix       | 7 +++++++
 homes/laptop/shell.nix      | 5 +++++
 systems/laptop/packages.nix | 2 ++
 4 files changed, 16 insertions(+)
 create mode 100644 homes/common/java.nix
 create mode 100644 homes/laptop/shell.nix

diff --git a/flake.nix b/flake.nix
index f45f83a..fff2a0f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,7 @@
           home-manager.nixosModules.home-manager
           {
             home-manager.users.${username}.imports = [ 
+              ./homes/common/java.nix
               ./homes/common/ssh
               ./homes/common/amfora.nix
               ./homes/common/btop.nix
@@ -161,6 +162,7 @@
             home-manager.users.${username}.imports = [
               ./homes/laptop/home.nix
               ./homes/laptop/ssh.nix
+              ./homes/laptop/shell.nix
               ./homes/common/ssh
               ./homes/common/amfora.nix
               ./homes/common/btop.nix
diff --git a/homes/common/java.nix b/homes/common/java.nix
new file mode 100644
index 0000000..0612e9f
--- /dev/null
+++ b/homes/common/java.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    jdk17
+  ];
+}
diff --git a/homes/laptop/shell.nix b/homes/laptop/shell.nix
new file mode 100644
index 0000000..be3266f
--- /dev/null
+++ b/homes/laptop/shell.nix
@@ -0,0 +1,5 @@
+{
+  home.sessionPath = [
+    "/opt/homebrew/bin"
+  ];
+}
diff --git a/systems/laptop/packages.nix b/systems/laptop/packages.nix
index b5b605a..f12d351 100644
--- a/systems/laptop/packages.nix
+++ b/systems/laptop/packages.nix
@@ -13,5 +13,7 @@
     fzf
     bat
     git
+
+    jdk17
   ];
 }