Move zsh config to better location, disable polkit, add back playerctl and mpris in mpc's place

modules/home/programs/gui/mpv/default.nix

@@ -8,7 +8,7 @@
       thumbnail
     ];
     config = {
-      volume = 55;
+      volume = 60;
       loop-playlist = "inf";
       osc = "no";
     };

modules/home/programs/misc/avtools/default.nix

@@ -3,6 +3,7 @@
   home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     ffmpeg
     ffmpegthumbnailer
+    playerctl
     puddletag
     pulsemixer
     spotdl

modules/home/programs/terminal/ncmpcpp/default.nix

@@ -1,22 +1,16 @@
 { config, lib, pkgs, ... }:
 {
-  config = lib.mkIf config.home.desktop.enable {
-    home.packages = with pkgs; [ mpc-cli ];
-
-    programs.ncmpcpp = {
-      enable = true;
-      settings = {
-        browser_sort_mode = "name";
-        user_interface = "alternative";
-      };
-      bindings = [
-        { key = "h"; command = "volume_down"; }
-        { key = "j"; command = "scroll_down"; }
-        { key = "k"; command = "scroll_up"; }
-        { key = "l"; command = "volume_up"; }
-      ];
+  programs.ncmpcpp = {
+    enable = config.services.mpd.enable;
+    settings = {
+      browser_sort_mode = "name";
+      user_interface = "alternative";
     };
-
-    services.mpd-discord-rpc.enable = true;
+    bindings = [
+      { key = "h"; command = "volume_down"; }
+      { key = "j"; command = "scroll_down"; }
+      { key = "k"; command = "scroll_up"; }
+      { key = "l"; command = "volume_up"; }
+    ];
   };
 }

modules/home/programs/terminal/zsh/default.nix

@@ -2,8 +2,10 @@
 {
   programs.zsh = {
     enable = true;
+    dotDir = ".config/zsh";
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
+    historySubstringSearch.enable = true;
     oh-my-zsh = {
       enable = true;
       theme = "agnoster";
@@ -16,11 +18,11 @@
       append = true;
       ignoreAllDups = true;
       ignoreSpace = true;
+      path = "$ZDOTDIR/.zsh_history";
     };
     initExtra = ''
       pfetch
       source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
-      setopt RM_STAR_WAIT
     '';
   };
 }