notgne2/nixfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

strip out broken music stuff

Browse Source
This commit is contained in:
notgne2 2022-12-10 02:21:01 -07:00
parent b41922a4d4
commit 63d50045d7
Signed by: notgne2
SSH Key Fingerprint: SHA256:qlFCAimT/PvNIG3u+aYT9pIqFCWgu6sNsWjpV1vHLIE
2 changed files with 1 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -26,10 +26,6 @@
url = "gitlab:rycee/nur-expressions";
flake = false;
};
mudl = {
url = "git+ssh://git@git.wizbos.club/notgne2/mudl.git";
inputs.nixpkgs.follows = "nixpkgs";
};
firenvim = {
url = "github:glacambre/firenvim";
flake = false;

99
home-manager/modules/ezpcusr.nix
View File

@ -285,59 +285,6 @@ in {
"XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
"${modifier}+backslash" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
"${modifier}+Ctrl+Shift+m" = let
ripMusicAdvanced = pkgs.writeShellScript "rip-music-advanced.sh" ''
CURRENT=$(${pkgs.mpc_cli}/bin/mpc -f '%file%' current)
URLIFIED=$(${pkgs.gnused}/bin/sed 's/youtube:video:/https:\/\/youtube.com\/watch?v=/'<<<$CURRENT)
PARAMS=$(${config.programs.rofi.package}/bin/rofi -dmenu)
echo y | ${inputs.mudl.defaultPackage.${pkgs.system}}/bin/mudl "$URLIFIED" "$PARAMS"
'';
in "exec ${ripMusicAdvanced}";
"${modifier}+Ctrl+m" = let
ripMusic = pkgs.writeShellScript "rip-music.sh" ''
CURRENT=$(${pkgs.mpc_cli}/bin/mpc -f '%file%' current)
URLIFIED=$(${pkgs.gnused}/bin/sed 's/youtube:video:/https:\/\/youtube.com\/watch?v=/'<<<$CURRENT)
DL_OUT=$(echo y | ${inputs.mudl.defaultPackage.${pkgs.system}}/bin/mudl "$URLIFIED")
if echo "$DL_OUT" | ${pkgs.gnugrep}/bin/grep -qE 'Album: $'; then
${pkgs.libnotify}/bin/notify-send mudl 'Album name required'
ALBUM=$(${config.programs.rofi.package}/bin/rofi -dmenu)
echo y | ${inputs.mudl.defaultPackage.${pkgs.system}}/bin/mudl "$URLIFIED" "$ALBUM"
fi
'';
in "exec ${ripMusic}";
"${modifier}+m" = let
musicRofi = pkgs.writeShellScript "music-rofi" ''
SONGN=$(${pkgs.mpc_cli}/bin/mpc -f "%position% - %artist% - %album% - %title%" playlist | ${config.programs.rofi.package}/bin/rofi -dmenu -i | ${pkgs.coreutils}/bin/cut -d " " -f 1)
[ ! -z "$SONGN" ] && ${pkgs.mpc_cli}/bin/mpc play "$SONGN"
'';
in "exec ${musicRofi}";
"${modifier}+k" = "exec ${pkgs.mpc_cli}/bin/mpc clear";
"${config.wayland.windowManager.sway.config.modifier}+Shift+k" = lib.mkForce "exec ${pkgs.mpc_cli}/bin/mpc ls \"Local media/Tracks\" | ${pkgs.mpc_cli}/bin/mpc add";
"${config.wayland.windowManager.sway.config.modifier}+Shift+m" = let
mopidySearch = pkgs.writeShellScript "mopidy-search.sh" ''
QUERY=$(${config.programs.rofi.package}/bin/rofi -dmenu)
[ -z "$QUERY" ] && exit
RESULTS=$(${pkgs.mpc_cli}/bin/mpc search -f '%file% / %artist% - %title%' any "$QUERY")
USERLIST=$(echo "$RESULTS" | ${pkgs.gawk}/bin/awk -F' / ' '{print $2}')
CHOSEN=$(echo "$USERLIST" | ${config.programs.rofi.package}/bin/rofi -dmenu -i)
[ -z "$CHOSEN" ] && exit
NTH=$(echo "$USERLIST" | ${pkgs.gnugrep}/bin/grep -n "^$CHOSEN$" | cut -d':' -f1)
LINE=$(echo "$RESULTS" | ${pkgs.coreutils}/bin/tail "-n+$NTH" | ${pkgs.coreutils}/bin/head -1)
NAME=$(echo "$LINE" | ${pkgs.gawk}/bin/awk -F' / ' '{print $1}')
${pkgs.mpc_cli}/bin/mpc add "$NAME"
PLAYLIST=$(${pkgs.mpc_cli}/bin/mpc -f "%position% / %file%" playlist)
PLAYLIST_ENTRY=$(echo "$PLAYLIST" | ${pkgs.gnugrep}/bin/grep -E "^.* / $NAME$" | head -1)
PLAYLIST_ENTRY_POSITION=$(echo "$PLAYLIST_ENTRY" | ${pkgs.gawk}/bin/awk -F' / ' '{print $1}')
${pkgs.mpc_cli}/bin/mpc play "$PLAYLIST_ENTRY_POSITION"
'';
in "exec ${mopidySearch}";
"${modifier}+p" = "exec bash ${inputs.bwmenu}/bwmenu";
"${modifier}+e" = "exec bash ${inputs.bemoji}/bemoji -t";
@ -481,7 +428,7 @@ in {
}
#custom-spacer {
font-size: 20px;
font-size: 15px;
color: #${config.ezcolors.base16.base00};
font-weight: bold;
}
@ -577,45 +524,6 @@ in {
services.mpris-proxy.enable = lib.mkDefault true;
services.mopidy = {
enable = lib.mkDefault true;
extensionPackages = with pkgs; [
mopidy-youtube
(mopidy-local.overrideAttrs (oldAttrs: {
patches = [
# Fix tests with newer Mopidy versions >=3.4.0 -- mopidy/mopidy-local#69
(fetchpatch {
name = "update-tests-for-mopidy-3.4.0.patch";
url = "https://github.com/mopidy/mopidy-local/commit/f2c198f8eb253f62100afc58f652e73a76d5a090.patch";
hash = "sha256-jrlZc/pd00S5q9nOfV1OXu+uP/SvH+Xbi7U52aZajj4=";
})
];
}))
mopidy-mpd
];
settings = {
youtube = {
enabled = lib.mkDefault true;
allow_cache = lib.mkDefault true;
};
file = {
media_dirs = lib.mkDefault "${config.home.homeDirectory}/Music";
};
local = {
enabled = lib.mkDefault true;
media_dir = lib.mkDefault "${config.home.homeDirectory}/Music";
};
mpd = {
enabled = lib.mkDefault true;
# hostname = lib.mkDefault "::";
# command_blacklist = lib.mkDefault "";
};
};
};
services.playerctld.enable = lib.mkDefault true;
gtk = {
@ -675,7 +583,6 @@ in {
# ezpcusr stuff
ezDrv
inputs.mudl.defaultPackage.${pkgs.system}
# programs
pavucontrol
@ -686,10 +593,6 @@ in {
yt-dlp
maim
slop
# CLI tools that integrate with ezpcusr things
mpc_cli
playerctl
xorg.xhost
];