diff --git a/home/programs/git.nix b/home/programs/git.nix
index 5fc88c5..e51d147 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -111,7 +111,7 @@
     };
 
     "mergetool \"nvimdiff4\"" = {
-      cmd = "${pkgs.neovim}/bin/nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
+      cmd = "nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
     };
   };
 }
diff --git a/home/programs/tmux.nix b/home/programs/tmux.nix
index da9ffb3..742d187 100644
--- a/home/programs/tmux.nix
+++ b/home/programs/tmux.nix
@@ -17,7 +17,7 @@
   # Use screen instead of tmux as some tools might not be aware of tmux
   terminal = "screen-256color";
 
-  shell = "${pkgs.zsh}/bin/zsh";
+  shell = "zsh";
 
   sensibleOnTop = false;
 
diff --git a/home/windowManager/i3.nix b/home/windowManager/i3.nix
index 6f8570c..d549fa4 100644
--- a/home/windowManager/i3.nix
+++ b/home/windowManager/i3.nix
@@ -1,4 +1,4 @@
-{ config, pkgs }:
+{ config }:
 
 let
   modifier = config.xsession.windowManager.i3.config.modifier;
@@ -13,7 +13,7 @@ in {
 
     defaultWorkspace = "workspace 1";
 
-    menu = "${pkgs.i3}/bin/i3-dmenu-desktop";
+    menu = "i3-dmenu-desktop";
 
     fonts = {
       names = [ "monospace" ];
@@ -67,7 +67,7 @@ in {
       workspaceButtons = true;
       workspaceNumbers = true;
 
-      statusCommand = "${pkgs.i3blocks}/bin/i3blocks";
+      statusCommand = "i3blocks";
 
       fonts = {
         names = ["monospace"];
diff --git a/home/xdg.nix b/home/xdg.nix
index 6891dc6..bf984ec 100644
--- a/home/xdg.nix
+++ b/home/xdg.nix
@@ -122,12 +122,12 @@
     toggl = {
       name = "Toggl Time Tracking";
       type = "Application";
-      exec = "${pkgs.firefox}/bin/firefox --class=\"time-tracking\" --new-instance -P toggl https://track.toggl.com/timer";
+      exec = "firefox --class=\"time-tracking\" --new-instance -P toggl https://track.toggl.com/timer";
     };
     mailhog-ui = {
       name = "Mailhog";
       type = "Application";
-      exec = "${pkgs.firefox}/bin/firefox --class=\"mailhog\" --new-instance -P mailhog https://mailhog.localhost";
+      exec = "firefox --class=\"mailhog\" --new-instance -P mailhog https://mailhog.localhost";
     };
   };
 
diff --git a/home/xsession.nix b/home/xsession.nix
index e5ef350..dde370a 100644
--- a/home/xsession.nix
+++ b/home/xsession.nix
@@ -29,6 +29,6 @@
   '';
 
   windowManager.i3 = import ./windowManager/i3.nix {
-    inherit config pkgs;
+    inherit config;
   };
 }