From e9456bac07b6421948b16ce115e38553f03f34cd Mon Sep 17 00:00:00 2001 From: Annika Merris Date: Tue, 13 Aug 2024 22:12:47 -0400 Subject: [PATCH] Sync Spotifyd is broken until some upstream stuff is fixed. --- flake.lock | 38 ++++++++++++------------ flake.nix | 2 +- hosts/envy/default.nix | 3 ++ hosts/kim/default.nix | 3 ++ modules/common/applications/spotifyd.nix | 4 +-- secrets/secrets.yaml | 6 ++-- 6 files changed, 31 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index bb5a4ee..63ead97 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1723015306, - "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -73,16 +73,16 @@ "lix": { "flake": false, "locked": { - "lastModified": 1720626042, - "narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=", - "ref": "refs/tags/2.90.0", - "rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed", - "revCount": 15788, + "lastModified": 1723503926, + "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=", + "ref": "refs/tags/2.91.0", + "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2", + "revCount": 16130, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, "original": { - "ref": "refs/tags/2.90.0", + "ref": "refs/tags/2.91.0", "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" } @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1722485024, - "narHash": "sha256-+7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8=", + "lastModified": 1723511483, + "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=", "ref": "refs/heads/main", - "rev": "e350380d72f94035c309e19fda2fd550f6ab7376", - "revCount": 102, + "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", + "revCount": 106, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -146,11 +146,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -192,11 +192,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1722897572, - "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9109c88..1d28c28 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; lix = { - url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90.0"; + url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.91.0"; flake = false; }; lix-module = { diff --git a/hosts/envy/default.nix b/hosts/envy/default.nix index 8a74d0f..a0bec2d 100644 --- a/hosts/envy/default.nix +++ b/hosts/envy/default.nix @@ -33,6 +33,9 @@ inputs.nixpkgs.lib.nixosSystem { defaultSopsFile = ../../secrets/secrets.yaml; defaultSopsFormat = "yaml"; age.keyFile = "/home/annika/.config/sops/age/keys.txt"; + age.sshKeyPaths = [ + "/etc/ssh/ssh_host_ed25519_key" + ]; }; # TODO: Temporary, remove eventually! diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix index 2197139..bb2bae6 100644 --- a/hosts/kim/default.nix +++ b/hosts/kim/default.nix @@ -37,6 +37,9 @@ inputs.nixpkgs.lib.nixosSystem { defaultSopsFile = ../../secrets/secrets.yaml; defaultSopsFormat = "yaml"; age.keyFile = "/home/annika/.config/sops/age/keys.txt"; + age.sshKeyPaths = [ + "/home/annika/.ssh/id_ed25519" + ]; }; # TODO: Temporary, remove eventually! diff --git a/modules/common/applications/spotifyd.nix b/modules/common/applications/spotifyd.nix index 434fdda..aa1a087 100644 --- a/modules/common/applications/spotifyd.nix +++ b/modules/common/applications/spotifyd.nix @@ -22,8 +22,8 @@ owner = "annika"; content = '' [global] - username = "me@annikamerris.com" - password = "${config.sops.placeholder."spotifyd/settings/global/password"}" + # username = "me@annikamerris.com" + # password = "${config.sops.placeholder."spotifyd/settings/global/password"}" use_mpris = true device_name = "kim-nix" device_type = "computer" diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index ebc23f8..abed3a1 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,7 +1,7 @@ spotifyd: settings: global: - password: ENC[AES256_GCM,data:wYPM+/FglTVN2nCLRkwycYMySWhtvKvCosqAVSVMEH7JwUoBj+CFkxTIU62Pu6EDusFOBkXiWtILyOgejZZEXA==,iv:v4sx/rPprcKtKBoa+0sZ0Nly967/qsjJ+TRtzyyKlgo=,tag:gHGVYPYz4B9022YSsK8HDg==,type:str] + password: ENC[AES256_GCM,data:DL6o/d57PHvAdWPm5vSRNj/YriJ81O8++vWBS45y6VorowGfbEfVrvFSzRogp4P1AMZYOh5E88QuHIkDQNgKLA==,iv:lBAdMkyw0KkHfLvWohPVp6q2MLXhMqtFwaf5NJPs3Rc=,tag:DKpA8vqwkQojTPADYXwAyg==,type:str] annika_password: ENC[AES256_GCM,data:qRdNYmU7Z0A0r3rhyTQMa9I/uNjlSMSjPzRNDBUvpV8t+jlN+l+5XzGawS7E1cwBTuU/rkdSha2vU2hCyWgxqOmLjSp8okCUSw==,iv:12lV4/zC5uneYnDrps9cdv5J1fXiuMfIGmoaYDaVD5c=,tag:d8SNVCcbYOT0iiUjeKVsWA==,type:str] netbird: setup_keys: @@ -31,8 +31,8 @@ sops: akR2d2ZrWjd5cWZ4NnJoSko3SWR3NmsKuq10DkZpKclYzpcl1BURi3oiHCNabrih svx2Rm2xAvWQZldB3i0Bhie7NszqWM0qQ82dKUkia8GDmz8HNC3pdA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-08-13T01:45:13Z" - mac: ENC[AES256_GCM,data:GcSiCUsOSbvRvxktdSW0p7JbGO63gxelqc2p0wxlhgpESqjabCVy3blUY/Hmv04SfIJwVZ84YVDmAIhsR315Y9wgRUrh7xsV6Linq6f2trtGuw3PuX35NuZwrTMpsN2g9mhY9T9LT6Vce74DsYXCk8S+IymG1yPfghWygyB04pg=,iv:KS9GpPxyjTnaZYeawJWTdeWRjs412fxMFofuUVcLfko=,tag:vGIMEuiOndnNw+1d2z3QOw==,type:str] + lastmodified: "2024-08-13T18:16:36Z" + mac: ENC[AES256_GCM,data:6WrgKVG9k6MupgyoclYxBNuo1KL4GShO6v+dfIZtthgaN3EVXFflG2ZnmVQfy5Y1lkxnLYcjD0kUeEsT4h5pjR9tMw7ZOwXclWdR8CskInhhAqcLUhtORjuW2gxxeR7JYFXoizuSFKh6C4ebG1TFugWK47DjfBA6yHLFDjUwBjw=,iv:3kAxoBN0FD3E6jtlR9B8NOywoyzKS1ihjUVWpHErdvY=,tag:ljQt4hrhvmRIwhENNUYduw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.0