diff --git a/.sops.yaml b/.sops.yaml index a46926d..a3066d4 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -3,7 +3,7 @@ keys: - &imxyy-nix-server ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB28jpN+h5euh3NtdN+A+EtqgIatC22e4i1TPTioKire - &imxyy-nix-x16 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb5G/ieEYBOng66YeyttBQLThyM6W//z2POsNyq4Rw/ creation_rules: - - path_regex: secrets/.*\.(yaml|toml|json|env|dae|txt|conf)$ + - path_regex: secrets/.*\..* key_groups: - age: - *imxyy-nix diff --git a/flake.lock b/flake.lock index d4bb61e..4e28157 100644 --- a/flake.lock +++ b/flake.lock @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1751817769, - "narHash": "sha256-j7ORyAJFNxYWwF+6fs2z5IcJ40TpVwrkFYU9/CGHwfA=", + "lastModified": 1755219990, + "narHash": "sha256-/znXwik9nC9TY6dwq0SR60MAi9IEZi2InRSRjfhKu1s=", "owner": "imxyy1soope1", "repo": "go-musicfox", - "rev": "179b9440b6f209e7fd6ade589117b72bdd9042a6", + "rev": "938c4d6bb2a318bc6251f3b11fa8cf54d29b4419", "type": "github" }, "original": { diff --git a/modules/cli/media/go-musicfox/default.nix b/modules/cli/media/go-musicfox.nix similarity index 69% rename from modules/cli/media/go-musicfox/default.nix rename to modules/cli/media/go-musicfox.nix index cd7283a..5cd7b3c 100644 --- a/modules/cli/media/go-musicfox/default.nix +++ b/modules/cli/media/go-musicfox.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + secrets, ... }: lib.my.makeSwitch { @@ -19,7 +20,11 @@ lib.my.makeSwitch { playerctl go-musicfox ]; - xdg.configFile."go-musicfox/go-musicfox.ini".source = ./go-musicfox.ini; + sops.secrets.go-musicfox = { + sopsFile = secrets."go-musicfox.ini"; + format = "binary"; + path = "${config.my.home.xdg.configHome}/go-musicfox/go-musicfox.ini"; + }; }; cli.media.mpd.enable = true; diff --git a/modules/cli/media/go-musicfox/go-musicfox.ini b/modules/cli/media/go-musicfox/go-musicfox.ini deleted file mode 100644 index dbe81c1..0000000 --- a/modules/cli/media/go-musicfox/go-musicfox.ini +++ /dev/null @@ -1,97 +0,0 @@ -# 启动页配置 -[startup] -# 是否显示启动页 -show=false -# 启动页进度条是否有回弹效果 -progressOutBounce=true -# 启动页时长 -loadingSeconds=2 -# 启动页欢迎语 -welcome=musicfox -# 启动时自动签到 -signin=false - -# 进度条配置 -[progress] -# 进度条已加载字符 -fullChar=# -# 进度条未加载字符 -emptyChar= - -# 主页面配置 -[main] -# 是否显示标题 -showTitle=true -# 加载中提示 -loadingText=[加载中...] -# 歌曲音质,可选项:standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), jymaster(超清母带) 进行音质判断 -songLevel=hires -# 主题颜色 -# 随机 -# primaryColor=random -# 经典网易云音乐红 -#primaryColor="#ea403f" -primaryColor="#6186D9" -# 是否显示歌词 -showLyric=true -# 歌词偏移 ms -lyricOffset=0 -# 显示歌词翻译 -showLyricTrans=true -# 是否显示通知信息 -showNotify=false -# 开启pprof, --pprof时会开启 -pprofPort=9876 -# altScreen显示模式 -altScreen=true -# 双列显示,开启务必使用等宽字体 -doubleColumn=true -# 下载目录,默认为$HOME/.go-musicfox/download -downloadDir=/home/imxyy/Music/go-musicfox -# 缓存目录,默认为${MUSICFOX_ROOT}/cache -cacheDir=/home/imxyy/Music/go-musicfox/.cache -# 缓存大小(以MB为单位),0为不使用缓存,-1为不限制,默认为0 -cacheLimit=-1 -# 是否显示歌单下所有歌曲,默认不开启,仅获取歌单前1000首,开启后可能会占用更多内存(大量歌曲数据)和带宽(会同时发送多个请求获取歌单下歌曲数据) -showAllSongsOfPlaylist=false -# 动态显示menu行数 -dynamicMenuRows=true -enableMouseEvent = false - -[autoplay] -# 是否开启自动播放,默认不开启 -autoPlay=true -# 自动播放歌单,dailyReco,like,no(保持上次退出时的设置,无视offset),name:歌单名,默认dailyReco -autoPlayList="no" -# 播放偏移,0为第一首,-1为最后一首,默认为0 -offset=0 -# 播放模式,listLoop, order, singleLoop, random, intelligent(心动), last(上次退出时的模式),default,默认为last -playMode=singleLoop - -[player] -# 播放引擎 beep / mpd(需要安装配置mpd) / osx(Mac才可用) -# 不填Mac默认使用osx,其他系统默认使用beep(推荐的配置) -engine=mpd -# beep使用的mp3解码器,可选:go-mp3, minimp3 (minimp3更少的CPU占用,但是稳定性不如go-mp3) -#beepMp3Decoder=go-mp3 - -# mpd配置 -mpdBin=mpd -# !!!注意!!! 一定要在配置文件中设置pid_file,否则在退出时不会kill掉mpd进程 -mpdConfigFile=/home/imxyy/.config/mpd/mpd.conf -mpdNetwork=tcp -mpdAddr=127.0.0.1:6600 - -[unm] -# UNM开关 -switch=true -# UNM源: kuwo,kugou,migu,qq -sources=kuwo,kugou -# UNM搜索其他平台限制 0-3 -searchLimit=0 -# 解除会员限制 -enableLocalVip=true -# 解除音质限制 -unlockSoundEffects=true -# QQ音乐cookie文件 -qqCookieFile= diff --git a/secrets/go-musicfox.ini.txt b/secrets/go-musicfox.ini.txt new file mode 100644 index 0000000..2df69ca --- /dev/null +++ b/secrets/go-musicfox.ini.txt @@ -0,0 +1,23 @@ +{ + "data": "ENC[AES256_GCM,data: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,iv:rVoao7UEmNoDvH4orSCMQy3LPm/jPVNZVbtUORX8wM8=,tag:ddBpar9JhYXTvs9vgMlxuw==,type:str]", + "sops": { + "age": [ + { + "recipient": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDltTWRrUSArbTkz\nV2JMN1ZnWi9aNjZ4aWRrbnh1UU5vRE9VeUdBTDBhMDBIczk4NWdNCnhOQWVUeDVz\nelJrR1VDUlAxdkxVTGhkTlJueDY5L3JjS0FuaXp4eXlCR0UKLS0tIEhzVFMzUndE\nSmZ5Z3dtUjdEbmw4UC9vUGdYam45SHE3d2x0WnJ6RXhJR2cKioF3d5UjBxv5zsp5\nKin/8FLF2nE0ysZ4WHLaO5PUZUC1V4Fb1GxBydMDlJBjKhwu7hrRgZB+m5WdEMGE\n7GFwSg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB28jpN+h5euh3NtdN+A+EtqgIatC22e4i1TPTioKire", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHJNY1d1ZyBXbW9E\naUhWb3BCSHVGK3JGd2dEWDQ4djRrRjMrY2NIMXJDNHVZVnEwQ1hFCjBCUGhXcHAx\nbldseThTTGtiUFkwc214TTBMMlZvRG53Qklkd2hIcml2ZG8KLS0tIGsxdlZXRjFG\nV1UvSkpjMDdHSzR6R2Q1aGZTMU1VQytNVDZVVStwU1llYnMKjiABYwlLVSbrhbm8\nCd3wSSXUyX8szSTHyT8ShC+CqmDovO0Rb9pOv9Y09dwcX2qqJHuJGDoDoVkFvCSn\nFqFzIA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb5G/ieEYBOng66YeyttBQLThyM6W//z2POsNyq4Rw/", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFhGYmtrZyBXcUJx\ndVZ3ZTlHSjJpb0FZVm1PUFQ5ZzEvWWxEYnloNkhFT2NKdldaV3lNClgvbkZKL0lj\nSjZHZ3Y5ZjZMSFdmSDY0MEdmNTJuUjY1OVJDZHJkTkNhbHMKLS0tIFdpUTJYakZy\ndDBVbGFqM3BKck5sSHFyR2liYlZHcHIrRHJBeVFCalR1bE0KDmVy9OuIOt49bQ6G\nl0Qvv3qozABBf68oy34qowOuGZpCYlbtHUBOf9PTcbj7WXmsAMvLray9q276i7ap\nGHZ/aQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-08-15T13:02:29Z", + "mac": "ENC[AES256_GCM,data:G67AAwTbGwz1oCFE0Qvdl4NRr3J5uoEVUFEEzqdaeXDb2Bn1hsr/Ydc6CVJEhm6SpCJAJpvRbeQ+bMlg/EsSQLdMUQgp4ZT0FXpMfhSBAnTaT50cLwSB/QrBXH97sUjijwWFDrMvziEKdKH/m4nTRv7U2DS9tjnLABGrT7+HaBA=,iv:+hIyQDujIefBVjwPeA0W0FOOehKpt2dDCleLMLJRraY=,tag:xIoJnebuy5EmM6N9UkwsnQ==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +}