diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 8d06f6ca..a07aa131 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -57,7 +57,7 @@ in
         extraPackages = with pkgs; [
           papirus-icon-theme
           bibata-cursors
-          inputs.waifu-cursors.packages.${pkgs.system}.all
+          inputs.waifu-cursors.packages.${pkgs.stdenv.hostPlatform.system}.all
         ];
 
         cursor = "Bibata-Modern-Classic";
@@ -537,10 +537,10 @@ in
             # Run unpatched binaries on NixOS
             # Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
             # Usage: "nix-alien-ld -- <Executable>".
-            inputs.nix-alien.packages.${system}.nix-alien
+            inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien
 
             # Search nixpkgs
-            inputs.nps.packages.${system}.default
+            inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default
 
             # Use NixCommunity binary cache
             cachix
@@ -854,7 +854,7 @@ in
       nushell.enable = false;
 
       # spicetify = let
-      #   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+      #   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
       # in {
       #   enable = true;
       #
diff --git a/home/modules/1_deprecated/ags/default.nix b/home/modules/1_deprecated/ags/default.nix
index 05b3d12d..65963bc8 100644
--- a/home/modules/1_deprecated/ags/default.nix
+++ b/home/modules/1_deprecated/ags/default.nix
@@ -17,20 +17,20 @@ in {
 
       # AGS libs go here
       extraPackages = [
-        inputs.ags.packages.${pkgs.system}.apps
-        inputs.ags.packages.${pkgs.system}.auth
-        inputs.ags.packages.${pkgs.system}.battery
-        inputs.ags.packages.${pkgs.system}.bluetooth
-        inputs.ags.packages.${pkgs.system}.cava
-        # inputs.ags.packages.${pkgs.system}.greet
-        inputs.ags.packages.${pkgs.system}.hyprland
-        inputs.ags.packages.${pkgs.system}.mpris
-        inputs.ags.packages.${pkgs.system}.network
-        inputs.ags.packages.${pkgs.system}.notifd
-        # inputs.ags.packages.${pkgs.system}.powerprofiles
-        # inputs.ags.packages.${pkgs.system}.river
-        inputs.ags.packages.${pkgs.system}.tray
-        inputs.ags.packages.${pkgs.system}.wireplumber
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.apps
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.auth
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.battery
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.bluetooth
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.cava
+        # inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.greet
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.mpris
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.network
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.notifd
+        # inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.powerprofiles
+        # inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.river
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.tray
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.wireplumber
       ];
 
       # This should symlink but doesn't, it copies the files :/
@@ -40,7 +40,7 @@ in {
     # The ags module doesn't expose the "astal" cli tool or extraPackages
     home.packages =
       [
-        inputs.ags.packages.${pkgs.system}.io
+        inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.io
       ]
       ++ config.programs.ags.extraPackages;
 
diff --git a/home/modules/docs/default.nix b/home/modules/docs/default.nix
index efe7bed7..a8834f2b 100644
--- a/home/modules/docs/default.nix
+++ b/home/modules/docs/default.nix
@@ -12,9 +12,11 @@ in {
   config = lib.mkIf docs.enable {
     home = {
       packages = with pkgs; [
-        texliveFull
         inkscape
-        typst
+
+        texliveFull # TODO: LaTeX packages
+
+        typst # TODO: Typst packages
       ];
 
       file = {
diff --git a/home/modules/hyprland/default.nix b/home/modules/hyprland/default.nix
index 8d8fa660..2809f653 100644
--- a/home/modules/hyprland/default.nix
+++ b/home/modules/hyprland/default.nix
@@ -142,8 +142,8 @@ in {
 
     wayland.windowManager.hyprland = {
       enable = true;
-      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
 
       systemd.enable = true; # Enable hyprland-session.target
       systemd.variables = ["--all"]; # Import PATH into systemd
@@ -152,16 +152,16 @@ in {
       plugins = builtins.concatLists [
         (lib.optionals
           hyprland.bars.enable
-          [inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars])
+          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars])
         (lib.optionals
           hyprland.dynamicCursor.enable
-          [inputs.hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors])
+          [inputs.hypr-dynamic-cursors.packages.${pkgs.stdenv.hostPlatform.system}.hypr-dynamic-cursors])
         (lib.optionals
           hyprland.trails.enable
-          [inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails])
+          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails])
         (lib.optionals
           hyprland.hyprspace.enable
-          [inputs.hyprspace.packages.${pkgs.system}.Hyprspace])
+          [inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace])
       ];
 
       settings = import ./settings.nix {
diff --git a/system/default.nix b/system/default.nix
index efcd3d73..80346050 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -346,8 +346,8 @@ with mylib.networking; {
     hyprland = {
       enable = !headless;
 
-      package = inputs.hyprland.packages.${system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
+      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+      portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
 
       xwayland.enable = true;
       withUWSM = true;
@@ -471,7 +471,7 @@ with mylib.networking; {
       script = ''
         set -eu
         echo "Start refreshing nps cache..."
-        ${inputs.nps.packages.${system}.default}/bin/nps -dddd -e -r
+        ${inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/nps -dddd -e -r
         echo "... finished nps cache with exit code $?."
       '';
     };