gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-09 16:33:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: gerg-l:b9e276d69fbac5681d5b86e87ba913b9e3e9010c
Branches Tags
gerg-l:master
...
compare: gerg-l:26ea748be11fa187186571683de2e10aa6fa6f9c
Branches Tags
gerg-l:master

2 commits
b9e276d69f ... 26ea748be1

Author SHA1 Message Date
Gerg-L
26ea748be1
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/15dbf8cebd8e2655a883b74547108e089f051bf0?narHash=sha256-lSOXdgW/1zi/SSu7xp71v%2B55D5Egz8ACv0STkj7fhbs%3D' (2025-02-18)
  → 'github:nix-community/disko/19c1140419c4f1cdf88ad4c1cfb6605597628940?narHash=sha256-WK%2BPZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y%3D' (2025-02-25)
• Updated input 'lanzaboote':
    'github:nix-community/lanzaboote/3bdeebbc484a09391c4f0ec8a37bb77809426660?narHash=sha256-2j%2Bsln9RwQn%2Bg7J4GmdFFgvqXnLkvWBNMaUzONlkzUE%3D' (2025-02-10)
  → 'github:nix-community/lanzaboote/6321bc060d757c137c1fbae2057c7e941483878f?narHash=sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts%3D' (2025-02-24)
• Updated input 'master':
    'github:NixOS/nixpkgs/06b36bb519629003bc79e4dcc0c4132b2e9e5c47?narHash=sha256-/MIT8/gFk2Yswm/uUzTg65Cl9GmS1iXT2REPVflJRxM%3D' (2025-02-23)
  → 'github:NixOS/nixpkgs/908e22516ddb1caa6c656cf801feba1fb514b85c?narHash=sha256-CCS%2BjIsmI3o0bfQMoC45/6bJ56Dp/M8D94heC29//wI%3D' (2025-02-26)
• Updated input 'stable':
    'github:NixOS/nixpkgs/11415c7ae8539d6292f2928317ee7a8410b28bb9?narHash=sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM%3D' (2025-02-21)
  → 'github:NixOS/nixpkgs/5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b?narHash=sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc%3D' (2025-02-25)
• Updated input 'unstable':
    'github:NixOS/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680?narHash=sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64%3D' (2025-02-18)
  → 'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05?narHash=sha256-WGaHVAjcrv%2BCun7zPlI41SerRtfknGQap281%2BAakSAw%3D' (2025-02-24)
 2025-02-26 18:01:39 -05:00
Gerg-L
9ac9b2005c
fix lavalink 2025-02-26 18:00:08 -05:00
5 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739841949, "lastModified": 1740485968,
"narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -356,11 +356,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1739186342, "lastModified": 1740440383,
"narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", "rev": "6321bc060d757c137c1fbae2057c7e941483878f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,11 +371,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1740287033, "lastModified": 1740610743,
"narHash": "sha256-/MIT8/gFk2Yswm/uUzTg65Cl9GmS1iXT2REPVflJRxM=", "narHash": "sha256-CCS+jIsmI3o0bfQMoC45/6bJ56Dp/M8D94heC29//wI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "06b36bb519629003bc79e4dcc0c4132b2e9e5c47", "rev": "908e22516ddb1caa6c656cf801feba1fb514b85c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -827,11 +827,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1740162160, "lastModified": 1740463929,
"narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -930,11 +930,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1739866667, "lastModified": 1740367490,
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
nixosConfigurations/gerg-desktop/services/vocard/application.yml
View file

@ -13,6 +13,8 @@ plugins:
# Clients are queried in the order they are given (so the first client is queried first and so on...) # Clients are queried in the order they are given (so the first client is queried first and so on...)
clients: clients:
- MUSIC - MUSIC
- TVHTML5EMBEDDED
- TV
- ANDROID_VR - ANDROID_VR
- WEB - WEB
- WEBEMBEDDED - WEBEMBEDDED
@ -24,7 +26,7 @@ plugins:
# another_key: another_value # another_key: another_value
lavalink: lavalink:
plugins: plugins:
- dependency: "dev.lavalink.youtube:youtube-plugin:1.11.4" - dependency: "dev.lavalink.youtube:youtube-plugin:1.11.5"
snapshot: false snapshot: false
# setting "enabled: true" is the bare minimum to get OAuth working. # setting "enabled: true" is the bare minimum to get OAuth working.
enabled: true enabled: true

6
nixosConfigurations/gerg-desktop/services/vocard/secrets.yaml
View file

@ -4,7 +4,7 @@ vocard:
spotify_client_id: ENC[AES256_GCM,data:uwqtWL7JZnN6FsPfTxtBjEgjE7qwGcKbDnloO6SNWs4=,iv:HMZ42J2oXavE4NZCmP1MUVZ+s9Px4XBDRWIbCcl6dYs=,tag:iO8hn8mlNGS1dcLBwwl/AQ==,type:str] spotify_client_id: ENC[AES256_GCM,data:uwqtWL7JZnN6FsPfTxtBjEgjE7qwGcKbDnloO6SNWs4=,iv:HMZ42J2oXavE4NZCmP1MUVZ+s9Px4XBDRWIbCcl6dYs=,tag:iO8hn8mlNGS1dcLBwwl/AQ==,type:str]
spotify_client_secret: ENC[AES256_GCM,data:YnfLj7RPTaucpZCqnel2gStd8oBcbWnL4/+KnkyT4u0=,iv:W6gXch7jH5jFp0PJy0LZ7vq1yCtO1NLbCTR3N6r47nQ=,tag:ct5Y786N6qVkZCts6pZniQ==,type:str] spotify_client_secret: ENC[AES256_GCM,data:YnfLj7RPTaucpZCqnel2gStd8oBcbWnL4/+KnkyT4u0=,iv:W6gXch7jH5jFp0PJy0LZ7vq1yCtO1NLbCTR3N6r47nQ=,tag:ct5Y786N6qVkZCts6pZniQ==,type:str]
lavalink: lavalink:
refresh_token: ENC[AES256_GCM,data:t40tbR2FrGTQCmuGsQ0AXJyjKLBYpOs52aIVaYtZnYWYa2pEm+c8K2pDT33uWe2WA0YSV5z5Qe+YEeryudaLALGB/hnGpnRqPDiS4msiPQMD+5dFnrelYIXCFz8kTlCPdsaDW33F5w==,iv:pk+V85B+t3gYFm2zYWqACwRh0q4W86UvcaNnzhbzztU=,tag:gjC4ADv9hNhk85niT3P75g==,type:str] refresh_token: ENC[AES256_GCM,data:xiPmWhJTQ4OBIeB98t8qtDVQ7e/KVcThTmw5KE0VCIPfm6g7sOzXt7f91nSXX3wBvmy3tX+xii9/rp4dAg3b3/NYL4uHnLsKjM1wGTSH+KuCkbmJZDNYEk2OMSOlAK2x0yAMvpFB,iv:IdITL9x+yfVzf9yqDgJPUBok0Zn/CtN0CVF4AGIcgj8=,tag:DvQChj3Mng47LvNBYd6NAg==,type:str]
password: ENC[AES256_GCM,data:boIoVKGcXWAaKx6rOH1w1awTGfc=,iv:mX8WaaeeQXqyVuM5oA5tUUG7h7C0rV9QAVoHW/InyPc=,tag:Q/P3T5o1CMlbxe+UWyOP3A==,type:str] password: ENC[AES256_GCM,data:boIoVKGcXWAaKx6rOH1w1awTGfc=,iv:mX8WaaeeQXqyVuM5oA5tUUG7h7C0rV9QAVoHW/InyPc=,tag:Q/P3T5o1CMlbxe+UWyOP3A==,type:str]
sops: sops:
kms: [] kms: []
@ -21,8 +21,8 @@ sops:
WC9NVmdtWjlWSWN6dUwwMFdPRmpxWG8Ka0i27kBbA4p835RWsEPIghFTwxo4elOz WC9NVmdtWjlWSWN6dUwwMFdPRmpxWG8Ka0i27kBbA4p835RWsEPIghFTwxo4elOz
PL0TnuMNnl66TJiD0x6oRMn8tb6wQIAqGxBt9Jb2lj24eXCtzfGbEg== PL0TnuMNnl66TJiD0x6oRMn8tb6wQIAqGxBt9Jb2lj24eXCtzfGbEg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-02-07T03:01:32Z" lastmodified: "2025-02-26T22:57:12Z"
mac: ENC[AES256_GCM,data:T7z3iKsPZ6AiAf+ogcUfbBCLpXWgb76KKkpfXjHIkvoovHIil8diyWSPogj0eD6a7i4mTjvaan7VoFsNS76KjVezGrEUlMcmck/JgSYkyxZmKtw0Yt/V4G8z7BodG7uWCo37eG7XZopi+Oy1+EWku6OzfXXi9vi27BtyDqAju6Y=,iv:b8mqxYPMUBhPyk+wkcNJXGX32GulRZMR+iSVOOePs9E=,tag:qTRumh4WEICrubw0gi91YA==,type:str] mac: ENC[AES256_GCM,data:mb/kTo9zPyLbDJlvh6+P9GTzTVzVt7RMBnzS/qMDUvUR9OAP+zSt1Vf80oXnO3WqRncgRrIi1k3oKeipKHdTxmzXae+jefh7oOMGCeXI51IlnOhkA0MBgrN/jSMwEinYmqDGemzB7ff9quATtm8N/SoxepkR1ddikgEX6Zfr0mw=,iv:yTm2at3lgb1uWCsETw/XpDdrfKv5/8b1oxU2Eq89tbk=,tag:AP8vrUHejq2gsnkSBWHKyA==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.9.4 version: 3.9.4

3
nixosConfigurations/gerg-desktop/services/vocard/vocard.nix
View file

@ -60,14 +60,11 @@
builtins.replaceStrings builtins.replaceStrings
[ [
"@refresh_token@" "@refresh_token@"
"@password@" "@password@"
] ]
[ [
config.sops.placeholder."lavalink/refresh_token" config.sops.placeholder."lavalink/refresh_token"
config.sops.placeholder."lavalink/password" config.sops.placeholder."lavalink/password"
] ]
(builtins.readFile ./application.yml); (builtins.readFile ./application.yml);
}; };

4
packages/lavalink/package.nix
View file

@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
}; };
plugin = fetchurl { plugin = fetchurl {
url = "https://github.com/lavalink-devs/youtube-source/releases/download/1.11.4/youtube-plugin-1.11.4.jar"; url = "https://github.com/lavalink-devs/youtube-source/releases/download/1.11.5/youtube-plugin-1.11.5.jar";
hash = "sha256-OznpsYoiWa6y+/8kukWN66leLi2mZU/1x+zN+uyIk1k="; hash = "sha256-Zz4S5mWcsVFWGmN41L34GqZeCOswt/CAn+1PN1XJtbk=";
}; };
dontUnpack = true; dontUnpack = true;