From 43890000f18f8f3f7d89405a6a5ed912460e9992 Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Mon, 23 Feb 2026 18:21:29 +0000
Subject: [PATCH] Failed attempt to fix/formalize repo

---
 home-manager/worklaptop/packages.nix          |  2 +-
 home-manager/worklaptop/packages/default.nix  |  6 +++++
 home-manager/worklaptop/packages/my_pkgs.nix  |  6 -----
 .../{python.nix => pkgs/python/default.nix}   |  0
 .../rbw-autofill/default.nix}                 |  2 +-
 .../rbw-autofill/script.sh}                   |  0
 .../vivaldi-wayland/default.nix}              |  0
 .../pkgs/walker-obsidian-search/default.nix   | 23 +++++++++++++++++++
 .../walker-obsidian-search/script.clj}        |  0
 .../packages/walker_obsidian_search.nix       |  6 -----
 home-manager/worklaptop/programs.nix          |  2 +-
 11 files changed, 32 insertions(+), 15 deletions(-)
 create mode 100644 home-manager/worklaptop/packages/default.nix
 delete mode 100644 home-manager/worklaptop/packages/my_pkgs.nix
 rename home-manager/worklaptop/packages/{python.nix => pkgs/python/default.nix} (100%)
 rename home-manager/worklaptop/packages/{rbw_autofill.nix => pkgs/rbw-autofill/default.nix} (72%)
 rename home-manager/worklaptop/packages/{rbw_autofill.sh => pkgs/rbw-autofill/script.sh} (100%)
 rename home-manager/worklaptop/packages/{vivaldi_wayland.nix => pkgs/vivaldi-wayland/default.nix} (100%)
 create mode 100644 home-manager/worklaptop/packages/pkgs/walker-obsidian-search/default.nix
 rename home-manager/worklaptop/packages/{walker_obsidian_search.clj => pkgs/walker-obsidian-search/script.clj} (100%)
 delete mode 100644 home-manager/worklaptop/packages/walker_obsidian_search.nix

diff --git a/home-manager/worklaptop/packages.nix b/home-manager/worklaptop/packages.nix
index 31907cd..716106d 100644
--- a/home-manager/worklaptop/packages.nix
+++ b/home-manager/worklaptop/packages.nix
@@ -11,7 +11,7 @@
 in {
   home.packages = [
     pkgs.bitwarden-desktop
-    unstablePkgs.babashka
+    pkgs.babashka
     pkgs.bat-extras.batman
     pkgs.bat-extras.batdiff
     pkgs.bat-extras.batgrep
diff --git a/home-manager/worklaptop/packages/default.nix b/home-manager/worklaptop/packages/default.nix
new file mode 100644
index 0000000..8503722
--- /dev/null
+++ b/home-manager/worklaptop/packages/default.nix
@@ -0,0 +1,6 @@
+{pkgs ? import <nixpkgs> {}}: {
+  python-env = pkgs.callPackage ./pkgs/python-env/default.nix {};
+  rbw-autofill = pkgs.callPackage ./pkgs/rbw-autofill/default.nix {};
+  vivaldi-wayland = pkgs.callPackage ./pkgs/vivaldi-wayland/default.nix {};
+  walker-obsidian-search = pkgs.callPackage ./pkgs/walker-obsidian-search/default.nix {};
+}
diff --git a/home-manager/worklaptop/packages/my_pkgs.nix b/home-manager/worklaptop/packages/my_pkgs.nix
deleted file mode 100644
index 4950ae2..0000000
--- a/home-manager/worklaptop/packages/my_pkgs.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{pkgs}: {
-  python = pkgs.callPackage ./python.nix {};
-  rbw-autofill = pkgs.callPackage ./rbw_autofill.nix {};
-  vivaldi-wayland = pkgs.callPackage ./vivaldi_wayland.nix {};
-  walker-obsidian-search = pkgs.callPackage ./walker_obsidian_search.nix {};
-}
diff --git a/home-manager/worklaptop/packages/python.nix b/home-manager/worklaptop/packages/pkgs/python/default.nix
similarity index 100%
rename from home-manager/worklaptop/packages/python.nix
rename to home-manager/worklaptop/packages/pkgs/python/default.nix
diff --git a/home-manager/worklaptop/packages/rbw_autofill.nix b/home-manager/worklaptop/packages/pkgs/rbw-autofill/default.nix
similarity index 72%
rename from home-manager/worklaptop/packages/rbw_autofill.nix
rename to home-manager/worklaptop/packages/pkgs/rbw-autofill/default.nix
index d25be98..0671711 100644
--- a/home-manager/worklaptop/packages/rbw_autofill.nix
+++ b/home-manager/worklaptop/packages/pkgs/rbw-autofill/default.nix
@@ -2,5 +2,5 @@
 pkgs.writeShellApplication {
   name = "rbw-autofill";
   runtimeInputs = [pkgs.bash pkgs.libsecret pkgs.zenity];
-  text = builtins.readFile ./rbw_autofill.sh;
+  text = builtins.readFile ./script.sh;
 }
diff --git a/home-manager/worklaptop/packages/rbw_autofill.sh b/home-manager/worklaptop/packages/pkgs/rbw-autofill/script.sh
similarity index 100%
rename from home-manager/worklaptop/packages/rbw_autofill.sh
rename to home-manager/worklaptop/packages/pkgs/rbw-autofill/script.sh
diff --git a/home-manager/worklaptop/packages/vivaldi_wayland.nix b/home-manager/worklaptop/packages/pkgs/vivaldi-wayland/default.nix
similarity index 100%
rename from home-manager/worklaptop/packages/vivaldi_wayland.nix
rename to home-manager/worklaptop/packages/pkgs/vivaldi-wayland/default.nix
diff --git a/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/default.nix b/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/default.nix
new file mode 100644
index 0000000..1040f0d
--- /dev/null
+++ b/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  stdenv,
+  babashka,
+  ripgrep,
+  walker,
+  xdg-utils,
+}:
+stdenv.mkDerivation {
+  pname = "walker-obsidian-search";
+  version = "0.1.0";
+  src = ./.;
+  buildInputs = [babashka ripgrep walker xdg-utils];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp script.clj $out/bin/walker-obsidian-search
+    substituteInPlace $out/bin/walker-obsidian-search \
+      --replace '"rg"' '"${ripgrep}/bin/rg"' \
+      --replace '"walker' '"${walker}/bin/walker' \
+      --replace '"xdg-open"' '"${xdg-utils}/bin/xdg-open"'
+    chmod +x $out/bin/walker-obsidian-search
+  '';
+}
diff --git a/home-manager/worklaptop/packages/walker_obsidian_search.clj b/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/script.clj
similarity index 100%
rename from home-manager/worklaptop/packages/walker_obsidian_search.clj
rename to home-manager/worklaptop/packages/pkgs/walker-obsidian-search/script.clj
diff --git a/home-manager/worklaptop/packages/walker_obsidian_search.nix b/home-manager/worklaptop/packages/walker_obsidian_search.nix
deleted file mode 100644
index 2795370..0000000
--- a/home-manager/worklaptop/packages/walker_obsidian_search.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{pkgs}:
-pkgs.writeShellApplication {
-  name = "walker-obsidian-search";
-  runtimeInputs = [pkgs.babashka pkgs.ripgrep];
-  text = builtins.readFile ./walker_obsidian_search.clj;
-}
diff --git a/home-manager/worklaptop/programs.nix b/home-manager/worklaptop/programs.nix
index c0f9805..da90226 100644
--- a/home-manager/worklaptop/programs.nix
+++ b/home-manager/worklaptop/programs.nix
@@ -7,7 +7,7 @@
   unstablePkgs,
   ...
 }: let
-  myPkgs = import ./packages/my_pkgs.nix {inherit pkgs;};
+  myPkgs = import ./packages/default.nix {inherit pkgs;};
 in {
   programs = {
     nix-your-shell = {