diff --git a/hosts/common.nix b/hosts/common.nix index aeae008..3f3e202 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -42,8 +42,6 @@ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [ - "spotify" - "discord" "steam" "steam-original" "steam-run" diff --git a/modules/home/default.nix b/modules/home/default.nix index caaccd2..c52dfc3 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -9,5 +9,6 @@ ./kitty.nix ./equalizer ./sops.nix + ./spotifyd.nix ]; } diff --git a/modules/home/sops.nix b/modules/home/sops.nix index 752b3ad..2d4f7ee 100644 --- a/modules/home/sops.nix +++ b/modules/home/sops.nix @@ -11,7 +11,7 @@ config = lib.mkIf config.myConfig.sops.enable { sops = { age.sshKeyPaths = ["${config.home.homeDirectory}/.ssh/id_ed25519"]; - defaultSopsFile = "${inputs.self}/home/${config.home.username}/secrets.yaml"; + defaultSopsFile = "${inputs.self}/users/${config.home.username}/secrets.yaml"; }; }; } diff --git a/modules/home/spotifyd.nix b/modules/home/spotifyd.nix new file mode 100644 index 0000000..36212e2 --- /dev/null +++ b/modules/home/spotifyd.nix @@ -0,0 +1,27 @@ +{ + config, + lib, + osConfig, + ... +}: { + options.myConfig.spotifyd.enable = lib.mkEnableOption ""; + + config = lib.mkIf config.myConfig.spotifyd.enable { + sops.secrets = { + "spotify/username" = {}; + "spotify/password" = {}; + }; + + services.spotifyd = { + enable = true; + + settings.global = { + username_cmd = "cat ${config.sops.secrets."spotify/username".path}"; + password_cmd = "cat ${config.sops.secrets."spotify/password".path}"; + backend = "pulseaudio"; + device_name = "${osConfig.networking.hostName}"; + device_type = "computer"; + }; + }; + }; +} diff --git a/users/seb/home.nix b/users/seb/home.nix index 2a0cfb2..3ef084b 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -34,6 +34,7 @@ kitty.enable = true; equalizer.enable = true; sops.enable = true; + spotifyd.enable = true; }; programs.btop.enable = true; @@ -41,7 +42,6 @@ home.packages = [ pkgs.notepadqq pkgs.brave - pkgs.spotify pkgs.cinnamon.nemo-with-extensions pkgs.webcord pkgs.jetbrains.idea-community diff --git a/users/seb/secrets.yaml b/users/seb/secrets.yaml new file mode 100644 index 0000000..76bb248 --- /dev/null +++ b/users/seb/secrets.yaml @@ -0,0 +1,41 @@ +spotify: + username: ENC[AES256_GCM,data:nr0OgC/FDikM+HHeBrkSaz4oaHJ+TYJATA==,iv:t9gUM0/ZEIpoW0b10rUeiZL3SZ0vepF1H0bqzBsURyc=,tag:NeVPV/rqpV54wJoUF1wsoQ==,type:str] + password: ENC[AES256_GCM,data:UwVL7eotDKPZR+znkSE=,iv:wDJQK0HR0I2IObTsqeUiuMrAQsqHziuAkHMiJX+c+oM=,tag:g7q1mtDP7cZh7LwJn0IRng==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1mpq8m4p7dnxh5ze3fh7etd2k6sp85zdnmp9te3e9chcw4pw07pcq960zh5 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwT00wTHJOM3JVUlM3aUNu + NUptdlE1bGdBSFJJQkswRG8rbXFCRkhnaTNjCjFxUTRxSnJlZHhuYzl1OWJ0Y1h2 + WitJUjZzUFp3T2xSajVLVnBDZ0hvcncKLS0tIGlOMHAvVml0MVU5YzJWOVk1WC9R + OGFTT3pmVjB2eERid2V6dUVoZEhhcnMK1nkExegA+oOSwG+PlZ0t8twZW7d27sXS + gKvNlxQc8gLNFjh6u8hpKj1Bu35/suximjXRYrpwx8siIZTeV0fOYQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1p32cyzakxtcx346ej82ftln4r2aw2pcuazq3583s85nzsan4ygqsj32hjf + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFc0VMRlhoWGxIRFg1YTdR + YmRvOHFJMlYvV281TWdBbjJkdmxucXRMRzJjCm00cGlvbnlENjJ6eDVJcEMrN1lZ + MWpxZG1oS29wYXRESHFJanN6RXRVclEKLS0tIE4xdllpYnRlTWk1Y2VtQkU1WDhL + SWllWllGRTR1d3FlaHJ0dExob0xSM0kKRweE9nvxItO1Y2hbO67XcGm7ioPCE/97 + lWA1dWhQM84mdT3+M2wc2pIY4mNBfDIWBH8zwnpLKKwTAXugXeS8yA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1s9h9hh8f0vudwn4awr90mj0ka2xh9gppwus0jmvmaz3j3uckz94s36gzkz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0Vk9BMURTWGdSWkFFSmZO + NnovWit4cHhTOVNJR2kxcHFiVTNWTXRSZXlBCmlTdTZPeHZ5V1RDYXlNMEVneUJR + MnZ5endBQlozdmk4Q3duWXpkN25QNG8KLS0tIHhWbHYxTGFxL25RazdyM1Q3L25a + cDN1M1RpUDhmei9xVWpjSDZzZGpSS3cKJ4dLZMlxky3eJO+2gYPHApS2WTUMIOI2 + oKHDTbijdgsepAILlkJfbxjprrU6WV55Caunr7J48urqIUhbYkAg5A== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-04-27T20:21:00Z" + mac: ENC[AES256_GCM,data:CrKlMevwQLfmu+OO+cFtYtF/Y7XHQsoJ5APUw+W7ZQIEUb44HpD/DeZCGmMFTYUjqeaeTVSuPrfnNLvHmFEOLUhBPg+MrXzRozlsurAylj7WDFBJaNQJ3FOsfccQGpvyjKIO5lS9V95RcNMS/yT04anmYlw7Bojd/UzpEZnKqF4=,iv:aeZeqEYwFOUbwyyzUt1PBmog137nL4trp7YCyX57av8=,tag:jKG0KWlnCgHOrpbTTlh02A==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.8.1