diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix index b63883b..f7062f6 100644 --- a/modules/programs/zsh.nix +++ b/modules/programs/zsh.nix @@ -24,51 +24,14 @@ in { flake.modules = { nixos.zsh = { pkgs, ... }: { - users.users."${username}".shell = pkgs.zsh; + users.users."${username}".shell = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh; programs.zsh.enable = true; - # Already being imported by the john.nix module - # home-manager.sharedModules = [ - # inputs.self.modules.homeManager.zsh - # ]; }; homeManager.zsh = { pkgs, config, ... }: { programs.zsh = { enable = true; package = inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh; - enableCompletion = true; - autosuggestion.enable = true; - # syntaxHighlighting.enable = true; - initContent = '' - HOST=$(hostname -s) - ${homeEndKeyBindings} - ''; - dotDir = "${config.xdg.configHome}/zsh"; - history = { - append = true; - ignoreAllDups = true; - ignorePatterns = [ - "history" - "ls" - "eza" - "clear" - ]; - save = historySize; - size = historySize; - share = true; - }; - oh-my-zsh = { - enable = true; - # theme = "risto"; - theme = "agnoster"; - plugins = [ - "sudo" - "dotenv" - "git" - "ssh" - "ssh-agent" - ]; - }; }; }; };