diff --git a/modules/shell/zsh/default.nix b/modules/shell/zsh/default.nix index 1cfe44b..5506553 100644 --- a/modules/shell/zsh/default.nix +++ b/modules/shell/zsh/default.nix @@ -23,30 +23,30 @@ in { ignoreSpace = true; }; - # initExtra = let - # sources = with pkgs; [ - # "${zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh" - # # "${zsh-history}/share/zsh/init.zsh" - # "${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh" - # "${zsh-f-sy-h}/share/zsh/site-functions/F-Sy-H.plugin.zsh" - # "${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh" - # "${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh" - # "${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh" - # ]; - # - # source = map (source: "source ${source}") sources; - # - # plugins = concatStringsSep "\n" ([ - # "${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin" - # ] - # ++ source); - # in '' - # ${plugins} - # - # bindkey "^[[1;3C" forward-word - # bindkey "^[[1;3D" backward-word - # ''; - # + initExtra = let + sources = with pkgs; [ + "${zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh" + # "${zsh-history}/share/zsh/init.zsh" + "${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh" + "${zsh-f-sy-h}/share/zsh/site-functions/F-Sy-H.plugin.zsh" + "${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh" + "${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh" + "${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh" + ]; + + source = map (source: "source ${source}") sources; + + plugins = concatStringsSep "\n" ([ + "${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin" + ] + ++ source); + in '' + ${plugins} + + bindkey "^[[1;3C" forward-word + bindkey "^[[1;3D" backward-word + ''; + plugins = [ { name = "zsh-tmux"; @@ -55,7 +55,7 @@ in { owner = "laggardkernel"; repo = "zsh-tmux"; rev = "v1.1.0"; - sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1"; + sha256 = "sha256-BB9L84HjUnV1OUIp2U2lHYHEg5q4p/TgqLcsCvInkC8="; }; } ];