2 files changed, 77 insertions, 34 deletions

diff --git a/user-profiles/zsh/default.nix b/user-profiles/zsh/default.nix
index daeb7e82..eb9f7aa9 100644
--- a/user-profiles/zsh/default.nix
+++ b/user-profiles/zsh/default.nix
@@ -1,38 +1,76 @@
 { userName, pkgs, customUtils, lib, config, ... }:
-let
-  dotDir = ".config/zsh";
-  p10kZsh = "${dotDir}/.p10k.zsh";
-  cfg = config.home-manager.users.${userName};
-in {
-  home-manager.users.${userName} = {
-    programs.zsh = {
-      inherit dotDir;
-      enable = true;
-      autocd = true;
-      enableCompletion = true;
-      
-      plugins = [
-        { name = "powerlevel10k";
-          file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
-          src = pkgs.zsh-powerlevel10k;
-        }
-      ];
-      initExtraFirst = ''
-        if [[ $TERM == "dumb" ]]; then
-          unsetopt zle
-          PS1='$ '
-          return
-        fi
-      '';
-      initExtraBeforeCompInit = ''
-        source "${cfg.home.homeDirectory}/${p10kZsh}"
-      '';
-      initExtra = lib.mkAfter ''
-        source ${./zshrc}
-        source "${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
-      '';
+{
+  config = {
+    nixpkgs.externalConfig.allowUnfreePackages = [
+      "zsh-abbr"
+    ];
+
+    home-manager.users.${userName} = let sysConfig = config; in { config, ... }: {
+      config = {
+        programs.zsh = {
+          dotDir = "${config.xdg.configHome}/zsh";
+          enable = true;
+          autocd = true;
+          enableCompletion = true;
+          enableVteIntegration = true;
+          history = {
+            append = true;
+            expireDuplicatesFirst = true;
+            extended = true;
+            findNoDups = true;
+          };
+          syntaxHighlighting.enable = true;
+          zsh-abbr = {
+            enable = true;
+            abbreviations = {
+              re = "systemctl restart";
+              ure = "systemctl --user restart";
+              st = "systemctl status";
+              ust = "systemctl --user status";
+            };
+            globalAbbreviations = {
+              "L" = "| less";
+              "S" = "&> /dev/null";
+              "G" = "| grep";
+              "B" = "&> /dev/null &";
+              "BB" = "&> /dev/null &!";
+              "J" = lib.mkIf config.programs.jq.enable "| jq '.'";
+            };
+          };
+
+          plugins = [
+            { name = "powerlevel10k";
+              file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
+              src = pkgs.zsh-powerlevel10k;
+            }
+          ];
+          initContent = lib.mkMerge [
+            (lib.mkBefore ''
+              if [[ $TERM == "dumb" ]]; then
+                unsetopt zle
+                PS1='$ '
+                return
+              fi
+            '')
+            (lib.mkOrder 550 ''
+              source "$HOME/${config.xdg.configFile."zsh/.p10k.zsh".target}"
+            '')
+            (lib.mkAfter ''
+              source ${./zshrc}
+            '')
+          ];
+        };
+
+        xdg.configFile."zsh/.p10k.zsh".source = ./p10k.zsh;
+      };
     };
 
-    home.file.${p10kZsh}.source = ./p10k.zsh;
+    programs.zsh.enable = true;
+    environment.pathsToLink = [ "/share/zsh" ];
+    environment.shellAliases = lib.mkOverride 90 {};
+
+    nixpkgs.externalConfig.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+      "zsh-abbr"
+    ];
   };
 }
diff --git a/user-profiles/zsh/zshrc b/user-profiles/zsh/zshrc
index a83a8069..af3aca64 100644
--- a/user-profiles/zsh/zshrc
+++ b/user-profiles/zsh/zshrc
@@ -24,7 +24,12 @@ setopt ignore_eof
 bindkey -e
 bindkey ';5C' emacs-forward-word
 bindkey ';5D' emacs-backward-word
+bindkey '^[[1;5C' emacs-forward-word
+bindkey '^[[1;5D' emacs-backward-word
+bindkey '^H' backward-kill-word
 
 autoload -Uz url-quote-magic bracketed-paste-magic
 zle -N self-insert url-quote-magic
-zle -N bracketed-paste bracketed-paste-magic
\ No newline at end of file
+zle -N bracketed-paste bracketed-paste-magic
+
+setopt extended_glob