diff --git a/flake.nix b/flake.nix
index ee575ba..c9623f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,7 +125,7 @@
         nixpkgs.overlays = [
           (final: prev: {
             unstable = import nixpkgs-unstable {
-              system = final.system;
+              system = final.stdenv.hostPlatform.system;
               config.allowUnfree = true;
             };
 
diff --git a/machines/atalanta/default.nix b/machines/atalanta/default.nix
index 03ef004..7ad2750 100644
--- a/machines/atalanta/default.nix
+++ b/machines/atalanta/default.nix
@@ -56,7 +56,7 @@
     pkgs.gcc
     pkgs.rustc
     pkgs.cargo
-    pkgs.jdk23
+    pkgs.jdk
     pkgs.ruby
     pkgs.cmake
     pkgs.unstable.biome
@@ -72,7 +72,7 @@
     pkgs.nh
     pkgs.rustscan
     pkgs.vhs
-    inputs.soapdump.packages.${pkgs.system}.default
+    inputs.soapdump.packages.${pkgs.stdenv.hostPlatform.system}.default
   ];
 
   programs.direnv.enable = true;
diff --git a/machines/atalanta/home/default.nix b/machines/atalanta/home/default.nix
index a388441..eb0968d 100644
--- a/machines/atalanta/home/default.nix
+++ b/machines/atalanta/home/default.nix
@@ -14,7 +14,7 @@
     username = "kierank";
     homeDirectory = "/Users/kierank";
     packages = with pkgs; [
-      inputs.nixvim.packages.${system}.default
+      inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
       vesktop
     ];
   };
diff --git a/machines/moonlark/default.nix b/machines/moonlark/default.nix
index ac2bf3c..ec1cd00 100644
--- a/machines/moonlark/default.nix
+++ b/machines/moonlark/default.nix
@@ -120,7 +120,7 @@
     pkgs.mako
     pkgs.unstable.hyprpicker
     pkgs.wl-screenrec
-    inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
+    inputs.hyprland-contrib.packages.${pkgs.stdenv.hostPlatform.system}.grimblast
     pkgs.playerctl
     pkgs.libnotify
     pkgs.notify-desktop
@@ -148,7 +148,7 @@
     pkgs.gcc
     pkgs.rustc
     pkgs.cargo
-    pkgs.jdk23
+    pkgs.jdk
     pkgs.ruby
     pkgs.cmake
     pkgs.unstable.biome
@@ -187,12 +187,12 @@
     pkgs.gobang
     pkgs.love
     #frc
-    inputs.frc-nix.packages.${pkgs.system}.elastic-dashboard
-    inputs.frc-nix.packages.${pkgs.system}.pathplanner
-    inputs.frc-nix.packages.${pkgs.system}.roborioteamnumbersetter
-    inputs.frc-nix.packages.${pkgs.system}.sysid
-    inputs.frc-nix.packages.${pkgs.system}.wpilib-utility
-    inputs.frc-nix.packages.${pkgs.system}.advantagescope
+    inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.elastic-dashboard
+    inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.pathplanner
+    inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.roborioteamnumbersetter
+    inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.sysid
+    inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.wpilib-utility
+    inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.advantagescope
     # misc
     pkgs.invoice
     pkgs.pop
@@ -206,7 +206,7 @@
     pkgs.unstable.kicad-testing
     pkgs.zenity
     pkgs.atproto-goat
-    inputs.cedarlogic.packages.${pkgs.system}.cedarlogic
+    inputs.cedarlogic.packages.${pkgs.stdenv.hostPlatform.system}.cedarlogic
     pkgs.unstable.betaflight-configurator
   ];
 
diff --git a/machines/prattle/default.nix b/machines/prattle/default.nix
index 05b22b2..238579b 100644
--- a/machines/prattle/default.nix
+++ b/machines/prattle/default.nix
@@ -173,7 +173,7 @@
     enable = true;
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/caddy-dns/cloudflare@v0.2.2" ];
-      hash = "sha256-Z8nPh4OI3/R1nn667ZC5VgE+Q9vDenaQ3QPKxmqPNkc=";
+      hash = "sha256-ea8PC/+SlPRdEVVF/I3c1CBprlVp1nrumKM5cMwJJ3U=";
     };
     email = "me@dunkirk.sh";
     globalConfig = ''
diff --git a/machines/tacyon/default.nix b/machines/tacyon/default.nix
index 7dfa28a..a415acb 100644
--- a/machines/tacyon/default.nix
+++ b/machines/tacyon/default.nix
@@ -1,7 +1,6 @@
 {
   pkgs,
   inputs,
-  system,
   ...
 }:
 {
@@ -16,7 +15,7 @@
     homeDirectory = "/home/pi";
 
     packages = with pkgs; [
-      inputs.nixvim.packages.${system}.default
+      inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
 
       # languages
       go
@@ -25,7 +24,7 @@
       go-tools
 
       # my apps
-      inputs.ctfd-alerts.packages.${system}.default
+      inputs.ctfd-alerts.packages.${pkgs.stdenv.hostPlatform.system}.default
 
       # Fonts
       fira
diff --git a/machines/terebithia/default.nix b/machines/terebithia/default.nix
index 098df0f..73f7d4d 100644
--- a/machines/terebithia/default.nix
+++ b/machines/terebithia/default.nix
@@ -198,7 +198,7 @@
     enable = true;
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/caddy-dns/cloudflare@v0.2.2" ];
-      hash = "sha256-Z8nPh4OI3/R1nn667ZC5VgE+Q9vDenaQ3QPKxmqPNkc=";
+      hash = "sha256-ea8PC/+SlPRdEVVF/I3c1CBprlVp1nrumKM5cMwJJ3U=";
     };
     email = "me@dunkirk.sh";
     globalConfig = ''
diff --git a/modules/home/apps/git.nix b/modules/home/apps/git.nix
index 3c069e9..9118b5c 100644
--- a/modules/home/apps/git.nix
+++ b/modules/home/apps/git.nix
@@ -11,14 +11,6 @@
   config = lib.mkIf config.atelier.shell.git.enable {
     programs.git = {
       enable = true;
-      userName = "Kieran Klukas";
-      userEmail = "me@dunkirk.sh";
-      aliases = {
-        c = "commit";
-        p = "push";
-        ch = "checkout";
-        pushfwl = "push --force-with-lease --force-if-includes";
-      };
       includes = [
         {
           path = pkgs.writeText "git-user-config" ''
@@ -32,19 +24,32 @@
           condition = "gitdir:~/code/school/";
         }
       ];
-      extraConfig = {
+      settings = {
+        user = {
+          name = "Kieran Klukas";
+          email = "me@dunkirk.sh";
+          signingKey = "~/.ssh/id_rsa.pub";
+        };
+        alias = {
+          c = "commit";
+          p = "push";
+          ch = "checkout";
+          pushfwl = "push --force-with-lease --force-if-includes";
+        };
         branch.sort = "-committerdate";
         pager.branch = false;
         column.ui = "auto";
         commit.gpgsign = true;
         gpg.format = "ssh";
         gpg.ssh.allowedSignersFile = "~/.ssh/allowedSigners";
-        user.signingKey = "~/.ssh/id_rsa.pub";
         pull.rebase = true;
         push.autoSetupRemote = true;
         init.defaultBranch = "main";
       };
-      delta.enable = true;
+    };
+    programs.delta = {
+      enable = true;
+      enableGitIntegration = true;
     };
     programs.gh.enable = true;
     programs.lazygit = {
diff --git a/modules/home/apps/helix.nix b/modules/home/apps/helix.nix
index e300609..41d6130 100644
--- a/modules/home/apps/helix.nix
+++ b/modules/home/apps/helix.nix
@@ -36,7 +36,7 @@
           vscode-langservers-extracted
           kotlin-language-server
           harper
-          inputs.wakatime-ls.packages.${pkgs.system}.default
+          inputs.wakatime-ls.packages.${pkgs.stdenv.hostPlatform.system}.default
         ]
         ++ lib.optionals config.atelier.apps.helix.swift [
           sourcekit-lsp
diff --git a/modules/home/apps/spotify.nix b/modules/home/apps/spotify.nix
index 30ff44b..8160b6c 100644
--- a/modules/home/apps/spotify.nix
+++ b/modules/home/apps/spotify.nix
@@ -14,7 +14,7 @@
   config = lib.mkIf config.atelier.apps.spotify.enable {
     programs.spicetify =
       let
-        spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+        spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
       in
       {
         enable = true;
diff --git a/modules/home/apps/vscode.nix b/modules/home/apps/vscode.nix
index d663fe2..4d5aa5f 100644
--- a/modules/home/apps/vscode.nix
+++ b/modules/home/apps/vscode.nix
@@ -48,7 +48,7 @@
           rust-lang.rust-analyzer
           dustypomerleau.rust-syntax
           catppuccin.catppuccin-vsc
-          inputs.frc-nix.packages.${pkgs.system}.vscode-wpilib
+          inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.vscode-wpilib
         ];
         userSettings = {
           "editor.semanticHighlighting.enabled" = true;
diff --git a/modules/home/system/shell.nix b/modules/home/system/shell.nix
index 3cb1b43..6e0dc0b 100644
--- a/modules/home/system/shell.nix
+++ b/modules/home/system/shell.nix
@@ -609,7 +609,7 @@ in
       now
       ghostty-setup
       pkgs.unstable.wakatime-cli
-      inputs.terminal-wakatime.packages.${pkgs.system}.default
+      inputs.terminal-wakatime.packages.${pkgs.stdenv.hostPlatform.system}.default
       unzip
       dog
       dust