Failed attempt to fix/formalize repo

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

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 {};
+}

home-manager/worklaptop/packages/my_pkgs.nix

@@ -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 {};
-}

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;
 }

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
+  '';
+}

home-manager/worklaptop/packages/walker_obsidian_search.nix

@@ -1,6 +0,0 @@
-{pkgs}:
-pkgs.writeShellApplication {
-  name = "walker-obsidian-search";
-  runtimeInputs = [pkgs.babashka pkgs.ripgrep];
-  text = builtins.readFile ./walker_obsidian_search.clj;
-}

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 = {