talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Make zsh-histdb use sqlite3 directly instead of depending on systemPackages.

Browse Source
This commit is contained in:
Tom Alexander 2025-01-18 12:49:29 -05:00
parent f524aa168a
commit c694c6ae4c
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/configuration/flake.lock generated
View File

@ -327,7 +327,7 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-TFks1dvPwAXKQeePh9jmxj06ZfXArH1pN9yXVQWeL6w=", "narHash": "sha256-5DWw7GnwVZ98HUp/UUJcyUmmy9Bh/mcQB8MQQ0t3ZRo=",
"path": "flakes/zsh-histdb", "path": "flakes/zsh-histdb",
"type": "path" "type": "path"
}, },

9
nix/configuration/flakes/zsh-histdb/package.nix
View File

@ -21,9 +21,16 @@ stdenv.mkDerivation {
sha256 = "sha256-vtG1poaRVbfb/wKPChk1WpPgDq+7udLqLfYfLqap4Vg="; sha256 = "sha256-vtG1poaRVbfb/wKPChk1WpPgDq+7udLqLfYfLqap4Vg=";
}; };
buildInputs = [ sqlite ]; buildInputs = [ sqlite ];
phases = [ "installPhase" ]; phases = [
"installPhase"
];
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/share/zsh/plugins/zsh-histdb mkdir -p $out/share/zsh/plugins/zsh-histdb
cp -r $src/histdb-* $src/*.zsh $src/db_migrations $out/share/zsh/plugins/zsh-histdb/ cp -r $src/histdb-* $src/*.zsh $src/db_migrations $out/share/zsh/plugins/zsh-histdb/
runHook postInstall
'';
postInstall = ''
substituteInPlace $out/share/zsh/plugins/zsh-histdb/sqlite-history.zsh $out/share/zsh/plugins/zsh-histdb/histdb-merge $out/share/zsh/plugins/zsh-histdb/histdb-migrate --replace-fail "sqlite3" "${sqlite}/bin/sqlite3"
''; '';
} }

1
nix/configuration/roles/zsh/default.nix
View File

@ -64,7 +64,6 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zsh zsh
sqlite # TODO: can this be pulled into zsh-histdb automatically?
]; ];
users.users.talexander.shell = pkgs.zsh; users.users.talexander.shell = pkgs.zsh;