System Gen84 @ 2025-07-24-02:00:39 by jonas@monolith
This commit is contained in:
parent
234a70cd78
commit
b31e767134
@ -209,6 +209,7 @@
|
|||||||
|
|
||||||
devShells.${system} = {
|
devShells.${system} = {
|
||||||
transcode-davinci-resolve = (import ./pkgs/transcode-davinci-resolve/shell.nix) {pkgs = nixpkgs.legacyPackages.${system};};
|
transcode-davinci-resolve = (import ./pkgs/transcode-davinci-resolve/shell.nix) {pkgs = nixpkgs.legacyPackages.${system};};
|
||||||
|
spotify-shortcuts = (import ./pkgs/spotify-shortcuts/shell.nix) {pkgs = nixpkgs.legacyPackages.${system};};
|
||||||
};
|
};
|
||||||
|
|
||||||
overlays.default = import ./pkgs;
|
overlays.default = import ./pkgs;
|
||||||
|
|||||||
@ -3,7 +3,6 @@
|
|||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
inputs,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
@ -18,6 +17,14 @@
|
|||||||
sopsFile = ../../secrets/monolith/wg.yaml;
|
sopsFile = ../../secrets/monolith/wg.yaml;
|
||||||
key = "privateKey";
|
key = "privateKey";
|
||||||
};
|
};
|
||||||
|
sops.secrets.spotify-shortcuts-clientId = {
|
||||||
|
sopsFile = ../../secrets/spotify-shortcuts.yaml;
|
||||||
|
key = "clientId";
|
||||||
|
};
|
||||||
|
sops.secrets.spotify-shortcuts-clientSecret = {
|
||||||
|
sopsFile = ../../secrets/spotify-shortcuts.yaml;
|
||||||
|
key = "clientSecret";
|
||||||
|
};
|
||||||
|
|
||||||
# Users
|
# Users
|
||||||
users.users.jonas = {
|
users.users.jonas = {
|
||||||
@ -70,6 +77,11 @@
|
|||||||
video-editing-light = true;
|
video-editing-light = true;
|
||||||
video-editing-heavy = true;
|
video-editing-heavy = true;
|
||||||
};
|
};
|
||||||
|
hive.programs.spotify-shortcuts = {
|
||||||
|
enable = true;
|
||||||
|
clientIdFile = config.sops.secrets.spotify-shortcuts-clientId.path;
|
||||||
|
clientSecretFile = config.sops.secrets.spotify-shortcuts-clientSecret.path;
|
||||||
|
};
|
||||||
|
|
||||||
# system packages
|
# system packages
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|||||||
@ -24,6 +24,7 @@
|
|||||||
./networking/wireguard
|
./networking/wireguard
|
||||||
./programs/creative.nix
|
./programs/creative.nix
|
||||||
./programs/games.nix
|
./programs/games.nix
|
||||||
|
./programs/spotify-shortcuts.nix
|
||||||
./services/borg-server.nix
|
./services/borg-server.nix
|
||||||
./services/kdeconnect.nix
|
./services/kdeconnect.nix
|
||||||
./services/nextcloud-instance.nix
|
./services/nextcloud-instance.nix
|
||||||
|
|||||||
28
modules/programs/spotify-shortcuts.nix
Normal file
28
modules/programs/spotify-shortcuts.nix
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.hive.programs.spotify-shortcuts;
|
||||||
|
in {
|
||||||
|
options.hive.programs.spotify-shortcuts = {
|
||||||
|
enable = lib.mkEnableOption "Enable Spotify Shortcuts";
|
||||||
|
clientIdFile = lib.mkOption {
|
||||||
|
type = lib.types.path;
|
||||||
|
description = "Spotify API Client ID Path";
|
||||||
|
};
|
||||||
|
clientSecretFile = lib.mkOption {
|
||||||
|
type = lib.types.path;
|
||||||
|
description = "Spotify API Client Secret Path";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
environment.systemPackages = [pkgs.hive.spotify-shortcuts];
|
||||||
|
environment.etc."profile.d/spotify-shortcuts.sh".text = ''
|
||||||
|
export SPOTIFY_SHORTCUTS_CLIENT_ID=$(cat ${cfg.clientIdFile})
|
||||||
|
export SPOTIFY_SHORTCUTS_CLIENT_SECRET=$(cat ${cfg.clientSecretFile})
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -2,5 +2,6 @@ final: _: {
|
|||||||
hive = {
|
hive = {
|
||||||
crossover = final.callPackage ./crossover.nix {};
|
crossover = final.callPackage ./crossover.nix {};
|
||||||
transcode-davinci-resolve = final.callPackage ./transcode-davinci-resolve {};
|
transcode-davinci-resolve = final.callPackage ./transcode-davinci-resolve {};
|
||||||
|
spotify-shortcuts = final.callPackage ./spotify-shortcuts {};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
1
pkgs/spotify-shortcuts/.envrc
Normal file
1
pkgs/spotify-shortcuts/.envrc
Normal file
@ -0,0 +1 @@
|
|||||||
|
use flake ../../#spotify-shortcuts --show-trace
|
||||||
2
pkgs/spotify-shortcuts/default.nix
Normal file
2
pkgs/spotify-shortcuts/default.nix
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
{pkgs ? import <nixpkgs> {}}:
|
||||||
|
pkgs.callPackage ./derivation.nix {}
|
||||||
7
pkgs/spotify-shortcuts/derivation.nix
Normal file
7
pkgs/spotify-shortcuts/derivation.nix
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
{python3Packages}:
|
||||||
|
with python3Packages;
|
||||||
|
buildPythonApplication {
|
||||||
|
name = "spotify-shortcuts";
|
||||||
|
propagatedBuildInputs = [spotipy pyxdg];
|
||||||
|
src = ./.;
|
||||||
|
}
|
||||||
14
pkgs/spotify-shortcuts/setup.py
Normal file
14
pkgs/spotify-shortcuts/setup.py
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
from setuptools import setup, find_packages
|
||||||
|
|
||||||
|
setup(
|
||||||
|
name="spotify_shortcuts",
|
||||||
|
version="1.0",
|
||||||
|
packages=find_packages(),
|
||||||
|
entry_points={
|
||||||
|
"console_scripts": [
|
||||||
|
"spotify-like=spotify_shortcuts.spotify_like:main",
|
||||||
|
],
|
||||||
|
},
|
||||||
|
)
|
||||||
8
pkgs/spotify-shortcuts/shell.nix
Normal file
8
pkgs/spotify-shortcuts/shell.nix
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{pkgs ? import <nixpkgs> {}}:
|
||||||
|
pkgs.mkShell {
|
||||||
|
packages = [
|
||||||
|
pkgs.pyright
|
||||||
|
pkgs.black
|
||||||
|
];
|
||||||
|
inputsFrom = [(pkgs.callPackage ./derivation.nix {})];
|
||||||
|
}
|
||||||
50
pkgs/spotify-shortcuts/spotify_shortcuts/config.py
Normal file
50
pkgs/spotify-shortcuts/spotify_shortcuts/config.py
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from argparse import ArgumentParser
|
||||||
|
from typing import List
|
||||||
|
from os import getenv
|
||||||
|
from sys import argv
|
||||||
|
from xdg.BaseDirectory import xdg_cache_home
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Config:
|
||||||
|
cache_file: Path = Path(xdg_cache_home) / Path("spotify-shortcuts.json")
|
||||||
|
client_id: str | None = None
|
||||||
|
client_secret: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
def load_config(args: List[str] = argv[1:]) -> Config:
|
||||||
|
parser = ArgumentParser(description="Spotify CLI Tool")
|
||||||
|
parser.add_argument(
|
||||||
|
"--cache-file",
|
||||||
|
type=Path,
|
||||||
|
default=Config.cache_file,
|
||||||
|
help="Path to the cache file for Spotify authentication",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--client-id",
|
||||||
|
type=str,
|
||||||
|
default=Config.client_id,
|
||||||
|
help="Spotify API Client ID",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--client-secret",
|
||||||
|
type=str,
|
||||||
|
default=Config.client_secret,
|
||||||
|
help="Spotify API Client Secret",
|
||||||
|
)
|
||||||
|
|
||||||
|
ns = parser.parse_args(args)
|
||||||
|
|
||||||
|
cfg = Config(
|
||||||
|
cache_file=ns.cache_file,
|
||||||
|
client_id=ns.client_id,
|
||||||
|
client_secret=ns.client_secret,
|
||||||
|
)
|
||||||
|
|
||||||
|
return Config(
|
||||||
|
cache_file=Path(getenv("SPOTIFY_SHORTCUTS_CACHE_FILE", cfg.cache_file)),
|
||||||
|
client_id=getenv("SPOTIFY_SHORTCUTS_CLIENT_ID", cfg.client_id),
|
||||||
|
client_secret=getenv("SPOTIFY_SHORTCUTS_CLIENT_SECRET", cfg.client_secret),
|
||||||
|
)
|
||||||
18
pkgs/spotify-shortcuts/spotify_shortcuts/spotify_auth.py
Normal file
18
pkgs/spotify-shortcuts/spotify_shortcuts/spotify_auth.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
from spotipy.oauth2 import SpotifyOAuth
|
||||||
|
from spotipy import Spotify
|
||||||
|
from spotify_shortcuts.config import Config
|
||||||
|
|
||||||
|
|
||||||
|
def authenticated_session(cfg: Config) -> Spotify:
|
||||||
|
assert cfg.client_id, "Spotify client ID is required"
|
||||||
|
assert cfg.client_secret, "Spotify client secret is required"
|
||||||
|
|
||||||
|
return Spotify(
|
||||||
|
auth_manager=SpotifyOAuth(
|
||||||
|
client_id=cfg.client_id,
|
||||||
|
client_secret=cfg.client_secret,
|
||||||
|
redirect_uri="http://127.0.0.1:45632/callback",
|
||||||
|
scope="user-library-read user-library-modify user-read-playback-state",
|
||||||
|
cache_path=cfg.cache_file,
|
||||||
|
)
|
||||||
|
)
|
||||||
21
pkgs/spotify-shortcuts/spotify_shortcuts/spotify_like.py
Normal file
21
pkgs/spotify-shortcuts/spotify_shortcuts/spotify_like.py
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
from spotify_shortcuts.spotify_auth import authenticated_session
|
||||||
|
from spotify_shortcuts.config import load_config
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
cfg = load_config()
|
||||||
|
sp = authenticated_session(cfg)
|
||||||
|
|
||||||
|
if (playback := sp.current_playback()) is None:
|
||||||
|
print("No current playback found.")
|
||||||
|
return
|
||||||
|
|
||||||
|
if (uri := playback.get("item", {}).get("uri", None)) is None:
|
||||||
|
print("No track URI found in current playback.")
|
||||||
|
return
|
||||||
|
|
||||||
|
sp.current_user_saved_tracks_add(tracks=[uri])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
44
secrets/spotify-shortcuts.yaml
Normal file
44
secrets/spotify-shortcuts.yaml
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
clientId: ENC[AES256_GCM,data:YJYM62aqGafgqsS2rFQZlS8REuR21biiGtQUaUG18Qg=,iv:TIL+rlKbBVo2/JlaGRDqLFwQ+ETx3jkqSqmGu6kyvJc=,tag:0J29BXv0kppcmqm5xbAvew==,type:str]
|
||||||
|
clientSecret: ENC[AES256_GCM,data:3pw6QRC+cjZlQ3iGnzLVjQh3sHPld6UC2jC8yq+J+34=,iv:9xctJRA4RFGy7x18Y2aPVuSC1lZ0Rko0R8Hr/gE2YIw=,tag:nB4VENRf0YeZCpMM5QFA9Q==,type:str]
|
||||||
|
sops:
|
||||||
|
age:
|
||||||
|
- recipient: age1expg8vyduf290pz7l4f3mjzvk9f0azfdn48pyjzs3m6p7v4qjq0qwtn36z
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBodVlLVW5PODFLcUh2anlU
|
||||||
|
Yys2czJSVzc3cHdpL3RZU01HcXhEUkNRcVV3CjcvNTROVStid2x0TUt6eEpQanJD
|
||||||
|
NkNSTlVkLzBqMUZQSUdHQyt4VUZZQW8KLS0tIEZiTm9HNUdtelNrVTUwSmFnb0p5
|
||||||
|
K2NsMnZ3WDJIWWpmYml5cjNWZWFPWEUKfP9HxpJ35R/SiI5lzdRiVPIJUnhdbPJl
|
||||||
|
OtEUHJOrAYnKgX0uOo1argaQxN/8V0Py5njSdiiLd+mw1OCY4xef8w==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
- recipient: age1wf0rq27v0n27zfy0es8ns3n25e2fdt063dgn68tt3f89rgrtu9csq4yhsp
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLY1N5aXZzRzVaU2QzcmxS
|
||||||
|
cjBTSlA1dlNMRGhhRDUrQWphR2ZJcHhTZjBBCmxjR3g0NVc4UUxBV25rNFVCSzhM
|
||||||
|
Tk5xeHZtZGkxRlpwRElZa0c4eUFKcXcKLS0tIHlCSXBKQ3BSSWNEeklBdmw1VHBI
|
||||||
|
RHVwTmd2dDlWSkZia2t6cE01bGxKUUkKQ9QuzfhuoGd7x42p5bP2E8Tatw1Ihqu2
|
||||||
|
XFem9XLMIX1gNqRJkL7DmVybI/hE34pcAhALUKEG/K1vr51I/nKdGA==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
- recipient: age1xkmnvzus6fhundn4c0f6hyuwrj0f0m7x3hxtuhnez6cecr6m032qalw308
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMVWFwcE5GcHVnQzlCa2hz
|
||||||
|
UXlsMEFBRURlUWdRTXJUcktFRytzV0VWK3kwCnFDc0U3MzV1Mnhvek1DWmtvVXdW
|
||||||
|
bEJVM3ZpSm9IR2F2d0FtZHptOHlwWVEKLS0tIEJrL2YycVFGbGNuQ0JQZy80aFJa
|
||||||
|
YnNjSi9lSm1VWDlRRnJwb2U4cUhPWHcKXUB9ExCEgw29CvbT/OHZJa9F+DChep3r
|
||||||
|
twET8VbrV19O5zscu0OJ5s7hrobm+eWzPkoYlBXPC3bfwgeRRbsIvA==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
- recipient: age1clh2c489j7mx94aqr44u6k2cx5axqme9rlshqu9l2mcynluwhq6qwn0sv0
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqWENabXAwRlF0QmlRMGlS
|
||||||
|
SGx2UEFYcXJ6aWE0TDlrQ3FQNXFucTlVQXlBCmZSRERNMlFacUNDcHRtdVd1aFlh
|
||||||
|
WElZenhMT3JBMUhFK21MOEJhT083TVEKLS0tIEFHNzZZUzJtTkE3TEZNMlJreG1l
|
||||||
|
cHQxWXFCWlkvUFRvWUZycTdWMWRVMUEKN0jKYMQ9ARfnUUXprSYWdAAbVdOng8Yn
|
||||||
|
nV9sKYlTQ4fFBZ7w8hIBoJP3pWdIuZfEwKgA/7OyE02dts5wxIAuQw==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
lastmodified: "2025-07-23T23:55:41Z"
|
||||||
|
mac: ENC[AES256_GCM,data:dS+rBxe/+Qce4rqQB8dhtuMmAnmUzvXOXPMTWH2tglxxdYcJrQgatGC+0qNdJIa4vEi1cb9IcHiQE4fv615OSQuc4uDIPzLyLK7eDFz9DkK/eXehK6V7t1ZUPYKiSswZYLBcApJTQFYzaG5OqcFm7rcFIz4toXo4TNM94s0dRH8=,iv:CWv9zYvMOn3qvkHnpT+Bk67VJbQs5daMxjpjYm6dr8I=,tag:+0ENRlYqliohdf7ytH7IcA==,type:str]
|
||||||
|
unencrypted_suffix: _unencrypted
|
||||||
|
version: 3.10.2
|
||||||
Loading…
x
Reference in New Issue
Block a user