6 files changed, 31 insertions, 46 deletions
diff --git a/home/default.nix b/home/default.nix
index 0c7d664..035bdb6 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -26,7 +26,6 @@
     ./pcmanfm
     ./python
     ./scanner
-    ./scripts
     ./seahorse
     ./ssh
     ./sublime-music
diff --git a/home/packages/default.nix b/home/packages/default.nix
index e6dac4c..bd897ac 100644
--- a/home/packages/default.nix
+++ b/home/packages/default.nix
@@ -1,5 +1,16 @@
 { config, lib, pkgs, ... }:
-let cfg = config.my.home.packages;
+let
+  cfg = config.my.home.packages;
+  album-to-nas = pkgs.writeShellScriptBin "album-to-nas" ''
+    set -euo pipefail
+
+    ALBUM_PATH="''${1}"
+    ALBUM_NAME=$(basename "''${ALBUM_PATH}")
+    NAS=$(${pkgs.tailscale}/bin/tailscale status --json | ${pkgs.jq}/bin/jq -r '.Peer | map(select(.HostName == "tahoe"))[0].TailscaleIPs[0]')
+
+    scp "''${ALBUM_PATH}" "''${NAS}:~/import/album.zip"
+    ssh "''${NAS}" bc-to-beet ~/import/album.zip
+  '';
 in
 {
   options.my.home.packages = with lib; {
@@ -15,5 +26,6 @@ in
     };
   };
   config.home.packages = with pkgs;
-    lib.mkIf cfg.enable ([ util-linux jq ripgrep ] ++ cfg.additionalPackages);
+    lib.mkIf cfg.enable
+      ([ util-linux jq ripgrep album-to-nas ] ++ cfg.additionalPackages);
 }
diff --git a/home/scripts/bc-to-nas.nix b/home/scripts/bc-to-nas.nix
deleted file mode 100644
index efa95d2..0000000
--- a/home/scripts/bc-to-nas.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ lib, pkgs, ... }:
-let
-  bc-to-nas = pkgs.writeShellScriptBin "bc-to-nas" ''
-    set -euo pipefail
-
-    ALBUM_PATH="''${1}"
-    ALBUM_NAME=$(basename "''${ALBUM_PATH}")
-    NAS=$(${pkgs.tailscale}/bin/tailscale status --json | ${pkgs.jq}/bin/jq -r '.Peer | map(select(.HostName == "tahoe"))[0].TailscaleIPs[0]')
-
-    scp "''${ALBUM_PATH}" "''${NAS}:~/import/album.zip"
-    ssh "''${NAS}" bc-to-beet ~/import/album.zip
-  '';
-in
-{ config = { home.packages = with pkgs; [ bc-to-nas ]; }; }
diff --git a/home/scripts/default.nix b/home/scripts/default.nix
deleted file mode 100644
index 741bade..0000000
--- a/home/scripts/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  imports = [ ./perf-flamegraph.nix ./bc-to-nas.nix ];
-}
diff --git a/home/scripts/perf-flamegraph.nix b/home/scripts/perf-flamegraph.nix
deleted file mode 100644
index b974e6b..0000000
--- a/home/scripts/perf-flamegraph.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, config, ... }:
-let
-  perf-flamegraph-process =
-    pkgs.writeShellScriptBin "perf-flamegraph-process" ''
-      set -euo pipefail
-
-      OUT_DIR="''${HOME}/workspace/tmp/flamegraph"
-      OUT_SVG="''${OUT_DIR}/$(date +%y%m%d-%H%M%S).svg"
-
-      mkdir -p ''${OUT_DIR}
-
-      ${pkgs.linuxPackages.perf}/bin/perf record -g --call-graph dwarf -F max "$@"
-      ${pkgs.linuxPackages.perf}/bin/perf script \
-        | ${pkgs.flamegraph}/bin/stackcollapse-perf.pl \
-        | ${pkgs.flamegraph}/bin/flamegraph.pl > "''${OUT_SVG}"
-    '';
-in
-{
-  config = {
-    home.packages = with pkgs; [ flamegraph perf-flamegraph-process ];
-  };
-}
-
diff --git a/modules/system/packages/default.nix b/modules/system/packages/default.nix
index 84cfac2..f8b914c 100644
--- a/modules/system/packages/default.nix
+++ b/modules/system/packages/default.nix
@@ -1,7 +1,22 @@
 # Common packages
 { config, lib, pkgs, ... }:
 with lib;
-let linuxpkgs = config.boot.kernelPackages;
+let
+  linuxpkgs = config.boot.kernelPackages;
+  perf-flamegraph-process =
+    pkgs.writeShellScriptBin "perf-flamegraph-process" ''
+      set -euo pipefail
+
+      OUT_DIR="''${HOME}/workspace/tmp/flamegraph"
+      OUT_SVG="''${OUT_DIR}/$(date +%y%m%d-%H%M%S).svg"
+
+      mkdir -p ''${OUT_DIR}
+
+      ${pkgs.linuxPackages.perf}/bin/perf record -g --call-graph dwarf -F max "$@"
+      ${pkgs.linuxPackages.perf}/bin/perf script \
+        | ${pkgs.flamegraph}/bin/stackcollapse-perf.pl \
+        | ${pkgs.flamegraph}/bin/flamegraph.pl > "''${OUT_SVG}"
+    '';
 in
 {
 
@@ -33,6 +48,7 @@ in
     openssl
     parted
     pciutils
+    perf-flamegraph-process
     perf-tools
     powertop
     rsync