diff --git a/home/default.nix b/home/default.nix
index 7683b2c..0b4b985 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -41,8 +41,11 @@ in {
     ./programs/neovim/.
     ./programs/git.nix
     ./programs/lf/.
+    ./programs/shell.nix
   ];
 
+  roles.mpd.enable = true;
+
   programs.home-manager.enable = true;
 
   home.homeDirectory = "/home/${config.home.username}";
@@ -68,17 +71,6 @@ in {
     ansible
   ];
 
-  programs.starship.enable = true;
-  programs.zsh = {
-    enable = true;
-    dotDir = ".config/zsh";
-    history = {
-      path = "${config.xdg.dataHome}/zsh/zsh_history";
-    };
-    defaultKeymap = "vicmd";
-    autocd = true;
-  };
-
   services.udiskie = {
     enable = true;
     notify = true;
diff --git a/home/modules/mpd.nix b/home/modules/mpd.nix
index a634904..3586214 100644
--- a/home/modules/mpd.nix
+++ b/home/modules/mpd.nix
@@ -6,6 +6,8 @@
 }:
 with lib; let
   cfg = config.roles.mpd;
+  terminal = config.programs.terminal;
+  termcmd = "${terminal}/bin/${terminal.pname}";
 in {
   options.roles.mpd = {
     enable = mkEnableOption "setup mpd client";
@@ -48,6 +50,16 @@ in {
       mpd.host = cfg.host;
     };
     programs.waybar.settings.mainBar.mpd.server = cfg.host;
+    programs.scripts = [
+      {
+        name = "ncmpcpp";
+        text = ''
+          ${termcmd} -e ${pkgs.ncmpcpp}/bin/ncmpcpp
+        '';
+        hotkeys = [{key = "M";}];
+        install = false;
+      }
+    ];
     systemd.user.services = {
       snapclient = {
         Unit = {
diff --git a/home/programs/scripts.nix b/home/programs/scripts.nix
index 73f6cbf..165b3fc 100644
--- a/home/programs/scripts.nix
+++ b/home/programs/scripts.nix
@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }: let
   terminal = config.programs.terminal;
@@ -141,18 +140,6 @@ in {
         }
       ];
     }
-    (lib.mkIf config.roles.mpd.enable {
-      name = "ncmpcpp";
-      text = ''
-        ${termcmd} -e ncmpcpp
-      '';
-      hotkeys = [
-        {
-          key = "M";
-        }
-      ];
-      install = false;
-    })
     {
       name = "menu";
       text = ''
diff --git a/home/programs/shell.nix b/home/programs/shell.nix
new file mode 100644
index 0000000..85993d7
--- /dev/null
+++ b/home/programs/shell.nix
@@ -0,0 +1,29 @@
+{pkgs, config, ...}: {
+
+  programs.starship.enable = true;
+  programs.zsh = {
+    enable = true;
+    dotDir = ".config/zsh";
+    history = {
+      path = "${config.xdg.dataHome}/zsh/zsh_history";
+    };
+    defaultKeymap = "vicmd";
+    autocd = true;
+    enableAutosuggestions = true;
+    completionInit = ''
+      autoload -U compinit && compinit
+      zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+    '';
+    historySubstringSearch = {
+      enable = true;
+      searchUpKey = "^[[5~";
+      searchDownKey = "^[[6~";
+    };
+    syntaxHighlighting.enable = true;
+  };
+  home.shellAliases = {
+    rm = "${pkgs.trash-cli}/bin/trash-put";
+  };
+
+
+}
diff --git a/nixos/default.nix b/nixos/default.nix
index c9de11f..3236e9e 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -132,7 +132,7 @@ user: {
     VISUAL = "nvim";
     TERMINAL = "foot";
   };
-  environment.pathsToLink = [ "/share/zsh" ];
+  environment.pathsToLink = ["/share/zsh"];
 
   services.gvfs.enable = true;
   environment.systemPackages = with pkgs; [