about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock21
-rw-r--r--flake.nix3
-rw-r--r--home/modules/programs/spotify-tui/default.nix57
-rw-r--r--home/profiles/multimedia/default.nix41
-rw-r--r--nixos/alpha/configuration.nix3
-rw-r--r--nixos/alpha/secrets/secrets.yaml40
-rw-r--r--nixos/default.nix1
-rw-r--r--nixos/secrets/keys/hosts/alpha.asc28
-rw-r--r--nixos/secrets/keys/users/zach.asc13
9 files changed, 0 insertions, 207 deletions
diff --git a/flake.lock b/flake.lock
index cafac7f..c338b89 100644
--- a/flake.lock
+++ b/flake.lock
@@ -151,32 +151,11 @@
         "master": "master",
         "neovim": "neovim",
         "nixpkgs-2111": "nixpkgs-2111",
-        "sops-nix": "sops-nix",
         "unstable": "unstable",
         "unstable-small": "unstable-small",
         "wallpapers": "wallpapers"
       }
     },
-    "sops-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1644240878,
-        "narHash": "sha256-JO5WrnP6+5qN3isdmm9VmjzvCM64UElgGnql7vEGjKU=",
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "rev": "95b4393147dba5660bf0d13544ef5ef49d646f89",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "type": "github"
-      }
-    },
     "unstable": {
       "locked": {
         "lastModified": 1644420267,
diff --git a/flake.nix b/flake.nix
index 7b98b59..b2bbcf1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,9 +11,6 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "unstable";
 
-    sops-nix.url = "github:Mic92/sops-nix";
-    sops-nix.inputs.nixpkgs.follows = "unstable";
-
     neovim.url = "github:neovim/neovim?dir=contrib";
     neovim.inputs.nixpkgs.follows = "unstable";
 
diff --git a/home/modules/programs/spotify-tui/default.nix b/home/modules/programs/spotify-tui/default.nix
deleted file mode 100644
index 1693883..0000000
--- a/home/modules/programs/spotify-tui/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.programs.spotify-tui;
-  yamlFormat = pkgs.formats.yaml { };
-
-in
-{
-  meta.maintainers = with lib.maintainers; [ boppyt ];
-
-  options.programs.spotify-tui = {
-    enable = mkEnableOption "A Spotify client for the terminal written in Rust.";
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.spotify-tui;
-      defaultText = literalExpression "pkgs.spotify-tui";
-      description = "The spotify-tui package to install";
-    };
-
-    settings = mkOption {
-      type = yamlFormat.type;
-      default = { };
-      description = ''
-        Configuration written to
-        <filename>$XDG_CONFIG_HOME/spotify-tui/config.yml</filename>. See <link
-        xlink:href="https://github.com/Rigellute/spotify-tui#configuration"/>
-        for a list of available options.
-      '';
-      example = literalExpression ''
-        {
-          theme = {
-            active = "Cyan";
-            banner = "LightCyan";
-          };
-
-          behavior = {
-            seek_milliseconds = 5000;
-            volume_increment = 10;
-          };
-        }
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-
-    home.packages = [ cfg.package ];
-
-    xdg.configFile."spotify-tui/config.yml" = mkIf (cfg.settings != { }) {
-      source = yamlFormat.generate "spotify-tui-config" cfg.settings;
-    };
-  };
-}
diff --git a/home/profiles/multimedia/default.nix b/home/profiles/multimedia/default.nix
index ccfc8aa..591bff5 100644
--- a/home/profiles/multimedia/default.nix
+++ b/home/profiles/multimedia/default.nix
@@ -4,7 +4,6 @@ in
 {
   imports = [
     ../../modules/programs/nixpkgs
-    ../../modules/programs/spotify-tui
   ];
 
   options.profiles.multimedia = {
@@ -14,45 +13,5 @@ in
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [ playerctl nuclear ];
-
-    services.spotifyd = {
-      enable = true;
-
-      package = (pkgs.spotifyd.override { withMpris = true; });
-
-      settings = {
-        global = {
-          username = "9nko3f7puya1e5bbo9c5ifddy";
-          password_cmd = "cat /run/secrets/spotify-password"; # DISCLAIMER: this expects the `spotify` secret to be present (sops-nix)
-        };
-      };
-    };
-
-    programs.spotify-tui = {
-      enable = true;
-
-      settings = {
-        theme = {
-          active = "Blue";
-          banner = "LightBlue";
-          hovered = "LightBlue";
-          inactive = "Blue";
-          playbar_background = "Blue";
-          playbar_progress = "LightBlue";
-          playbar_progress_text = "Black";
-          playbar_text = "Blue";
-          selected = "LightBlue";
-          text = "203, 192, 171"; # Wrong color mappings on white
-          header = "203, 191, 171";
-        };
-
-        behavior = {
-          seek_milliseconds = 5000;
-          volume_increment = 10;
-        };
-      };
-    };
-
-    nixpkgs.allowedUnfree = [ "spotify" "spotify-unwrapped" ];
   };
 }
diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix
index 3b2ed23..c8e318e 100644
--- a/nixos/alpha/configuration.nix
+++ b/nixos/alpha/configuration.nix
@@ -195,9 +195,6 @@
     ];
   };
 
-  sops.defaultSopsFile = ./secrets/secrets.yaml;
-  sops.secrets.spotify-password.owner = "zach";
-
   users.users = {
     zach = {
       isNormalUser = true;
diff --git a/nixos/alpha/secrets/secrets.yaml b/nixos/alpha/secrets/secrets.yaml
deleted file mode 100644
index bfceeb2..0000000
--- a/nixos/alpha/secrets/secrets.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-spotify-password: ENC[AES256_GCM,data:Ch5t1CRgEl5YzXjUQDKB0T5bCCtwcaxuxg==,iv:syNOAub1gZ0Tlh5rGvCgX6eXL071e2x+PM8KcouziLs=,tag:7fCCSwABsP9L4iZ8UFQOKA==,type:str]
-sops:
-    shamir_threshold: 2
-    key_groups:
-        - pgp:
-            - created_at: "2022-02-12T14:44:47Z"
-              enc: |
-                -----BEGIN PGP MESSAGE-----
-
-                hF4Dod9S80wXQ00SAQdAQ2yYl36GKa+uN+GdzKB3NGkdfP80/chaJSZNxiqIHSkw
-                jGKIvFroAcbuvWv0wKzrRcG8LXNSAzVLLxa1aJeohPYjLet+6cuyFaLXyZbGTL3V
-                0l8BRlabGME2HoGl3fl/LjDEeMBXVEcykMkMUX2REnpkBxK5Ks61kAhLeim0Sk+N
-                XWt9ajduAZH9Ryy8ikg7Og6ZDYVv/MsqNLMIlWpdiuEynqo3/q3vpzDv9VSsBOKQ
-                bg==
-                =fPaH
-                -----END PGP MESSAGE-----
-              fp: 346833414516C852FFB238E19F734565641C2F14
-          hc_vault: []
-          age: []
-        - hc_vault: []
-          age:
-            - recipient: age1ndc6vascfywmk5d3ptyeps92dyc9d9qsxmezn6t4wv56jjzysucqu8ldfn
-              enc: |
-                -----BEGIN AGE ENCRYPTED FILE-----
-                YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwczFhSjRJOWxobGVLcVhE
-                VlI3OG9LWkdpN0FvVjdwdHdLeERZM0hsWEg4CjBGdnZiNE1PSHNWT3B4V29kKyt6
-                dDloZ0xmK0JXaWdDQTNjWW5JY295aEkKLS0tIHFDcy85NjJNNzRwS3NkaUxNVE5T
-                bW9MeXhHdHpXdWVFMlZjemJ3OG8zalUKbtZdiWCR+epsaXK2BXc5pgR3IgGQ8+SR
-                J6IuZt73d2XhFJ7eq50EdANcuivYhFgjDnwPrZhOw2Qwn+TTVONGBHY=
-                -----END AGE ENCRYPTED FILE-----
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2022-02-12T14:45:00Z"
-    mac: ENC[AES256_GCM,data:fgd0ZRv8IDEhWhUQcMH3GBkkKk+r9kr2LKihOmVslNSTsJ4L5+g5wJaBtAe/5FNq/TYOwyzPZRW4HLPcFTq7ZLPPD1DtdjXkHtsoPi9i53Y6WJ/6aZsH29w/F84ULWZTQVf3oJNx87vZ04rS5ADN9ndS9lu8cLyYkM3kyajNrhY=,iv:As7/YWXRvK9WXI5cbYCPUnTalodzHC3ZzkBMdPKljVw=,tag:lXCwPJy5EjovgenslaAlfw==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.7.1
diff --git a/nixos/default.nix b/nixos/default.nix
index 616381e..65bff77 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -6,7 +6,6 @@
     nixpkgs = unstable;
     overlays = with inputs; [ chaotic-nixpkgs.overlay ];
     extraModules = [
-      inputs.sops-nix.nixosModules.sops
       ./modules/security.nix
       ./modules/cachix
     ];
diff --git a/nixos/secrets/keys/hosts/alpha.asc b/nixos/secrets/keys/hosts/alpha.asc
deleted file mode 100644
index efc0509..0000000
--- a/nixos/secrets/keys/hosts/alpha.asc
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsFNBAAAAAABEAC0FtNG1j1RJJMGK/3wlP0Y642ZHaurW8i+3fM3mFCAeJXetTQS
-fRmCFQ7cJrK7JsclLcjGmVVl22D8vWAbv31VWfrTzEvJqggsQBIuuAkyLAv8u9ni
-VtQT6JgGxgSqRQPyHdhq59RgS1WUCFnNmuB6jphU6dV+/kcTF5H1yMpK7unWkiB7
-6zzEB3NZNqwhDTLiAJXYKl959ewalBgKtu/agjWM1oubPG6WjdHRiyw24UIZUf4U
-VYyg0R0bSPxJikh0wznHwh0Vho5jbaDoDcmWfRj5+MrpewWcs90CRzituz167KiO
-GPyZw/WMFRF4qh4ma2MR3BUawMvlhjVjYxU6a/MlbV1aoz7/GqvsG25TjNW1rVd2
-l8DeBoeNpRso7k717zgbuopNdlUdLaeBz/0sv1itzeZK1xe1+3io38bHkqbllmSo
-4nhPd2M5ntIWHQfpOeVsaMwpwZsqNSwUt/jTd8iJi3JstDEhsKpWa7k4FkFkq14f
-Wo+ONynKbnIGkzYDGddx+Si6M/4dKWxrj0hbHyjTWKUC4JbFl0D8BwNor+VIGrkm
-GOFTtbFcs/gMJQnBBD7akE2N+bplWTVuKanLEnvsrbGac+CYstfI5aBYfXKLP2dC
-uaFP6ilju4m9tQw+YpMK0f8cHtbw5T+6O9SI+PrzpaZmrrcKavT8zGI2UQARAQAB
-zSlyb290IChJbXBvcnRlZCBmcm9tIFNTSCkgPHJvb3RAbG9jYWxob3N0PsLBYgQT
-AQgAFgUCAAAAAAkQ7m6dkVRw66QCGw8CGQEAAFjIEACheQtAFqXgAr8ClgWweEm2
-hahrxhEQxIcINBZRbbYbkDgxzXceiWArd+pJhjKkpNMQi3IURGDcfpispnhgzGgQ
-OltAJaV9lYuh1J+9Zwg1qXtKGp21p9l+hcNsyfHvPjanD0OaBKy59zHXVu4Hdb74
-Ikf+Pex4e9iyxmrtYoFmQbyAkDANSruoMzsEIbpAYU6VN0LgZh0oO7r1au+47BEe
-6O/A7jQFTL4n+6EG4nQc/QkXNybMvyNnwVo6q0TfOn76IX9sBj8PGKRVaSwo+Ztq
-nUHmUbnZQdU9AAEG5VfdskZUYB4sxKQ2gDpORF4fwRXV+KncheclX7elR9MSaJpC
-ZYm+dKJRE/3oSJ9aH1KtQVrGUfCD0eftunOsVMgpY8XaZtOJejsmMPhR5GCIQ7Iu
-GanxIpaVBgDJUAaR7buD26Fo9A5cL1/xBL8aZm5cTEOBaaiMZV7+L3r4aIy6rbY0
-+choMGMANAl44Pksg1SeeCTq3zhFcj7UzPCb4LVNnGv13WHjILi8fRnSdrs56dBr
-uEHStn2anLEIvuXVfRumrsAEIEY22rslG9+g3DVUJu30wMZUR2aprw5dpPowAo3z
-1ZpTuZjUMy34QceYzZT+ZvB/KfVl7z4+HUYwXJ3/v/f60Z1VQWExGnQECTQUzwiH
-jqf3t5E/YeGDr2o5FxBNlw==
-=v/80
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/nixos/secrets/keys/users/zach.asc b/nixos/secrets/keys/users/zach.asc
deleted file mode 100644
index 8da119e..0000000
--- a/nixos/secrets/keys/users/zach.asc
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEYgdGKBYJKwYBBAHaRw8BAQdAGwLyUjM7Ebj6LOz4ioWcWKnLExIjmY3HUJ2J
-BYy245G0F3phY2hlbCA8emFjaEB6YWNoZWwuaW8+iJQEExYKADwWIQQ0aDNBRRbI
-Uv+yOOGfc0VlZBwvFAUCYgdGKAIbAwUJA8JnAAQLCQgHBBUKCQgFFgIDAQACHgUC
-F4AACgkQn3NFZWQcLxS2JwEAr9NyzI53Cn3/U4o6CJ5+xHQvQfHurB4jJa6TguYK
-aVoA/11EWBO2+GxoSFYASG6S7zM9DVmIJg++Xx8dB/dG9ocKuDgEYgdGKBIKKwYB
-BAGXVQEFAQEHQJm4I7HwpZC4NDYuBMSzU8MCq3tQkY3YrA5hMOVthhYrAwEIB4h+
-BBgWCgAmFiEENGgzQUUWyFL/sjjhn3NFZWQcLxQFAmIHRigCGwwFCQPCZwAACgkQ
-n3NFZWQcLxTSAgEAyj++2tuw+6uoGJX8dzAr8LeWSkiC5pf24kOaQsAem/UBAKZg
-qLOUbpUhLcE1JvotRlUDeNFAq+hNbfyTYAcrZawO
-=p+WA
------END PGP PUBLIC KEY BLOCK-----
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-20 02:46:38 +0000