4 files changed, 5 insertions, 36 deletions
diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix
index e4f08e8..281cf2c 100644
--- a/nix-conf/home/includes/common.nix
+++ b/nix-conf/home/includes/common.nix
@@ -5,10 +5,6 @@
   inputs,
   ...
 }:
-let
-  hcr = pkgs.callPackage ./scripts/hm-changes-report.nix { inherit config pkgs; };
-  scr = pkgs.callPackage ./scripts/system-changes-report.nix { inherit config pkgs; };
-in
 {
   imports = [
     ./zsh.nix
@@ -36,12 +32,10 @@ in
 
   home.sessionVariables = {
     LSP_USE_PLISTS = "true";
+    NH_FLAKE = config.home.homeDirectory;
   };
 
   home.packages = with pkgs; [
-    hcr
-    scr
-
     (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ]))
     bandwhich
     bottom
@@ -376,6 +370,7 @@ in
     };
   };
 
+  # TODO: programs.nh.flake bring in so many dependencies?
   programs.nh.enable = true;
 }
 
diff --git a/nix-conf/home/includes/dev-common.nix b/nix-conf/home/includes/dev-common.nix
index 92b286e..59da868 100644
--- a/nix-conf/home/includes/dev-common.nix
+++ b/nix-conf/home/includes/dev-common.nix
@@ -36,7 +36,6 @@ in
     plugins = with pkgs; [
       tmuxPlugins.copy-toolkit
       tmuxPlugins.copycat
-      tmuxPlugins.extrakto
       tmuxPlugins.fuzzback
       tmuxPlugins.fzf-tmux-url
       tmuxPlugins.jump
@@ -57,6 +56,9 @@ in
           #${lib.optionalString pkgs.stdenv.isDarwin "set -g @thumbs-upcase-command 'xargs open {}'"}
         '';
       }
+    ]
+    ++ optionals (!stdenv.isDarwin) [
+      tmuxPlugins.extrakto
     ];
     extraConfig = ''
       unbind-key R
diff --git a/nix-conf/home/includes/scripts/hm-changes-report.nix b/nix-conf/home/includes/scripts/hm-changes-report.nix
deleted file mode 100644
index 65e7fe8..0000000
--- a/nix-conf/home/includes/scripts/hm-changes-report.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, ... }:
-
-# https://github.com/gvolpe/nix-config/blob/e28a220d0087064e6bad6b992b4914a65eb545e5/home/scripts/changes-report.nix
-let
-  hm-profiles = "${config.home.homeDirectory}/.local/state/nix/profiles/home-manager-*-link";
-in
-pkgs.writeShellScriptBin "hm-changes-report" ''
-  # Disable nvd if there are less than 2 hm profiles.
-  if [ $(ls -d1v ${hm-profiles} 2>/dev/null | wc -l) -lt 2 ]; then
-    echo "Skipping changes report..."
-  else
-    ${pkgs.nvd}/bin/nvd diff $(ls -d1v ${hm-profiles} | tail -2)
-  fi
-''
diff --git a/nix-conf/home/includes/scripts/system-changes-report.nix b/nix-conf/home/includes/scripts/system-changes-report.nix
deleted file mode 100644
index b94498c..0000000
--- a/nix-conf/home/includes/scripts/system-changes-report.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, ... }:
-
-# https://github.com/gvolpe/nix-config/blob/e28a220d0087064e6bad6b992b4914a65eb545e5/home/scripts/changes-report.nix
-let
-  system-profiles = "/nix/var/nix/profiles/system-*-link";
-in
-pkgs.writeShellScriptBin "system-changes-report" ''
-  # Disable nvd if there are less than 2 hm profiles.
-  if [ $(ls -d1v ${system-profiles} 2>/dev/null | wc -l) -lt 2 ]; then
-    echo "Skipping changes report..."
-  else
-    ${pkgs.nvd}/bin/nvd diff $(ls -d1v ${system-profiles} | tail -2)
-  fi
-''