diff --git a/modules/features/zsh/default.nix b/modules/features/zsh/default.nix index 1b514d8..ab4b0a6 100644 --- a/modules/features/zsh/default.nix +++ b/modules/features/zsh/default.nix @@ -10,7 +10,7 @@ }: { nixpkgs.overlays = [ (final: prev: { - zsh = self.packages.${pkgs.stdenv.hostPlatform.system}.myZsh; + zsh = self.packages.${pkgs.stdenv.hostPlatform.system}.zsh; }) ]; programs.zsh = { @@ -30,11 +30,11 @@ ... }: { packages = { - myZsh = inputs.wrappers.wrappers.zsh.wrap { + zsh = inputs.wrappers.wrappers.zsh.wrap { inherit pkgs; runtimePkgs = [pkgs.carapace]; zshAliases = { - ls = lib.getExe pkgs.lsd; + ls = "${lib.getExe pkgs.lsd} -l"; cat = lib.getExe pkgs.bat; lg = lib.getExe pkgs.lazygit; devenv = lib.getExe pkgs.devenv; @@ -43,20 +43,20 @@ nsh = "nix-shell -p"; }; zshrc.content = '' - autoload -U compinit && compinit - export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional - zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m' - source <(${lib.getExe pkgs.carapace} _carapace) + autoload -U compinit && compinit + export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional + zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m' + source <(${lib.getExe pkgs.carapace} _carapace) zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' - setopt NO_CASE_GLOB + setopt NO_CASE_GLOB - export EDITOR=nvim + export EDITOR=nvim - eval "$(${lib.getExe pkgs.devenv} hook zsh)" - eval "$(${lib.getExe self.packages.${pkgs.host.stdenv.hostPlatform.system}.ohMyPosh} init zsh)" + eval "$(${lib.getExe pkgs.devenv} hook zsh)" + eval "$(${lib.getExe self.packages.${pkgs.host.stdenv.hostPlatform.system}.ohMyPosh} init zsh)" - ${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin + ${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin ''; }; ohMyPosh = inputs.wrappers.wrappers.oh-my-posh.wrap {