diff --git a/bookwyrm.nix b/bookwyrm.nix index 650a33b..dfec431 100644 --- a/bookwyrm.nix +++ b/bookwyrm.nix @@ -5,7 +5,6 @@ } : with builtins ; -with pkgs ; with pkgs . kernelmaft . python ; with pkgs . python311Packages ; with stdenv ; @@ -100,7 +99,7 @@ mkDerivation { # Executables cat <<- EOF > $out/bin/bookwyrm - #!${bash}/bin/sh + #!/run/current-system/sw/bin/sh export PYTHONPATH="$out/lib/python3.11/site-packages" diff --git a/nixos-module.nix b/nixos-module.nix index 88e7329..b90ef12 100644 --- a/nixos-module.nix +++ b/nixos-module.nix @@ -1,12 +1,11 @@ { pkgs , ... } : -with pkgs ; -with pkgs . kernelmaft ; - { nixpkgs = { overlays = [ ( self : super : + with pkgs ; + { kernelmaft = { @@ -55,13 +54,13 @@ with pkgs . kernelmaft ; systemd = { units = { - "bookwyrm.service" = { + bookwyrm = { text = '' [Unit] After=network.target [Service] - ExecStart=${bookwyrm}/bin/bookwyrm + ExecStart=$out/bin/bookwyrm WorkingDirectory=/var/lib/bookwyrm '' ; } ;