diff --git a/flake.nix b/flake.nix
index 7a288b61e4d4b3701f65bc780174836bf4dc972c..52ca3393e85e9956a7ec697ce299091750f39218 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,6 +45,15 @@         nur = import inputs.nur {
           nurpkgs = prev;
           pkgs = prev;
         };
+        jolheiser = {
+          helix = inputs.helix.packages.${prev.system}.default;
+          zed = inputs.zed.packages.${prev.system}.default;
+          gomodinit = inputs.gomodinit.packages.${prev.system}.default;
+          cfg = inputs.cfg.packages.${prev.system}.default;
+          spectre = inputs.spectre.packages.${prev.system}.default;
+          pokego = inputs.pokego.packages.${prev.system}.default;
+        };
+        tclip = inputs.tclip.packages.${prev.system}.tclip;
       };
       pkgs = import inputs.nixpkgs {
         inherit system;
diff --git a/home/gui/default.nix b/home/gui/default.nix
index 37b847180d8fbfa2f4984131d114615b5b0338b9..baf9d868f44e667d1455065ed979ed89fddd7607 100644
--- a/home/gui/default.nix
+++ b/home/gui/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ../nogui
@@ -16,7 +16,6 @@     packages = with pkgs; [
       obsidian
       gimp3
 
-      inputs.zed.packages.${pkgs.stdenv.hostPlatform.system}.default
       jolheiser.zed
     ];
   };
diff --git a/home/nogui/default.nix b/home/nogui/default.nix
index 8f25d70e42aa0fb80878795801520bd363125ade..d5ad1421d6b2e01547de658e2e79496a8aeff7bd 100644
--- a/home/nogui/default.nix
+++ b/home/nogui/default.nix
@@ -1,5 +1,4 @@
 {
-  inputs,
   pkgs,
   config,
   jolheiser,
@@ -48,11 +47,11 @@       just
       ripgrep
       usql
 
-      inputs.tclip.${pkgs.stdenv.hostPlatform.system}.default
-      inputs.helix.${pkgs.stdenv.hostPlatform.system}.default
-      inputs.gomodinit.${pkgs.stdenv.hostPlatform.system}.default
-      inputs.cfg.${pkgs.stdenv.hostPlatform.system}.default
-      inputs.spectre.${pkgs.stdenv.hostPlatform.system}.default
+      tclip
+      pkgs.jolheiser.helix
+      pkgs.jolheiser.gomodinit
+      pkgs.jolheiser.cfg
+      pkgs.jolheiser.spectre
     ];
     activation.report-changes = config.lib.dag.entryAnywhere ''
       ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff $oldGenPath $newGenPath
diff --git a/home/nogui/nushell.nix b/home/nogui/nushell.nix
index 01de11c2ec01d982b299a2b4ac79801baf2c8b76..51bc022739a4b9951ba36bc202c2302da271cdd2 100644
--- a/home/nogui/nushell.nix
+++ b/home/nogui/nushell.nix
@@ -26,7 +26,7 @@       use ${nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu *
       use ${nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu *
       use ${nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu *
 
-      ${pkgs.lib.getExe inputs.pokego.packages.${pkgs.stdenv.hostPlatform.system}.default} --no-title
+      ${jolheiser.pokego}/bin/pokego --no-title
     '';
     extraEnv = ''
       $env.GOPATH = "${config.xdg.dataHome}/go"