diff --git a/home/rofi/default.nix b/home/rofi/default.nix
index 6157450..fba426b 100644
--- a/home/rofi/default.nix
+++ b/home/rofi/default.nix
@@ -24,7 +24,7 @@ lib.mkIf config.programs.rofi.enable {
           # WARNING: ABI version mismatch
           # "calc"
           "clipboard:${lib.my.checkPath pkgs.cliphist "cliphist-rofi-img"}"
-          "obsidian:${lib.my.checkPath pkgs.custom.rofi-obsidian "rofi-obsidian"}"
+          "obsidian:${lib.my.checkPath pkgs.rofi-obsidian "rofi-obsidian"}"
         ];
         matching = "fuzzy";
         sort = true;
diff --git a/home/scripts/default.nix b/home/scripts/default.nix
index da12c77..1cfb2e5 100644
--- a/home/scripts/default.nix
+++ b/home/scripts/default.nix
@@ -1,4 +1,9 @@
-{ pkgs, lib, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 
 let
   nixos-rebuild =
@@ -53,7 +58,10 @@ in
 
   getext = pkgs.writeScriptBin "ls | grep -E \"\.[a-zA-Z0-9]+$\" --only-matching  | sort | uniq";
 
-  rpaste = pkgs.writers.writeBashBin "rpaste" ''curl -F "file=@$1" http://rusty.ccnlc.eu/'';
+  rpaste = pkgs.writers.writeBashBin "rpaste" ''
+    export $(cat ${config.age.secrets.rustypaste.path} | xargs)
+    curl -F "file=@$1" -H "Authorization: $AUTH_TOKEN" http://rusty.ccnlc.eu/
+  '';
 
   gentest = nixos-rebuild "gentest" "test";
 
diff --git a/home/sway/default.nix b/home/sway/default.nix
index 85a4981..67d10a4 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -91,8 +91,8 @@
             "--locked XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
             "--locked XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
             "--locked XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
-            "Print" = "exec ${pkgs.custom.scripts.screenshot}/bin/screenshot";
-            "${mod}+u" = "exec ${pkgs.custom.scripts.screenshot}/bin/screenshot";
+            "Print" = "exec ${pkgs.scripts.screenshot}/bin/screenshot";
+            "${mod}+u" = "exec ${pkgs.scripts.screenshot}/bin/screenshot";
             "${mod}+Shift+u" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.swappy}/bin/swappy -f -";
 
             #: Workspace movement {{{
@@ -127,7 +127,7 @@
           { command = "${pkgs.kdeconnect}/bin/kdeconnect-indicator"; }
           { command = "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"; }
           {
-            command = "${pkgs.custom.scripts.set-background}/bin/set-background -f ${wallpaper}";
+            command = "${pkgs.scripts.set-background}/bin/set-background -f ${wallpaper}";
             always = true;
           }
           {
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index 4986fa5..fb8bf08 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -71,12 +71,12 @@
         ripgrep
         wl-clipboard
 
-        custom.scripts.nixedit
-        custom.scripts.set-background
-        custom.scripts.fishl
-        custom.scripts.rpaste
-        custom.scripts.genswitch
-        custom.scripts.gentest
+        scripts.nixedit
+        scripts.set-background
+        scripts.fishl
+        scripts.rpaste
+        scripts.genswitch
+        scripts.gentest
 
       ];
     };
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index 105dd16..fd72134 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -71,12 +71,12 @@
         swaybg
         wl-clipboard
 
-        custom.scripts.screenshot
-        custom.scripts.nixedit
-        custom.scripts.set-background
-        custom.scripts.rpaste
-        custom.scripts.genswitch
-        custom.scripts.gentest
+        scripts.screenshot
+        scripts.nixedit
+        scripts.set-background
+        scripts.rpaste
+        scripts.genswitch
+        scripts.gentest
       ];
     };
   };
diff --git a/modules/nix/overlays.nix b/modules/nix/overlays.nix
index 00ff991..2511bd1 100644
--- a/modules/nix/overlays.nix
+++ b/modules/nix/overlays.nix
@@ -1,3 +1,9 @@
+{
+  inputs,
+  config,
+  lib,
+  ...
+}:
 {
   nixpkgs.overlays = [
     # Add env vars to calibre so they may get propagated to a plugin that needs them
@@ -18,5 +24,16 @@
         youtubeSupport = false;
       };
     })
+
+    (final: prev: {
+      scripts = import ../../home/scripts {
+        inherit lib config;
+        pkgs = prev.pkgs;
+      };
+    })
+
+    (final: prev: {
+      rofi-obsidian = inputs.rofi-obsidian.outputs.packages.${prev.pkgs.system}.rofi-obsidian;
+    })
   ];
 }