From 94494a4af2f0a868263dc0cb75bd04017bc36f56 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Wed, 2 Aug 2023 16:13:17 +0800
Subject: [PATCH] rm: remove agenix

---
 flake.lock             |  27 ---------------------------
 flake.nix              |   8 --------
 home.nix               |   8 +-------
 secrets/attic.toml.age | Bin 581 -> 0 bytes
 secrets/secrets.nix    |   5 -----
 system.nix             |   8 +++-----
 6 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 secrets/attic.toml.age
 delete mode 100644 secrets/secrets.nix

diff --git a/flake.lock b/flake.lock
index 6640c25..1ef9cf5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,31 +1,5 @@
 {
   "nodes": {
-    "agenix": {
-      "inputs": {
-        "darwin": [
-          "nix-darwin"
-        ],
-        "home-manager": [
-          "home-manager"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1690228878,
-        "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
     "attic": {
       "inputs": {
         "crane": "crane",
@@ -237,7 +211,6 @@
     },
     "root": {
       "inputs": {
-        "agenix": "agenix",
         "attic": "attic",
         "catppuccin": "catppuccin",
         "discord-applemusic-rich-presence": "discord-applemusic-rich-presence",
diff --git a/flake.nix b/flake.nix
index c8a776d..6b6fb5c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,13 +20,6 @@
       inputs.flake-compat.follows = "flake-compat";
     };
 
-    agenix = {
-      url = "github:ryantm/agenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-      inputs.darwin.follows = "nix-darwin";
-    };
-
     fenix = {
       url = "github:nix-community/fenix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -54,7 +47,6 @@
     nixpkgs,
     nix-darwin,
     home-manager,
-    agenix,
     fenix,
     attic,
     catppuccin,
diff --git a/home.nix b/home.nix
index f858999..f59d1af 100644
--- a/home.nix
+++ b/home.nix
@@ -1,14 +1,12 @@
 {
   pkgs,
   config,
-  agenixModule,
   ctpModule,
   discord-applemusic-rich-presence,
   ...
 }: {
   home.stateVersion = "23.05";
   imports = [
-    agenixModule
     ctpModule
     discord-applemusic-rich-presence
     ./programs/zsh.nix
@@ -29,12 +27,8 @@
 
   services.discord-applemusic-rich-presence = {
     enable = true;
+    logFile = "${config.home.homeDirectory}/Library/Logs/discord-applemusic-rich-presence.log";
   };
 
   catppuccin.flavour = "frappe";
-
-  age.secrets."attic.toml" = {
-    file = ./secrets/attic.toml.age;
-    path = "${config.home.homeDirectory}/.config/attic/config.toml";
-  };
 }
diff --git a/secrets/attic.toml.age b/secrets/attic.toml.age
deleted file mode 100644
index 76d41961ffe13f8f83bc63e2bce6d73155951a20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmV-L0=oTSXJsvAZewzJaCB*JZZ2<fXD@a!3N1b$b8~1dWn?lnH8D9LMn_~=Id>pc
zLPup}SwcBCLr7D0Q&3A+Ie9g7Mq@HjaZFE8WocANO>0v_Msi3@Qg;egYgTM(P*zh&
zO-^cdOm{S8FF{NzH&abCFjaRqb7^-nVq;KYQAJsFQ+En2J|JK%XL4m>b7de+dO#pj
zPi0GSN_0vJZ&7423N0-yAXq^$dN?#<O?E*~VP-Q!K~ZoqLSZm$K`~KBD{Of|b}u+m
zRaQA?b~jXK3aT7=@+_fc;wdS-YV3FkKmeB62WwY6Vi+VebM0^(-{a(feLu~m$}ovs
zQmi6G7>oiyoE|9G*A}Rhp0dvx)_tGL<-r3+1lfo#l@K#0UgTkn3ij|3?KE!5V-#C8
zooFrCC+a4u2SQB7GK!_<D6E(XYw8GaN5h3`ob86DHO4U+T&zJvA1YU^A7@Uk{~-q(
zUaNg6R4(oPCjdAxiT3_-&<_)5GW94mDF52=u;h3JjVW6#LXlzOyzIdu94-B*)-})e
zZdUm<B^&+(8z?*n4zN<vuqpZ_lxy{B4f3j;yxWhH+UGlDYryL#j{qIL${cBE0uMaZ
z<7&I@WNY2577NxX<?3dm0xK6lFk2&4K5k|sqAP1|ttTd4!nMk~;z>e*D}Ea#_bXUx
zag>*%U*R*1rL?6rDpAArSer=j;>s#&byY@T%ZpsGWaX#%wyvwE97+0rDk|nx59ucP
TVc2vh`o3-Q2UhM3xo{kS1O)Gc

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
deleted file mode 100644
index 50de440..0000000
--- a/secrets/secrets.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-let
-  main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFthNLv08xufLf09hObm+COlDdYDL4WuH9f+PZm54M3I";
-in {
-  "attic.toml.age".publicKeys = [main];
-}
diff --git a/system.nix b/system.nix
index 75d6809..440f357 100644
--- a/system.nix
+++ b/system.nix
@@ -1,7 +1,6 @@
 {
   pkgs,
   attic,
-  agenix,
   fenix,
   catppuccin,
   discord-applemusic-rich-presence,
@@ -33,9 +32,7 @@
     rust-analyzer
     nodePackages.typescript-language-server
 
-    pkgs."_1password"
     age
-    pkgs.agenix
     asciinema
     bat
     btop
@@ -90,7 +87,6 @@
   nixpkgs = {
     overlays = [
       attic.overlays.default
-      agenix.overlays.default
       fenix.overlays.default
       discord-applemusic-rich-presence.overlays.default
       (import ./overlays/ryan-mono-bin.nix)
@@ -128,13 +124,15 @@
       "blackhole-16ch"
       (noQuarantine "eloston-chromium")
       "sf-symbols"
+      "1password/tap/1password-cli"
     ];
+
+    taps = ["1password/tap"];
   };
 
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
   home-manager.extraSpecialArgs = {
-    agenixModule = agenix.homeManagerModules.age;
     ctpModule = catppuccin.homeManagerModules.catppuccin;
     discord-applemusic-rich-presence = discord-applemusic-rich-presence.homeManagerModules.default;
   };