From bbbd4cac2fb76afd6330fea88fe5ad641c26db17 Mon Sep 17 00:00:00 2001 From: C4 Patino Date: Sat, 5 Oct 2024 11:33:10 -0500 Subject: [PATCH] Added lastpass and more secrets to configuration --- home/profiles/arisu/default.nix | 2 ++ home/profiles/chibi/default.nix | 2 ++ home/profiles/kokoro/default.nix | 2 ++ home/programs/terminal/default.nix | 1 + home/programs/terminal/lastpass.nix | 13 +++++++++++++ secrets/sops/secrets.yaml | 12 +++++++----- system/secrets.nix | 15 ++++++++++++--- system/services/github-runner.nix | 2 +- 8 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 home/programs/terminal/lastpass.nix diff --git a/home/profiles/arisu/default.nix b/home/profiles/arisu/default.nix index 91fa62f..97988a8 100644 --- a/home/profiles/arisu/default.nix +++ b/home/profiles/arisu/default.nix @@ -30,6 +30,8 @@ music.enable = true; leetcode.enable = true; + lastpass.enable = true; + neovim.enable = true; pycharm.enable = true; idea.enable = true; diff --git a/home/profiles/chibi/default.nix b/home/profiles/chibi/default.nix index 2a60bca..9e548fd 100644 --- a/home/profiles/chibi/default.nix +++ b/home/profiles/chibi/default.nix @@ -18,5 +18,7 @@ bottom.enable = true; yazi.enable = true; + lastpass.enable = true; + neovim.enable = true; } diff --git a/home/profiles/kokoro/default.nix b/home/profiles/kokoro/default.nix index bdaf29e..a6a86c1 100644 --- a/home/profiles/kokoro/default.nix +++ b/home/profiles/kokoro/default.nix @@ -29,6 +29,8 @@ music.enable = true; leetcode.enable = true; + lastpass.enable = true; + neovim.enable = true; pycharm.enable = true; idea.enable = true; diff --git a/home/programs/terminal/default.nix b/home/programs/terminal/default.nix index 9b8b8f0..ddc9f52 100644 --- a/home/programs/terminal/default.nix +++ b/home/programs/terminal/default.nix @@ -3,6 +3,7 @@ ./bat.nix ./git.nix ./kitty.nix + ./lastpass.nix ./lazygit.nix ./leetcode.nix ./metrics.nix diff --git a/home/programs/terminal/lastpass.nix b/home/programs/terminal/lastpass.nix new file mode 100644 index 0000000..662d682 --- /dev/null +++ b/home/programs/terminal/lastpass.nix @@ -0,0 +1,13 @@ +{ lib, config, pkgs, ... }: { + options = { + lastpass.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable LastPass CLI"; + }; + }; + + config = lib.mkIf config.lastpass.enable { + home.packages = with pkgs; [ lastpass-cli ]; + }; +} diff --git a/secrets/sops/secrets.yaml b/secrets/sops/secrets.yaml index e80fe34..82d3ce0 100644 --- a/secrets/sops/secrets.yaml +++ b/secrets/sops/secrets.yaml @@ -1,6 +1,8 @@ -github-auth: ENC[AES256_GCM,data:CByqbu86Ar4uXygIHDzrDGLuo0sJmvprBt/a6/SHef7u15BzcKvopw==,iv:Iphc6h/3nR+6jbiTPO/birEhITmNu+jRNTooMS/QtNk=,tag:MV0mu4bhnOgnU23GSsAq1A==,type:str] -github-runner: ENC[AES256_GCM,data:IV4P5jx3qU6PhyG78kJuineffnYuin/HdHlI6t9hddFE7NWA9yCbHQ==,iv:LgtPJkQCns2GqjqOw7o7OJMAJVK4TbWruh7SYSUHlIk=,tag:iu0YTklSYT4JS3Ejgjf3hg==,type:str] -github-runner-oasys: ENC[AES256_GCM,data:bs/5xCEr4EecKIzK4aoOhI3YN30bumqc4hUO+ptK8j/cvU6hVmjxawDRyq6SCyW9kfVc2KZJnSvD2XqHPW1TpW0UISvd6zgO8B32AxTzg56TgQzt31snK7hfjPeq,iv:TMu/H+CumcjwWvMSSouOTdIKPFxDNCsr7PLY+9/ZQr0=,tag:1Fk3AQijN4LBVriq9pQ+hA==,type:str] +github: + auth: ENC[AES256_GCM,data:VGajI5T+DiB/DUK7P3QjgBIPq23AyzL2BQs7tI7KOqkOCBugTkZ6Rg==,iv:+dd6TCgPGsMBT1MlNux8ox9LzcZiuPUxTMr6wOfuQeI=,tag:FNNjgkVrfhoB5lMEgK1EUQ==,type:str] + runner: ENC[AES256_GCM,data:3otY+OZfVwA+LyPJ65+p85f5ZxnZUwxliulxWtgxS2ZVeH+B8GjNhw==,iv:n0CSAJ8x7sVFb1GgVDN3BbXlg+ntcCs4PBrLASaZCJQ=,tag:8k+yXwSzc1kvuAoPzMvXBw==,type:str] + runner-oasys: ENC[AES256_GCM,data:3SBpk5jmLud7NdurCJBF/T+UJrpBJXT4QWcJ8Mc0daJMFQUlciTQNQHuwwgkmkxxnM8DWOq8a3WB89vVJ1h5gFMv78MII6+ZTPE7JRFrnWqie8tNS8neXpZ06U8R,iv:6ti1uFRrsHHnymyos2N2anvOpxoOiSj36ndsxReMhEQ=,tag:fJ2LAnB+EZ6e+9UHeUCHDw==,type:str] +master-password: ENC[AES256_GCM,data:Gf9CC0g0zN7iDwR3idDxbKGpIi78g4xDNYpjGfvY+WdtsJiRzjZa,iv:oaUO4s6RcuOASFTtF92S8F8LWvNjPilqyppNYzZWEIc=,tag:uR+3rl7DvAk2nx4YYPvylQ==,type:str] sops: kms: [] gcp_kms: [] @@ -34,8 +36,8 @@ sops: YlhvbmFBT2pmTzk1RDlzbkgyWFdnckEKpWmn89U1KpeApHgBgt3pi0+qqbRVWNiV ZV7rCRtfL4qy++MiTE92ov4iRn8ffKUuoUMDgT4VzsTB6wjhMbh5kw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-01T14:41:38Z" - mac: ENC[AES256_GCM,data:3PjEI6rJnGfgeEYxx/moB4atvGmDXQ0qAmGzW1kzyk/aIoY1+yEWa33xsgzhfHQNYGMUg7FZWGEPxsfTN474SK8AltBR9X8TPWolfulWuHypZNnpdomq2DJN5hYp6WPj1TrVqe8utGfCwEmrisVSClKvHbxnlUlVk9Wt2ZFnbxs=,iv:94GmDnjyHQWeSBM7k9o/hoP87Ae/ZZFPGgkcMgBWNPw=,tag:snSfX58e+rblJCWSqYv6hQ==,type:str] + lastmodified: "2024-10-05T16:21:52Z" + mac: ENC[AES256_GCM,data:OUFdZqfUDA9UZPqESyYu6Ig6MoavNruR/6tVAPuPj9/fEz1SLgrUf+uY/yliovT+TXz8K8F+f430SCeus7O6N8ezUWzcfhodqfe3Fik65tiSFbkrN4ir/nCos+LBULWMpc6ILdpE7REGs2xEeYf3ljiIwAiiXsGjeKFZ9os1BUU=,iv:cpQG3F7Yr//4NJNz1JEitwLXsNClNYTezpnHU2cQ47Q=,tag:y08ZRLzd2zPZiYUNlyOHTw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.0 diff --git a/system/secrets.nix b/system/secrets.nix index 28268c1..9e075e5 100644 --- a/system/secrets.nix +++ b/system/secrets.nix @@ -11,9 +11,18 @@ generateKey = true; }; secrets = { - github-auth = { }; - github-runner = { }; - github-runner-oasys = { }; + "github/auth" = { + owner = config.users.users.c4patino.name; + }; + "github/runner" = { + owner = config.users.users.c4patino.name; + }; + "github/runner-oasys" = { + owner = config.users.users.c4patino.name; + }; + "master-password" = { + owner = config.users.users.c4patino.name; + }; }; }; } diff --git a/system/services/github-runner.nix b/system/services/github-runner.nix index bf8c098..9afcd86 100644 --- a/system/services/github-runner.nix +++ b/system/services/github-runner.nix @@ -15,7 +15,7 @@ enable = true; replace = true; ephemeral = true; - tokenFile = config.sops.secrets.github-runner.path; + tokenFile = config.sops.secrets."github/runner".path; url = "https://github.com/C4theBomb/nixos-config"; }; };