Move music-related i3 bindings to music.nix + sort albums by date added

minijackson · Apr 15, 2018 · 6f798cd · 6f798cd
1 parent 68a80b7
commit 6f798cd
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 28 deletions.
diff --git a/home.nix b/home.nix
@@ -580,33 +580,6 @@ in
             "XF86MonBrightnessUp"   = "exec --no-startup-id light -A 5";
             "XF86MonBrightnessDown" = "exec --no-startup-id light -U 5";
 
-            "KP_Left"  = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc prev";
-            "KP_Begin" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc toggle";
-            "KP_Right" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc next";
-            "KP_Up"    = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc stop";
-
-            "KP_Home" = let
-              choose_album = pkgs.substituteAll {
-                src = ./scripts/choose_album.sh;
-                isExecutable = true;
-
-                inherit (pkgs) mpc_cli coreutils rofi;
-              };
-            in "exec --no-startup-id ${choose_album}";
-
-            "KP_Prior" = let
-              choose_artist = pkgs.substituteAll {
-                src = ./scripts/choose_artist.sh;
-                isExecutable = true;
-
-                inherit (pkgs) mpc_cli rofi;
-              };
-            in "exec --no-startup-id ${choose_artist}";
-
-            "XF86AudioPlay" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc toggle";
-            "XF86AudioNext" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc next";
-            "XF86AudioPrev" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc prev";
-
             "Mod4+m" = "exec --no-startup-id ${config.services.screen-locker.lockCmd}";
           };
 

diff --git a/scripts/choose_album.sh b/scripts/choose_album.sh
@@ -5,7 +5,10 @@ IFS=$'\n\t'
 
 separator="―"
 
-result="$(@mpc_cli@/bin/mpc --format="%albumartist% $separator %album%" listall | @coreutils@/bin/uniq | @rofi@/bin/rofi -dmenu -fullscreen -columns 2 -i)"
+library_file="${XDG_CONFIG_HOME:-$HOME/.config}/beets/library.db"
+
+#result="$(@mpc_cli@/bin/mpc --format="%albumartist% $separator %album%" listall | @coreutils@/bin/uniq | @rofi@/bin/rofi -dmenu -fullscreen -columns 2 -i)"
+result="$(@sqlite@/bin/sqlite3 "$library_file" "SELECT albumartist || ' $separator ' || album FROM albums ORDER BY added DESC;" | @rofi@/bin/rofi -dmenu -fullscreen -columns 2 -i)"
 
 IFS="$separator" read -ra artistalbum <<< "$result"
 

diff --git a/usecases/music.nix b/usecases/music.nix
@@ -41,6 +41,36 @@
 
     xdg.configFile."ncmpcpp/config".source = ../dotfiles/ncmpcpp;
 
+    xsession.windowManager.i3.config.keybindings = {
+      "KP_Left"  = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc prev";
+      "KP_Begin" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc toggle";
+      "KP_Right" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc next";
+      "KP_Up"    = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc stop";
+
+      "XF86AudioPlay" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc toggle";
+      "XF86AudioNext" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc next";
+      "XF86AudioPrev" = "exec --no-startup-id ${pkgs.mpc_cli}/bin/mpc prev";
+
+      "KP_Home" = let
+        choose_album = pkgs.substituteAll {
+          src = ../scripts/choose_album.sh;
+          isExecutable = true;
+
+          inherit (pkgs) sqlite mpc_cli rofi;
+        };
+      in "exec --no-startup-id ${choose_album}";
+
+      "KP_Prior" = let
+        choose_artist = pkgs.substituteAll {
+          src = ../scripts/choose_artist.sh;
+          isExecutable = true;
+
+          inherit (pkgs) mpc_cli rofi;
+        };
+      in "exec --no-startup-id ${choose_artist}";
+
+    };
+
   };
 
   users.extraUsers.minijackson.packages = [