diff --git a/dump.rdb b/dump.rdb index 7a274db..390bec9 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/tests/test_graphql/test_nix_collect_garbage.py b/tests/test_graphql/test_nix_collect_garbage.py index cdd2a70..151327c 100644 --- a/tests/test_graphql/test_nix_collect_garbage.py +++ b/tests/test_graphql/test_nix_collect_garbage.py @@ -10,15 +10,15 @@ from selfprivacy_api.graphql import schema # from selfprivacy_api.graphql.schema import Subscription -from selfprivacy_api.jobs.nix_collect_garbage import ( - get_dead_packages, - nix_collect_garbage, - parse_line, - CLEAR_COMPLETED, - COMPLETED_WITH_ERROR, - stream_process, - RESULT_WAS_NOT_FOUND_ERROR, -) +# from selfprivacy_api.jobs.nix_collect_garbage import ( +# get_dead_packages, +# nix_collect_garbage, +# parse_line, +# CLEAR_COMPLETED, +# COMPLETED_WITH_ERROR, +# stream_process, +# RESULT_WAS_NOT_FOUND_ERROR, +# ) pytest_plugins = ("pytest_asyncio",) diff --git a/zsh-config.nix b/zsh-config.nix new file mode 100644 index 0000000..8d00e92 --- /dev/null +++ b/zsh-config.nix @@ -0,0 +1,32 @@ +{ pkgs }: + +let + zshWithPlugins = pkgs.zsh.overrideAttrs (oldAttrs: { + postInstall = oldAttrs.postInstall + '' + # Create symlinks for plugins in $out/share + mkdir -p $out/share/zsh/plugins + ln -s ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions $out/share/zsh/plugins/autosuggestions + ln -s ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting $out/share/zsh/plugins/syntax-highlighting + ''; + }); +in +{ + shell = zshWithPlugins; + shellSetup = '' + # create .zshrc file if it doesnt exist + if [ ! -f ~/.zshrc ]; then + echo "Creating a default .zshrc file..." + touch ~/.zshrc + fi + + # add zsh-autosuggestions and zsh-syntax-highlighting in zshrc + if ! grep -q "source .*zsh-autosuggestions.zsh" ~/.zshrc; then + echo "Adding zsh-autosuggestions plugin to .zshrc..." + echo "source ${zshWithPlugins}/share/zsh/plugins/autosuggestions/zsh-autosuggestions.zsh" >> ~/.zshrc + fi + if ! grep -q "source .*zsh-syntax-highlighting.zsh" ~/.zshrc; then + echo "Adding zsh-syntax-highlighting plugin to .zshrc..." + echo "source ${zshWithPlugins}/share/zsh/plugins/syntax-highlighting/zsh-syntax-highlighting.zsh" >> ~/.zshrc + fi + ''; +}