chore: refactor

home-manager/sajenim/features/cli/default.nix

@@ -1,7 +1,15 @@
-{...}: {
+{pkgs, ...}: {
   imports = [
+    ./git.nix
     ./irc.nix
     ./mpd.nix
+    ./nvim.nix
     ./remarkable.nix
+    ./ssh.nix
+    ./zsh.nix
+  ];
+
+  home.packages = with pkgs; [
+    pulsemixer
   ];
 }

home-manager/sajenim/features/cli/mpd.nix

@@ -1,4 +1,12 @@
 {pkgs, ...}: {
+
+  # Install some applications for managing mpd 
+  home.packages = with pkgs; [
+    mpc-cli
+    ncmpcpp
+  ];
+
+  # Setup our mpd client service
   services.mpd = {
     enable = true;
     musicDirectory = "nfs://viridian.home.arpa/srv/multimedia/library/music";
@@ -17,9 +25,4 @@
       }
     '';
   };
-
-  services.mpd-discord-rpc = {
-    enable = true;
-    package = pkgs.unstable.mpd-discord-rpc;
-  };
 }