2 files changed, 37 insertions, 6 deletions

diff --git a/programs/htop.nix b/programs/htop.nix
index a48b70c..fca3487 100644
--- a/programs/htop.nix
+++ b/programs/htop.nix
@@ -6,6 +6,21 @@
 {
   programs.htop = {
     enable = true;
-    settings.color_scheme = 1; # monochrome
+    settings = {
+      color_scheme = 1; # monochrome
+      show_program_path = 0;
+      fields = with config.lib.htop.fields; [
+        PID
+        M_SIZE
+        M_RESIDENT
+        M_SHARE
+        STATE
+        PERCENT_CPU
+        PERCENT_MEM
+        TIME
+        COMM
+      ];
+
+    };
   };
 }
diff --git a/programs/tmux.nix b/programs/tmux.nix
index e5c5aa1..11efa39 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -3,6 +3,20 @@
 , ...
 }:
 
+let
+  cmus-np = pkgs.writeScriptBin "cmus-np" ''
+    ${pkgs.cmus}/bin/cmus-remote -Q | awk '
+    /tag artist/ { $1=$2=""; artist = substr($0,3) }
+    /tag title/ { $1=$2=""; title = substr($0,3) }
+    END { printf "%s · %s\n", artist, title}
+    '
+  '';
+
+  cmus-status = pkgs.writeScriptBin "cmus-status" ''
+    ${pkgs.cmus}/bin/cmus-remote -Q | awk '/status/ { print $2 }'
+  '';
+
+in
 {
   programs.tmux = {
     enable = true;
@@ -74,14 +88,16 @@
       set -g  status-style "bg=colour0"
       set -ag status-style "fg=colour7"
 
-      set -g  status-right "#[fg=colour15]#(date +"%H%M") #[fg=colour8]hrs    "
-      set -ag status-right "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y")    "
-      set -ag status-right "#[fg=colour7]#(bat -q)#[fg=colour12]"
+      set status-right-length 70
+      set -g  status-right "#[fg=colour15]#(${cmus-np}/bin/cmus-np) #[fg=colour8]#(${cmus-status}/bin/cmus-status)    "
+      set -ag status-right "#[fg=colour15]#(date +"%H%M") #[fg=colour8]hrs    "
+      set -ag status-right "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y")"
 
       # status left
-      set -g  status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') "
-      set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')"
       set status-left-length 50
+      set -g  status-left "#[fg=colour7]#(bat -q)    "
+      set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') "
+      set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')"
     '';
   };
 }