diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix
index 5a4dd95..7c53216 100644
--- a/home/hosts/Styx.nix
+++ b/home/hosts/Styx.nix
@@ -38,7 +38,6 @@
       aria2
       arp-scan
       cachix
-      cliclick
       curlFull
       dasel
       exa
@@ -51,7 +50,6 @@
       lnav
       mtr
       nix-prefetch
-      nvd
       parallel
       q
       ripgrep
diff --git a/home/programs/fish.nix b/home/programs/fish.nix
index 2f60f43..6bb74aa 100644
--- a/home/programs/fish.nix
+++ b/home/programs/fish.nix
@@ -149,7 +149,7 @@
       # Disable greeting
       set fish_greeting
 
-      if [ -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE" ]
+      if test (uname) = "Darwin"; and test -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE"
         set __nifoc_nix_darwin_set_env (cat /run/current-system/etc/bashrc | grep '-set-environment' | cut -d '.' -f 2)
         fenv source "$__nifoc_nix_darwin_set_env"
       end
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index 23dca33..123d11f 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, config, lib, ... }:
 
 let
   customPlugins = import ./plugins.nix { inherit pkgs; };
diff --git a/home/programs/scripts.nix b/home/programs/scripts.nix
index ff62623..8f51a1f 100644
--- a/home/programs/scripts.nix
+++ b/home/programs/scripts.nix
@@ -1,9 +1,18 @@
-{ config, ... }:
+{ pkgs, config, lib, ... }:
 
 let
+  inherit (pkgs.stdenv) isDarwin;
+  inherit (lib) optionals;
+
   user-bin-directory = "${config.home.homeDirectory}/.bin";
 in
 {
+  home.packages = with pkgs; [
+    nvd
+  ] ++ optionals isDarwin [
+    cliclick
+  ];
+
   home.file."${user-bin-directory}" = {
     source = ./scripts;
     recursive = true;